X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=autoconf%2Fpecl%2Fpecl.m4;h=d8735b0326628c8baf76dc78bf2e9c99065d8eab;hp=844fc24f7a74a5753f8e81fd775378e8fe22349d;hb=HEAD;hpb=f921f1e98ce637f8b37140a51f29091051706ce4

diff --git a/autoconf/pecl/pecl.m4 b/autoconf/pecl/pecl.m4
index 844fc24..cb2bb70 100644
--- a/autoconf/pecl/pecl.m4
+++ b/autoconf/pecl/pecl.m4
@@ -70,6 +70,21 @@ AC_DEFUN([PECL_RESTORE_ENV], [
 	$1=$PECL_SAVE_VAR([$2_$1])
 ])
 dnl
+dnl PECL_COUNT_CHECKS(incdec)
+dnl
+AC_DEFUN([PECL_COUNT_CHECKS], [
+	PECL_VAR([_checks])=$(($PECL_VAR([_checks])$1))
+])
+dnl
+dnl PECL_EVAL_LIBLINE(libline)
+dnl
+AC_DEFUN([PECL_EVAL_LIBLINE], [
+	PECL_SAVE_ENV(ext_shared, pecl)
+	ext_shared=no
+	PHP_EVAL_LIBLINE([$1], _pecl_eval_libline_dummy)
+	PECL_RESTORE_ENV(ext_shared, pecl)
+])
+dnl
 dnl PECL_PROG_EGREP
 dnl
 dnl Checks for an egrep. Defines $EGREP.
@@ -184,6 +199,7 @@ AC_DEFUN([PECL_HAVE_CONST], [dnl
 			#include "$1"
 		], [
 			]ifelse([$3],,int,[$3])[ _c = $2;
+			(void) _c;
 		], [
 			PECL_CACHE_VAR([HAVE_$1_$2])=yes
 		], [
@@ -220,7 +236,7 @@ AC_DEFUN([PECL_HAVE_VERSION], [
 	aversion=_PECL_TR_VERSION([$PECL_CHECKED_VERSION([$1])])
 	mversion=_PECL_TR_VERSION([$2])
 	AC_MSG_CHECKING([whether $1 version $PECL_CHECKED_VERSION([$1]) >= $2])
-	if test "$aversion" -lt "$mversion"; then
+	if test -z "$aversion" || test "$aversion" -lt "$mversion"; then
 		ifelse($4,,AC_MSG_ERROR([no]), [
 			AC_MSG_RESULT([no])
 			$4
@@ -234,6 +250,7 @@ dnl
 dnl PECL_CHECK_CUSTOM(name, path, header, lib, version)
 dnl
 AC_DEFUN([PECL_CHECK_CUSTOM], [
+	PECL_COUNT_CHECKS([+1])
 	PECL_SAVE_ENV([CPPFLAGS], [$1])
 	PECL_SAVE_ENV([LDFLAGS], [$1])
 	PECL_SAVE_ENV([LIBS], [$1])
@@ -250,24 +267,26 @@ AC_DEFUN([PECL_CHECK_CUSTOM], [
 		done
 	])
 	if test -n "$PECL_CACHE_VAR([$1_prefix])"; then
-		CPPFLAGS="-I$PECL_CACHE_VAR([$1_prefix])/include"
-		LDFLAGS="-L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
-		LIBS="-l$4"
+		CPPFLAGS="$CPPFLAGS -I$PECL_CACHE_VAR([$1_prefix])/include"
+		LDFLAGS="$LDFLAGS -L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
+		LIBS="$LIBS -l$4"
+		dnl PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
 
 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_version]), [
-			pushd $PECL_CACHE_VAR([$1_prefix])
+			pushd $PECL_CACHE_VAR([$1_prefix]) >/dev/null
 			PECL_CACHE_VAR([$1_version])=$5
-			popd
+			popd >/dev/null
 		])
 		PECL_CHECKED_VERSION([$1])=$PECL_CACHE_VAR([$1_version])
 
 		if test -n "$PECL_CHECKED_VERSION([$1])"; then
 			PECL_VAR([HAVE_$1])=true
-			PECL_DEFINE([HAVE_$1])
 			PECL_DEFINE_UQ($1[_VERSION], "$PECL_CHECKED_VERSION([$1])")
 		else
 			PECL_VAR([HAVE_$1])=false
 		fi
+	else
+		PECL_VAR([HAVE_$1])=false
 	fi
 	AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}])
 ])
