diff options
| author | Rui Hirokawa <hirokawa@php.net> | 2001-01-10 14:41:01 +0000 |
|---|---|---|
| committer | Rui Hirokawa <hirokawa@php.net> | 2001-01-10 14:41:01 +0000 |
| commit | c2881f7c6b016596b95834dda3e394832cca177b (patch) | |
| tree | 4c06e823b54f43d00ecf5e688f299f5935f74311 | |
| parent | ae92ebb92bfec7f263d4e901bc23c06a6b3c3265 (diff) | |
| download | php-git-c2881f7c6b016596b95834dda3e394832cca177b.tar.gz | |
disable directory search for libexpat and disable some macros for libxml-1.95.
| -rw-r--r-- | ext/sablot/config.m4 | 1 | ||||
| -rw-r--r-- | ext/xml/config.m4 | 14 |
2 files changed, 4 insertions, 11 deletions
diff --git a/ext/sablot/config.m4 b/ext/sablot/config.m4 index 3bf43264c9..8a4d09c3b3 100644 --- a/ext/sablot/config.m4 +++ b/ext/sablot/config.m4 @@ -37,6 +37,7 @@ if test "$PHP_SABLOT" != "no"; then testval=no for i in $PHP_EXPAT_DIR $SABLOT_DIR; do if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.so; then + AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) AC_ADD_LIBRARY_WITH_PATH(expat, $i/lib) AC_CHECK_LIB(sablot, SablotSetEncoding, AC_DEFINE(HAVE_SABLOT_SET_ENCODING,1,[ ])) testval=yes diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index ca5ea4f55b..3f1321ed74 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -17,17 +17,9 @@ PHP_ARG_ENABLE(xml,for XML support, if test "$PHP_XML" != "no"; then - AC_MSG_CHECKING(for expat in default path) - for i in /usr/local /usr; do - if test -r $i/include/expat.h; then - EXPAT_DIR=$i - AC_MSG_RESULT(found in $i) - fi - done - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) - if test -z "$EXPAT_DIR"; then + if test "$PHP_XML" = "yes"; then CPPFLAGS="$CPPFLAGS -DXML_BYTE_ORDER=$order" EXPAT_INTERNAL_LIBADD="expat/libexpat.la" PHP_SUBST(EXPAT_INTERNAL_LIBADD) @@ -44,10 +36,10 @@ if test "$PHP_XML" != "no"; then else - if test -f $EXPAT/lib/libexpat.a -o -f $EXPAT_DIR/lib/libexpat.so ; then + EXPAT_DIR="$withval" + if test -f $EXPAT_DIR/lib/libexpat.a -o -f $EXPAT_DIR/lib/libexpat.so ; then AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ]) AC_ADD_INCLUDE($EXPAT_DIR/include) - AC_ADD_LIBRARY(expat) else AC_MSG_RESULT(not found) AC_MSG_ERROR(Please reinstall the expat distribution) |