cvs: /php4/ext/xml config.m4 /php4 configure.in.in

sas Thu Sep 16 21:47:16 1999 EDT Modified files: /php4/ext/xml config.m4 /php4 configure.in.in Log: supply path to xml include dir for APXS and APACI Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.10 php4/ext/xml/config.m4:1.11 --- php4/ext/xml/config.m4:1.10 Thu Sep 16 20:57:28 1999 +++ php4/ext/xml/config.m4 Thu Sep 16 21:47:15 1999 @@ -1,5 +1,5 @@ # $Source: /local/repository/php4/ext/xml/config.m4,v $ -# $Id: config.m4,v 1.10 1999/09/17 00:57:28 sas Exp $ +# $Id: config.m4,v 1.11 1999/09/17 01:47:15 sas Exp $ AC_MSG_CHECKING(for XML support) AC_ARG_WITH(xml, @@ -26,21 +26,18 @@ else AC_MSG_RESULT([yes (static)]) fi + + if test -z "$XML_INCLUDE" ; then if test "$withval" = "yes"; then test -d /usr/include/xml && XML_INCLUDE="/usr/include/xml" test -d /usr/local/include/xml && XML_INCLUDE="/usr/local/include/xml" test -d /usr/include/xmltok && XML_INCLUDE="/usr/include/xmltok" - if test -n "$APXS" ; then - dir=$APXS -q INCLUDEDIR - test -d $dir/xml && XML_INCLUDE="$dir/xml" - else AC_CHECK_LIB(expat, main, XML_LIBS="-lexpat", AC_CHECK_LIB(xmltok, main, AC_CHECK_LIB(xmlparse, main, XML_LIBS="-lxmlparse -lxmltok", AC_MSG_ERROR(No expat library found for the xml module),"-lxmltok"), AC_MSG_ERROR(No expart library found for the xml module)) ) - fi else XML_LIBS="-L$withval/lib -lexpat" if test -d $withval/include/xml; then @@ -48,6 +45,7 @@ else XML_INCLUDE="$withval/include" fi + fi fi AC_DEFINE(HAVE_LIBEXPAT, 1) PHP_EXTENSION(xml, $shared) Index: php4/configure.in.in diff -u php4/configure.in.in:1.82 php4/configure.in.in:1.83 --- php4/configure.in.in:1.82 Thu Sep 16 11:35:46 1999 +++ php4/configure.in.in Thu Sep 16 21:47:15 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.82 1999/09/16 15:35:46 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.83 1999/09/17 01:47:15 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. divert(0) @@ -352,6 +352,7 @@ abs_srcdir=(cd $srcdir; pwd) abs_builddir=pwd +AC_SUBST(abs_srcdir) AC_SUBST(abs_builddir) AC_MSG_CHECKING(for Apache module support via DSO through APXS) @@ -365,7 +366,11 @@ fi AC_EXPAND_PATH($withval, APXS) APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@" - APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" + APXS_INCLUDEDIR=$APXS -q INCLUDEDIR + if test -d "$APXS_INCLUDEDIR/xml" ; then + XML_INCLUDE="$APXS_INCLUDEDIR/xml" + fi + APACHE_INCLUDE="-I$APXS_INCLUDEDIR" BINNAME=libphp4.so INSTALL_IT="\$(APXS) -i -a -n php4 $BINNAME" CFLAGS_SHLIB=perl -V:cccdlflags | cut -d\' -f2 @@ -472,6 +477,9 @@ elif test -f $withval/src/include/httpd.h; then APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix" APACHE_TARGET=$withval/src/modules/php4 + if test -d $withval/src/lib/expat-lite ; then + XML_INCLUDE=$withval/src/lib/expat-lite + fi if test ! -d $APACHE_TARGET; then mkdir $APACHE_TARGET fi