mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rui Hirokawa 2001-01-10 14:41:01 +00:00
parent ae92ebb92b
commit c2881f7c6b
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/sablot/config.m4
View File

@ -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

14
ext/xml/config.m4
View File

@ -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)