cvs: php4 /ext/domxml config.m4

sniper Wed May 9 17:59:41 2001 EDT Modified files: /php4/ext/domxml config.m4 Log: Cleaning up here too. Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.22 php4/ext/domxml/config.m4:1.23 --- php4/ext/domxml/config.m4:1.22 Tue Mar 27 12:34:25 2001 +++ php4/ext/domxml/config.m4 Wed May 9 17:59:41 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.22 2001/03/27 20:34:25 sniper Exp $ +dnl $Id: config.m4,v 1.23 2001/05/10 00:59:41 sniper Exp $ dnl config.m4 for extension domxml AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -55,28 +55,22 @@ PHP_SUBST(DOMXML_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) - if test $HAVE_ZLIB; then + if test "$PHP_ZLIB" = "no"; then AC_MSG_CHECKING([for zlib (needed by DOM support)]) - AC_ARG_WITH(zlib-dir, - [ --with-zlib-dir[=DIR] zlib dir for libxml or include zlib support],[ - AC_MSG_RESULT( ) - if test -z $withval; then - withval="/usr/local" - fi - LIBS="$LIBS -L$withval/lib -lz" - AC_CHECK_LIB(z,deflate, ,[AC_MSG_RESULT(no)],) - PHP_ADD_LIBRARY_WITH_PATH(z, $withval/lib) + + AC_CHECK_LIB(z,deflate, [ + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, DOMXML_SHARED_LIBADD) + ],[ + AC_MSG_ERROR(libz.(a|so) not found! Try with --with-zlib-dir=<DIR>) ],[ - AC_MSG_RESULT(no) - AC_MSG_WARN(If configure fails try --with-zlib=<DIR>) + -L$PHP_ZLIB_DIR/lib ]) + else echo "checking for libz needed by libxml ... already zlib support" - LIBS="$LIBS -lz" + PHP_ADD_LIBRARY(z,, DOMXML_SHARED_LIBADD) fi AC_DEFINE(HAVE_DOMXML,1,[ ]) - PHP_ADD_LIBRARY(z) - PHP_EXTENSION(domxml, $ext_shared) fi