From: Michael Wallner <mike@php.net>
Date: Fri, 17 Oct 2014 05:34:49 +0000 (+0200)
Subject: better checks for json support
X-Git-Tag: v0.5.2~1
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=commitdiff_plain;h=da7b5981c5ae28504434c492d468913645111d66;hp=faed41ad3a2645aa78d7c0b5630e898939c65dcd

better checks for json support
---

diff --git a/config.m4 b/config.m4
index ae8ae2f..63dfd22 100644
--- a/config.m4
+++ b/config.m4
@@ -38,6 +38,9 @@ if test "$PHP_PQ" != "no"; then
 	done 
 
 	
+	dnl
+	dnl PQ_CHECK_FUNC(sym, fail-hard)
+	dnl
 	AC_DEFUN([PQ_CHECK_FUNC], [
 		FAIL_HARD=$2
 		
@@ -62,6 +65,35 @@ if test "$PHP_PQ" != "no"; then
 	PQ_CHECK_FUNC(PQconninfo)
 	PQ_CHECK_FUNC(PQsetSingleRowMode)
 	
+	dnl
+	dnl PQ_HAVE_PHP_EXT(name[, code-if-yes[, code-if-not]])
+	dnl
+	AC_DEFUN([PQ_HAVE_PHP_EXT], [
+		extname=$1
+		haveext=$[PHP_]translit($1,a-z_-,A-Z__)
+		AC_MSG_CHECKING([for ext/$extname support])
+		if test -x "$PHP_EXECUTABLE"; then
+			grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
+			if test "$grepext" = "$extname"; then
+				[PHP_PQ_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
+				AC_MSG_RESULT([yes])
+				$2
+			else
+				[PHP_PQ_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
+				AC_MSG_RESULT([no])
+				$3
+			fi
+		elif test "$haveext" != "no" && test "x$haveext" != "x"; then
+			[PHP_PQ_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
+			AC_MSG_RESULT([yes])
+			$2
+		else
+			[PHP_PQ_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
+			AC_MSG_RESULT([no])
+			$3
+		fi
+	])
+	
 	PQ_SRC="\
 		src/php_pq_module.c\
 		src/php_pq_misc.c\
@@ -83,7 +115,53 @@ if test "$PHP_PQ" != "no"; then
 	PHP_NEW_EXTENSION(pq, $PQ_SRC, $ext_shared)
 	PHP_ADD_BUILD_DIR($ext_builddir/src)
 	PHP_ADD_INCLUDE($ext_srcdir/src)
-	PHP_ADD_EXTENSION_DEP(pq, raphf)
 	
+	PQ_HAVE_PHP_EXT([raphf], [
+		AC_MSG_CHECKING([for php_raphf.h])
+		PQ_EXT_RAPHF_INCDIR=
+		for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../raphf; do
+			if test -d $i; then
+				if test -f $i/php_raphf.h; then
+					PQ_EXT_RAPHF_INCDIR=$i
+					break
+				elif test -f $i/ext/raphf/php_raphf.h; then
+					PQ_EXT_RAPHF_INCDIR=$i/ext/raphf
+					break
+				fi
+			fi
+		done
+		if test "x$PQ_EXT_RAPHF_INCDIR" = "x"; then
+			AC_MSG_ERROR([not found])
+		else
+			AC_MSG_RESULT([$PQ_EXT_RAPHF_INCDIR])
+			AC_DEFINE([PHP_PQ_HAVE_PHP_RAPHF_H], [1], [Have ext/raphf support])
+			PHP_ADD_INCLUDE([$PQ_EXT_RAPHF_INCDIR])
+		fi
+	], [
+		AC_MSG_ERROR([Please install pecl/raphf and activate extension=raphf.$SHLIB_DL_SUFFIX_NAME in your php.ini])
+	])
+	PHP_ADD_EXTENSION_DEP(pq, raphf, true)
+	PQ_HAVE_PHP_EXT([json], [
+		AC_MSG_CHECKING([for php_json.h])
+		PQ_EXT_JSON_INCDIR=
+		for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../json ../jsonc ../jsond; do
+			if test -d $i; then
+				if test -f $i/php_json.h; then
+					PQ_EXT_JSON_INCDIR=$i
+					break
+				elif test -f $i/ext/json/php_json.h; then
+					PQ_EXT_JSON_INCDIR=$i/ext/json
+					break
+				fi
+			fi
+		done
+		if test "x$PQ_EXT_JSON_INCDIR" = "x"; then
+			AC_MSG_ERROR([not found])
+		else
+			AC_MSG_RESULT([$PQ_EXT_JSON_INCDIR])
+			AC_DEFINE([PHP_PQ_HAVE_PHP_JSON_H], [1], [Have ext/json support])
+			PHP_ADD_INCLUDE([$PQ_EXT_JSON_INCDIR])
+		fi
+	])
 fi
 
diff --git a/src/php_pq_params.c b/src/php_pq_params.c
index 6ac55af..0cc370d 100644
--- a/src/php_pq_params.c
+++ b/src/php_pq_params.c
@@ -17,8 +17,8 @@
 #include <php.h>
 #include <ext/standard/php_string.h>
 #include <ext/standard/php_smart_str.h>
-#ifdef HAVE_JSON
-#include <ext/json/php_json.h>
+#if PHP_PQ_HAVE_PHP_JSON_H
+#include <php_json.h> /* we've added the include directory to INCLUDES */
 #endif
 
 #include <Zend/zend_interfaces.h>
diff --git a/src/php_pqres.c b/src/php_pqres.c
index a9ab9c7..2853275 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -17,9 +17,10 @@
 #include <php.h>
 
 #include <ext/spl/spl_iterators.h>
-#if HAVE_JSON
-#include <ext/json/php_json.h>
+#if PHP_PQ_HAVE_PHP_JSON_H
+#include <php_json.h> /* we've added the include directory to INCLUDES */
 #endif
+
 #include <libpq-events.h>
 
 #include "php_pq.h"