diff options
| author | Sascha Schumann <sas@php.net> | 2000-02-12 14:28:49 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-02-12 14:28:49 +0000 |
| commit | f6eb750183af57f14a1ac0e9d44e3160389be0d2 (patch) | |
| tree | ae488a4256b6ae3c63a4fb4007d8cc5c8c317dc7 /ext/xml/config.m4 | |
| parent | b1a00f722e701b7905f814b3a1218ac44a3fadcb (diff) | |
| download | php-git-f6eb750183af57f14a1ac0e9d44e3160389be0d2.tar.gz | |
Use bundled expat library on UNIX. Note: Need to fix --enable-xml=shared
Diffstat (limited to 'ext/xml/config.m4')
| -rw-r--r-- | ext/xml/config.m4 | 71 |
1 files changed, 22 insertions, 49 deletions
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index a346e05598..e3bed63ea7 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -1,56 +1,29 @@ # $Source$ # $Id$ +dnl Fallback for --with-xml[=DIR] +AC_ARG_WITH(xml,[],enable_xml=$withval) + +AC_C_BIGENDIAN + AC_MSG_CHECKING(for XML support) -AC_ARG_WITH(xml, -[ --with-xml[=DIR] Include XML support. Will look for expat - in DIR if specified. Set DIR to "shared" to - build as a dl, or "shared,DIR" to build as a dl - and still specify DIR.],[ - PHP_WITH_SHARED - if test "$withval" != "no"; then - if test "$shared" = "yes"; then - AC_MSG_RESULT([yes (shared)]) - else - AC_MSG_RESULT([yes (static)]) - fi +AC_ARG_ENABLE(xml, +[ --enable-xml Include XML support using bundled expat lib],[ + PHP_XML=$enableval +],[ + PHP_XML=no +]) +AC_MSG_RESULT($PHP_XML) - 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" - 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 expat library found for the xml module)) - ) - else - XML_LIBS="-L$withval/lib -lexpat" - if test -d $withval/include/xml; then - XML_INCLUDE="$withval/include/xml" - else - XML_INCLUDE="$withval/include" - fi - fi - fi - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) - PHP_EXTENSION(xml, $shared) - if test "$shared" != "yes"; then - EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS" - AC_ADD_INCLUDE($XML_INCLUDE) - XML_INCLUDE="" - XML_STATIC="libphpext_xml.la" - else - XML_INCLUDE="-I$XML_INCLUDE" - XML_SHARED="xml.la" - fi +if test "$PHP_XML" != "no"; then + AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) + if test "$PHP_XML" = "shared"; then + shared=yes else - AC_MSG_RESULT(no) + shared= fi -],[ - AC_MSG_RESULT(no) -]) -PHP_SUBST(XML_LIBS) -PHP_SUBST(XML_INCLUDE) + PHP_EXTENSION(xml, $shared) + AC_ADD_INCLUDE(${ext_src_base}expat/xmltok) + AC_ADD_INCLUDE(${ext_src_base}expat/xmlparse) + PHP_FAST_OUTPUT(${ext_base}expat/Makefile ${ext_base}expat/xmlparse/Makefile ${ext_base}expat/xmltok/Makefile) +fi |