diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-09-04 17:13:52 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-09-04 17:13:52 +0200 |
| commit | 628026478222adad3010277899dabd4227306b48 (patch) | |
| tree | ac01bf10b9b40abf5cadd524d0203e2b92a76bc3 /2775.patch | |
php-phalcon: 1.3.2 - new package
Diffstat (limited to '2775.patch')
| -rw-r--r-- | 2775.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/2775.patch b/2775.patch new file mode 100644 index 0000000..9ced075 --- /dev/null +++ b/2775.patch @@ -0,0 +1,43 @@ +From 9950f69baf175606d8fb72ce0b9bb10b892934f1 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Thu, 4 Sep 2014 15:30:38 +0200 +Subject: [PATCH] Fix JSON detection + +--- + ext/config.m4 | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +diff --git a/ext/config.m4 b/ext/config.m4 +index 88f8e4c..2340e9b 100644 +--- a/ext/config.m4 ++++ b/ext/config.m4 +@@ -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], + [ |