X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=autoconf%2Fpecl%2Fpecl.m4;h=6721e1c1455f68bf2d01c0bb0c173792aaa72f7e;hb=fe48edfe1c8454750b84fd483ce4af60a5656763;hp=9ab9aed32da5e1a326fe79d45f0a79dbf868721f;hpb=80bb9787a447fd8443b824f4b3f38ecf87eca9b6;p=m6w6%2Fext-http diff --git a/autoconf/pecl/pecl.m4 b/autoconf/pecl/pecl.m4 index 9ab9aed..6721e1c 100644 --- a/autoconf/pecl/pecl.m4 +++ b/autoconf/pecl/pecl.m4 @@ -184,6 +184,7 @@ AC_DEFUN([PECL_HAVE_CONST], [dnl #include "$1" ], [ ]ifelse([$3],,int,[$3])[ _c = $2; + (void) _c; ], [ PECL_CACHE_VAR([HAVE_$1_$2])=yes ], [ @@ -253,9 +254,12 @@ AC_DEFUN([PECL_CHECK_CUSTOM], [ CPPFLAGS="-I$PECL_CACHE_VAR([$1_prefix])/include" LDFLAGS="-L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR" LIBS="-l$4" - + PHP_EVAL_LIBLINE([$LDFLAGS $LIBS]) + AC_CACHE_VAL(PECL_CACHE_VAR([$1_version]), [ + pushd $PECL_CACHE_VAR([$1_prefix]) >/dev/null PECL_CACHE_VAR([$1_version])=$5 + popd >/dev/null ]) PECL_CHECKED_VERSION([$1])=$PECL_CACHE_VAR([$1_version]) @@ -266,6 +270,8 @@ AC_DEFUN([PECL_CHECK_CUSTOM], [ else PECL_VAR([HAVE_$1])=false fi + else + PECL_VAR([HAVE_$1])=false fi AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}]) ]) @@ -305,6 +311,8 @@ AC_DEFUN([PECL_CHECK_CONFIG], [ PECL_CACHE_VAR([$1_libs])=$($2 $6) ]) LIBS=$PECL_CACHE_VAR([$1_libs]) + + PHP_EVAL_LIBLINE([$LDFLAGS $LIBS]) ifelse($2, [$PKG_CONFIG $1], [ fi ])