Make PHP_CHECK_LIBRARY use PHP_EVAL_LIBLINE which automatically

eliminates /usr/lib references

diff --git a/acinclude.m4 b/acinclude.m4
index 68590a0e9d6a12cc8790e602d73afb2efce6ec44..bd3f45f51b18245c3a6ab45a97ce3fd7ca304a96 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1596,13 +1596,14 @@ main() {
 
 
 dnl
-dnl PHP_CHECK_LIBRARY(library, function [, action-found [, action-not-found [, extra-libs]]])
+dnl PHP_CHECK_LIBRARY(library, function [, action-found [, action-not-found [, extra-ldflags]]])
 dnl
 dnl Wrapper for AC_CHECK_LIB
 dnl
 AC_DEFUN([PHP_CHECK_LIBRARY], [
   save_old_LDFLAGS=$LDFLAGS
-  LDFLAGS="$5 $LDFLAGS"
+  ac_stuff="$5"
+  PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
   AC_CHECK_LIB([$1],[$2],[
     LDFLAGS=$save_old_LDFLAGS
     $3

diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
index c174a3bcbceb7624a6173e2cf2f50967e1671cc3..e407ff07426a64444353f70b2026258807450b5e 100644 (file)
--- a/ext/zlib/config0.m4
+++ b/ext/zlib/config0.m4
@@ -36,17 +36,12 @@ if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then
     AC_MSG_ERROR(Cannot find libz)
   fi
 
-  case $ZLIB_DIR in
-  /usr) ac_extra= ;; 
-  *) ac_extra=-L$ZLIB_DIR/lib ;;
-  esac
-
   PHP_CHECK_LIBRARY(z, gzgets, [
     AC_DEFINE(HAVE_ZLIB,1,[ ]) 
   ],[
     AC_MSG_ERROR(ZLIB extension requires zlib >= 1.0.9)
   ],[
-    $ac_extra
+    -L$ZLIB_DIR/lib
   ])
 
   PHP_ADD_LIBPATH($ZLIB_DIR/lib, ZLIB_SHARED_LIBADD)