Skip to content

Commit

Permalink
Fix JSON detection
Browse files Browse the repository at this point in the history
  • Loading branch information
remicollet authored and wupsbr committed Jul 8, 2015
1 parent 9813b50 commit aa854cc
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions ext/config.m4
Original file line number Diff line number Diff line change
Expand Up @@ -399,23 +399,17 @@ registry.c"
[[#include "php_config.h"]]
)

AC_CHECK_DECL(
[HAVE_JSON],
AC_CHECK_HEADERS(
[ext/json/php_json.h],
[
AC_CHECK_HEADERS(
[ext/json/php_json.h],
[
PHP_ADD_EXTENSION_DEP([phalcon], [json])
AC_DEFINE([PHALCON_USE_PHP_JSON], [1], [Whether PHP json extension is present at compile time])
],
,
[[#include "main/php.h"]]
)
PHP_ADD_EXTENSION_DEP([phalcon], [json])
AC_DEFINE([PHALCON_USE_PHP_JSON], [1], [Whether PHP json extension is present at compile time])
],
,
[[#include "php_config.h"]]
[[#include "main/php.h"]]
)


AC_CHECK_DECL(
[HAVE_PHP_SESSION],
[
Expand Down

0 comments on commit aa854cc

Please sign in to comment.