disable directory search for libexpat and disable some macros for libxml-1.95.

diff --git a/ext/sablot/config.m4 b/ext/sablot/config.m4
index 3bf43264c986bb7f76ea3906faaaf93081fd1825..8a4d09c3b3d994bac7ad5f55e3a453e9369fa24f 100644 (file)
--- 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 ca5ea4f55b49d8eb7ea9882c65e63c6eb9d1c33d..3f1321ed74f1e6bcd7420197a557773d4455a24f 100644 (file)
--- 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)