From 973f679df01160fc2e50022e3784862f39dea2e4 Mon Sep 17 00:00:00 2001
From: Sascha Schumann <sas@php.net>
Date: Thu, 1 Jul 1999 15:39:58 +0000
Subject: [PATCH] --with-zlib should work now

---
 ext/zlib/config.m4 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ext/zlib/config.m4 b/ext/zlib/config.m4
index d9d3d755540..d6537c7b861 100644
--- a/ext/zlib/config.m4
+++ b/ext/zlib/config.m4
@@ -12,23 +12,23 @@ AC_ARG_WITH(zlib,
     yes)
       AC_MSG_RESULT(yes)
       PHP_EXTENSION(zlib)
-      AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB) ZLIB_LIBS="-lz"],
+      AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB)],
         [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)])
-      EXTRA_LIBS="$EXTRA_LIBS $ZLIB_LIBS"
+      AC_ADD_LIBRARY(z)
       ;;
     *)
-      test -f $withval/include/zlib/zlib.h && ZLIB_INCLUDE="-I$withval/include/zlib"
-      test -f $withval/include/zlib.h && ZLIB_INCLUDE="-I$withval/include"
+      test -f $withval/include/zlib/zlib.h && ZLIB_INCLUDE="$withval/include/zlib"
+      test -f $withval/include/zlib.h && ZLIB_INCLUDE="$withval/include"
       if test -n "$ZLIB_INCLUDE" ; then
         AC_MSG_RESULT(yes)
         PHP_EXTENSION(zlib)
         old_LIBS=$LIBS
         LIBS="$LIBS -L$withval/lib"
-        AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB) ZLIB_LIBS="-L$withval/lib -lz"],
+        AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB)],
           [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)])
         LIBS=$old_LIBS
-        EXTRA_LIBS="$EXTRA_LIBS $ZLIB_LIBS"
-        INCLUDES="$INCLUDES $ZLIB_INCLUDE"
+        AC_ADD_LIBRARY_WITH_PATH(z, $withval/lib)
+        AC_ADD_INCLUDE($ZLIB_INCLUDE)
       else
         AC_MSG_RESULT(no)
       fi ;;