cvs: php4 /ext/zlib config.m4

sr Mon Jun 26 01:53:37 2000 EDT Modified files: /php4/ext/zlib config.m4 Log: Fix for configure not setting the library path. Index: php4/ext/zlib/config.m4 diff -u php4/ext/zlib/config.m4:1.6 php4/ext/zlib/config.m4:1.7 --- php4/ext/zlib/config.m4:1.6 Mon May 1 21:01:15 2000 +++ php4/ext/zlib/config.m4 Mon Jun 26 01:53:36 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 2000/05/02 04:01:15 sas Exp $ +dnl $Id: config.m4,v 1.7 2000/06/26 08:53:36 sr Exp $ @@ -7,6 +7,13 @@ DIR is the zlib install directory, defaults to /usr.]) +AC_DEFUN(AC_TEMP_LDFLAGS,[ + old_LDFLAGS="$LDFLAGS" + LDFLAGS="$1 $LDFLAGS" + $2 + LDFLAGS="$old_LDFLAGS" +]) + if test "$PHP_ZLIB" != "no"; then PHP_EXTENSION(zlib, $ext_shared) for i in /usr/local /usr $PHP_ZLIB; do @@ -25,15 +32,13 @@ ZLIB_LIBDIR=$ZLIB_DIR/lib - old_LDFLAGS="$LDFLAGS" - old_LIBS="$LIBS" + AC_TEMP_LDFLAGS(-L$ZLIB_LIBDIR,[ AC_CHECK_LIB(z, gzgets, [AC_DEFINE(HAVE_ZLIB,1,[ ])], [AC_MSG_ERROR(Zlib module requires zlib >= 1.0.9.)]) - LIBS="$old_LIBS" - LDFLAGS="$old_LDFLAGS" + ]) PHP_SUBST(ZLIB_SHARED_LIBADD) AC_ADD_LIBRARY_WITH_PATH(z, $ZLIB_LIBDIR, ZLIB_SHARED_LIBADD) - AC_ADD_INCLUDE($ZLIB_INCLUDE) + AC_ADD_INCLUDE($ZLIB_INCDIR) fi