CVS update: php4/ext/zlib

Date: Thursday July 1, 1999 @ 11:39 Author: sas Update of /repository/php4/ext/zlib In directory php:/tmp/cvs-serv2888 Modified Files: config.m4 Log Message: --with-zlib should work now Index: php4/ext/zlib/config.m4 diff -u php4/ext/zlib/config.m4:1.1 php4/ext/zlib/config.m4:1.2 --- php4/ext/zlib/config.m4:1.1 Wed Apr 21 22:48:28 1999 +++ php4/ext/zlib/config.m4 Thu Jul 1 11:39:58 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/04/22 02:48:28 ssb Exp $ +dnl $Id: config.m4,v 1.2 1999/07/01 15:39:58 sas Exp $ AC_MSG_CHECKING(whether to include zlib support) AC_ARG_WITH(zlib, @@ -12,23 +12,23 @@ 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 ;;