cvs: php4 /ext/domxml config.m4

sniper Fri Jul 27 10:02:44 2001 EDT Modified files: /php4/ext/domxml config.m4 Log: Simplified this a bit and made more consistent. Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.25 php4/ext/domxml/config.m4:1.26 --- php4/ext/domxml/config.m4:1.25 Sun May 20 19:00:43 2001 +++ php4/ext/domxml/config.m4 Fri Jul 27 10:02:44 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.25 2001/05/20 23:00:43 sniper Exp $ +dnl $Id: config.m4,v 1.26 2001/07/27 14:02:44 sniper Exp $ dnl config.m4 for extension domxml AC_DEFUN(PHP_DOM_CHECK_VERSION,[ @@ -28,12 +28,8 @@ if test -r $PHP_DOM/include/libxml/tree.h; then DOMXML_DIR=$PHP_DOM else - AC_MSG_CHECKING(for DOM in default path) for i in /usr/local /usr; do - if test -r $i/include/libxml/tree.h; then - DOMXML_DIR=$i - AC_MSG_RESULT(found in $i) - fi + test -r $i/include/libxml/tree.h && DOMXML_DIR=$i done fi @@ -44,23 +40,22 @@ PHP_DOM_CHECK_VERSION - PHP_ADD_INCLUDE($DOMXML_DIR/include) - if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then DOM_LIBNAME=xml2 else DOM_LIBNAME=xml fi - PHP_SUBST(DOMXML_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) + PHP_ADD_INCLUDE($DOMXML_DIR/include) if test "$PHP_ZLIB_DIR" = "no"; then AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>) + else + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, DOMXML_SHARED_LIBADD) fi - - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, DOMXML_SHARED_LIBADD) - + AC_DEFINE(HAVE_DOMXML,1,[ ]) PHP_EXTENSION(domxml, $ext_shared) + PHP_SUBST(DOMXML_SHARED_LIBADD) fi