diff options
| author | foobar <sniper@php.net> | 2001-05-10 00:59:41 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-05-10 00:59:41 +0000 |
| commit | a972b6aa5b06ee40e4d7c3f93d798f462a5976f1 (patch) | |
| tree | 43105afe82d011e0e9107eb8a7617b7c2beced9d | |
| parent | 5f20be7315b4e8259b2e294554860648443b605d (diff) | |
| download | php-git-a972b6aa5b06ee40e4d7c3f93d798f462a5976f1.tar.gz | |
Cleaning up here too.
| -rw-r--r-- | ext/domxml/config.m4 | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4 index 29ff87ad59..c7bef05c94 100644 --- a/ext/domxml/config.m4 +++ b/ext/domxml/config.m4 @@ -55,28 +55,22 @@ if test "$PHP_DOM" != "no"; then 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 |