sterling Wed Jun 25 14:06:06 2003 EDT
Modified files:
/php-src/ext/dom config.m4
Log:
autodetect zlib if dom is enabled
Index: php-src/ext/dom/config.m4
diff -u php-src/ext/dom/config.m4:1.5 php-src/ext/dom/config.m4:1.6
--- php-src/ext/dom/config.m4:1.5 Wed Jun 25 11:31:59 2003
+++ php-src/ext/dom/config.m4 Wed Jun 25 14:06:06 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.5 2003/06/25 15:31:59 sterling Exp $
+dnl $Id: config.m4,v 1.6 2003/06/25 18:06:06 sterling Exp $
dnl
AC_DEFUN(PHP_DOM_CHECK_VERSION,[
@@ -29,7 +29,6 @@
fi
if test "$PHP_DOM" != "no"; then
-
DOM_DIR_ADD=""
if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then
DOM_DIR=$PHP_DOM
@@ -66,6 +65,16 @@
fi
PHP_ADD_INCLUDE($DOM_DIR/include$DOM_DIR_ADD)
+
+ dnl Search for the zlib directory
+
+ if test "$PHP_ZLIB_DIR" = "no"; then
+ for i in /usr /usr/local; do
+ if test -r $i/lib/libz.so; then
+ PHP_ZLIB_DIR=$i
+ fi
+ done
+ fi
if test "$PHP_ZLIB_DIR" = "no"; then
AC_MSG_ERROR(DOM requires ZLIB. Use --with-zlib-dir=<DIR>)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
