cvs: php4 /ext/domxml Makefile.in config.m4

hirokawa Wed Oct 18 15:17:42 2000 EDT Modified files: /php4/ext/domxml Makefile.in config.m4 Log: modified the configure scripts to make shared extension. Index: php4/ext/domxml/Makefile.in diff -u php4/ext/domxml/Makefile.in:1.8 php4/ext/domxml/Makefile.in:1.9 --- php4/ext/domxml/Makefile.in:1.8 Mon Jun 5 22:42:11 2000 +++ php4/ext/domxml/Makefile.in Wed Oct 18 15:17:41 2000 @@ -1,5 +1,8 @@ +# $Id: Makefile.in,v 1.9 2000/10/18 22:17:41 hirokawa Exp $ -LTLIBRARY_NAME = libdomxml.la -LTLIBRARY_SOURCES = php_domxml.c +LTLIBRARY_NAME = libdomxml.la +LTLIBRARY_SOURCES = php_domxml.c +LTLIBRARY_SHARED_NAME = domxml.la +LTLIBRARY_SHARED_LIBADD = $(DOMXML_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.12 php4/ext/domxml/config.m4:1.13 --- php4/ext/domxml/config.m4:1.12 Wed Oct 4 17:51:46 2000 +++ php4/ext/domxml/config.m4 Wed Oct 18 15:17:41 2000 @@ -1,65 +1,61 @@ -dnl $Id: config.m4,v 1.12 2000/10/05 00:51:46 sniper Exp $ +dnl $Id: config.m4,v 1.13 2000/10/18 22:17:41 hirokawa Exp $ +dnl config.m4 for extension domxml -AC_MSG_CHECKING(whether to include DOM support) -AC_ARG_WITH(dom, -[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.0). +PHP_ARG_WITH(dom, for DOM support, +Make sure that the comment is aligned: +[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.0). DIR is the libxml install directory, - defaults to /usr.], -[ - case "$withval" in - no) - AC_MSG_RESULT(no) ;; - yes) - AC_MSG_RESULT(yes) - PHP_EXTENSION(domxml) - old_LIBS=$LIBS - LIBS="$LIBS -lz" - AC_CHECK_LIB(xml, xmlFreeURI, [AC_DEFINE(HAVE_DOMXML,1,[ ])], - [AC_MSG_ERROR(DOM module requires libxml >= 2.0)]) - LIBS=$old_LIBS - AC_ADD_LIBRARY(z) - AC_ADD_LIBRARY(xml) - AC_ADD_INCLUDE(/usr/local/include) - ;; - *) - test -f $withval/include/libxml/tree.h && DOMXML_INCLUDE="$withval/include" - if test -n "$DOMXML_INCLUDE" ; then - AC_MSG_RESULT(yes) - PHP_EXTENSION(domxml) - old_LIBS=$LIBS - LIBS="$LIBS -L$withval/lib" - - if test $HAVE_ZLIB; then - old_withval=$withval - AC_MSG_CHECKING([for zlib (needed by DOM support)]) - AC_ARG_WITH(zlib-dir, - [ --with-zlib-dir[=DIR] zlib dir for libxml or include zlib support],[ - AC_MSG_RESULT( ) - if test -z $withval; then - withval="/usr/local" - fi - LIBS="$LIBS -L$withval/lib -lz" - AC_CHECK_LIB(z,deflate, ,[AC_MSG_RESULT(no)],) - AC_ADD_LIBRARY_WITH_PATH(z, $withval/lib) - ],[ - AC_MSG_RESULT(no) - AC_MSG_WARN(If configure fails try --with-zlib=<DIR>) - ]) - withval=$old_withval - else - echo "checking for libz needed by pdflib 3.0... already zlib support" - LIBS="$LIBS -L$withval/lib -lz" - fi - - AC_CHECK_LIB(xml, xmlFreeURI, [AC_DEFINE(HAVE_DOMXML,1,[ ])], - [AC_MSG_ERROR(DOM module requires libxml >= 2.0.)]) - LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(xml, $withval/lib) - AC_ADD_INCLUDE($DOMXML_INCLUDE) - else - AC_MSG_RESULT(no) - fi ;; - esac -],[ - AC_MSG_RESULT(no) -]) + defaults to /usr.]) + +if test "$PHP_DOMXML" != "no"; then + + if test -r $PHP_DOMXML/include/libxml/tree.h; then + DOMXML_DIR=$PHP_DOMXML + else + AC_MSG_CHECKING(for DOM in default path) + for i in /usr/local /usr; do + if test -r $i/include/libxml/tree.h; then + DOMXML_DIR=$i + AC_MSG_RESULT(found in $i) + fi + done + fi + + if test -z "$DOMXML_DIR"; then + AC_MSG_RESULT(not found) + AC_MSG_ERROR(Please reinstall the libxml >= 2.0 distribution) + fi + + AC_ADD_INCLUDE($DOMXML_DIR/include) + + PHP_SUBST(DOMXML_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(xml, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) + + if test $HAVE_ZLIB; then + old_withval=$withval + AC_MSG_CHECKING([for zlib (needed by DOM support)]) + AC_ARG_WITH(zlib-dir, + [ --with-zlib-dir[=DIR] zlib dir for libxml or include zlib support],[ + AC_MSG_RESULT( ) + if test -z $withval; then + withval="/usr/local" + fi + LIBS="$LIBS -L$withval/lib -lz" + AC_CHECK_LIB(z,deflate, ,[AC_MSG_RESULT(no)],) + AC_ADD_LIBRARY_WITH_PATH(z, $withval/lib) + ],[ + AC_MSG_RESULT(no) + AC_MSG_WARN(If configure fails try --with-zlib=<DIR>) + ]) + withval=$old_withval + else + echo "checking for libz needed by pdflib 3.0... already zlib support" + LIBS="$LIBS -L$withval/lib -lz" + fi + + AC_CHECK_LIB(xml, xmlFreeURI, [AC_DEFINE(HAVE_DOMXML,1,[ ])], + [AC_MSG_ERROR(DOM module requires libxml >= 2.0)]) + AC_ADD_LIBRARY(z) + + PHP_EXTENSION(domxml, $ext_shared) +fi