@@ -275,11 +294,11 @@ dnl
 dnl PECL_CHECK_CONFIG(name, prog-config, version-flag, cppflags-flag, ldflags-flag, libs-flag)
 dnl
 AC_DEFUN([PECL_CHECK_CONFIG], [
+	PECL_COUNT_CHECKS([+1])
 	PECL_SAVE_ENV([CPPFLAGS], [$1])
 	PECL_SAVE_ENV([LDFLAGS], [$1])
 	PECL_SAVE_ENV([LIBS], [$1])
 
-
 	AC_MSG_CHECKING([for $1])
 	ifelse($2, [$PKG_CONFIG $1], [
 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_exists]), [
@@ -298,44 +317,68 @@ AC_DEFUN([PECL_CHECK_CONFIG], [
 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_cppflags]), [
 			PECL_CACHE_VAR([$1_cppflags])=$($2 $4)
 		])
-		CPPFLAGS=$PECL_CACHE_VAR([$1_cppflags])
+		CPPFLAGS="$CPPFLAGS $PECL_CACHE_VAR([$1_cppflags])"
 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_ldflags]), [
 			PECL_CACHE_VAR([$1_ldflags])=$($2 $5)
 		])
-		LDFLAGS=$PECL_CACHE_VAR([$1_ldflags])
+		LDFLAGS="$LDFLAGS $PECL_CACHE_VAR([$1_ldflags])"
 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_libs]), [
 			PECL_CACHE_VAR([$1_libs])=$($2 $6)
 		])
-		LIBS=$PECL_CACHE_VAR([$1_libs])
+		LIBS="$LIBS $PECL_CACHE_VAR([$1_libs])"
+		dnl PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
 	ifelse($2, [$PKG_CONFIG $1], [
 		fi
 	])
 
+	AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}])
+
 	if test -n "$PECL_CHECKED_VERSION([$1])"; then
 		PECL_VAR([HAVE_$1])=true
-		PECL_DEFINE([HAVE_$1])
 		PECL_DEFINE_UQ([$1_VERSION], "$PECL_CHECKED_VERSION([$1])")
 	else
 		PECL_VAR([HAVE_$1])=false
 	fi
-
-	AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}])
 ])
 dnl
 dnl PECL_CHECK_PKGCONFIG(pkg[, additional-pkg-config-path])
 dnl
 AC_DEFUN([PECL_CHECK_PKGCONFIG], [dnl
 	AC_REQUIRE([PECL_PROG_PKGCONFIG])dnl
-	ifelse($2,,,PKG_CONFIG_PATH="$2/lib/pkgconfig:$PKG_CONFIG_PATH")
+	ifelse($2,,, [
+		PECL_SAVE_VAR(pkgconfig_path)="$PKG_CONFIG_PATH"
+		if test -d "$2"; then
+			export PKG_CONFIG_PATH="$2/lib/pkgconfig:$PKG_CONFIG_PATH"
+		fi
+	])
 	PECL_CHECK_CONFIG([$1], [$PKG_CONFIG $1], [--modversion], [--cflags-only-I], [--libs-only-L], [--libs-only-l])
+	ifelse($2,,, [
+		PKG_CONFIG_PATH="$PECL_SAVE_VAR(pkgconfig_path)"
+	])
 ])
 dnl
 dnl PECL_CHECK_DONE(name, success[, incline, libline])
 dnl
 AC_DEFUN([PECL_CHECK_DONE], [
-	if $2; then
-		incline=$CPPFLAGS
-		libline="$LDFLAGS $LIBS"
+	PECL_COUNT_CHECKS([-1])
+	success=$2
+	if $success && test -n "$LDFLAGS$LIBS"; then
+		AC_MSG_CHECKING([whether $1 can be linked])
+		AC_TRY_LINK([], [], [success=yes], [success=no])
+		AC_MSG_RESULT([$success])
+		if ! $success; then
+			AC_MSG_WARN([$1 was found, but fails to link with:])
+			AC_MSG_WARN([    LDFLAGS='$LDFLAGS'])
+			AC_MSG_WARN([    LIBS='$LIBS'])
+			AC_MSG_WARN([Missing or updated library paths?])
+		fi
+	fi
+	if $success; then
+		_cppflags=$PECL_SAVE_VAR([$1_CPPFLAGS])
+		_ldflags=$PECL_SAVE_VAR([$1_LDFLAGS])
+		_libs=$PECL_SAVE_VAR([$1_LIBS])
+		incline=${CPPFLAGS:${#_cppflags}}
+		libline=["${LDFLAGS:${#_ldflags}} ${LIBS:${#_libs}}"]
 		PECL_DEFINE([HAVE_$1])
 	else
 		incline=$3