hirokawa Wed Jan 10 06:41:02 2001 EDT
Modified files:
/php4/ext/sablot config.m4
/php4/ext/xml config.m4
Log:
disable directory search for libexpat and disable some macros for libxml-1.95.
Index: php4/ext/sablot/config.m4
diff -u php4/ext/sablot/config.m4:1.10 php4/ext/sablot/config.m4:1.11
--- php4/ext/sablot/config.m4:1.10 Tue Jan 9 14:15:56 2001
+++ php4/ext/sablot/config.m4 Wed Jan 10 06:41:01 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.10 2001/01/09 22:15:56 hirokawa Exp $
+dnl $Id: config.m4,v 1.11 2001/01/10 14:41:01 hirokawa Exp $
dnl config.m4 for extension Sablot
PHP_ARG_WITH(expat-dir, for Sablotron XSL support,
@@ -37,6 +37,7 @@
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
Index: php4/ext/xml/config.m4
diff -u php4/ext/xml/config.m4:1.23 php4/ext/xml/config.m4:1.24
--- php4/ext/xml/config.m4:1.23 Thu Jan 4 22:36:51 2001
+++ php4/ext/xml/config.m4 Wed Jan 10 06:41:01 2001
@@ -1,5 +1,5 @@
# $Source: /local/repository/php4/ext/xml/config.m4,v $
-# $Id: config.m4,v 1.23 2001/01/05 06:36:51 hirokawa Exp $
+# $Id: config.m4,v 1.24 2001/01/10 14:41:01 hirokawa Exp $
dnl Fallback for --with-xml[=DIR]
AC_ARG_WITH(xml,[],enable_xml=$withval)
@@ -17,17 +17,9 @@
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 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
