diff options
| author | Sascha Schumann <sas@php.net> | 1999-09-17 01:47:15 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-09-17 01:47:15 +0000 |
| commit | 09af5f967f3f6b6a9faa71cfb2b1af7c3ba21284 (patch) | |
| tree | e6f0d398ae7b32c6e73e3e81ca3cc5a2ae672dc4 | |
| parent | 5a468e740c0fdff3ae3c24ee0ee164753a86a51a (diff) | |
| download | php-git-09af5f967f3f6b6a9faa71cfb2b1af7c3ba21284.tar.gz | |
supply path to xml include dir for APXS and APACI
| -rw-r--r-- | configure.in.in | 10 | ||||
| -rw-r--r-- | ext/xml/config.m4 | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/configure.in.in b/configure.in.in index 7dabb9f85a..7b82d0c554 100644 --- a/configure.in.in +++ b/configure.in.in @@ -352,6 +352,7 @@ divert(2) 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 @@ AC_ARG_WITH(apxs, 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 @@ AC_ARG_WITH(apache, 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 diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 4d27918a68..61f70ff606 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -26,21 +26,18 @@ AC_ARG_WITH(xml, 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 @@ -49,6 +46,7 @@ AC_ARG_WITH(xml, XML_INCLUDE="$withval/include" fi fi + fi AC_DEFINE(HAVE_LIBEXPAT, 1) PHP_EXTENSION(xml, $shared) if test "$shared" != "yes"; then |