cvs: /php3 configure.in

rasmus Mon Jul 26 14:41:20 1999 EDT Modified files: /php3 configure.in Log: Fix built-in Apache xml support Index: php3/configure.in diff -u php3/configure.in:1.446 php3/configure.in:1.447 --- php3/configure.in:1.446 Sun Jul 25 12:09:53 1999 +++ php3/configure.in Mon Jul 26 14:41:20 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.446 1999/07/25 16:09:53 rasmus Exp $ +dnl $Id: configure.in,v 1.447 1999/07/26 18:41:20 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -1818,17 +1818,27 @@ for i in /usr /usr/local $withval ; do if test -f "$i/include/xml/xmltok.h" ; then XML_DIR=$i + XML_INCLUDE="$i/include/xml" + XML_LIB="$i/lib" fi done - + if test -n "$APXS"; then + i="$APXS -q INCLUDEDIR" + if test -f "$i/xml/xmltok.h"; then + XML_DIR=$i + XML_INCLUDE=$i + fi + fi if test "$XML_DIR" = "" ; then AC_MSG_ERROR(cannot find XML include files) fi AC_DEFINE(HAVE_LIBEXPAT, 1) AC_MSG_RESULT(yes) - AC_ADD_LIBRARY_WITH_PATH(expat, $XML_DIR/lib) - AC_ADD_INCLUDE($XML_DIR/include) + if test "$XML_LIB" != ""; then + AC_ADD_LIBRARY_WITH_PATH(expat, $XML_LIB) + fi + AC_ADD_INCLUDE($XML_INCLUDE) else AC_MSG_RESULT(no) fi