cvs: /php4/ext/domxml Makefile.am config.m4 php3_domxml.h

steinm Thu Nov 25 01:57:11 1999 EDT Modified files: /php4/ext/domxml Makefile.am config.m4 php3_domxml.h Log: - made domxml compile Index: php4/ext/domxml/Makefile.am diff -u php4/ext/domxml/Makefile.am:1.1 php4/ext/domxml/Makefile.am:1.2 --- php4/ext/domxml/Makefile.am:1.1 Wed Nov 24 01:21:48 1999 +++ php4/ext/domxml/Makefile.am Thu Nov 25 01:56:40 1999 @@ -1,6 +1,5 @@ -# $Id: Makefile.am,v 1.1 1999/11/24 06:21:48 steinm Exp $ +# $Id: Makefile.am,v 1.2 1999/11/25 06:56:40 steinm Exp $ -INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend -noinst_LIBRARIES=libphpext_domxml.a -libphpext_domxml_a_SOURCES=domxml.c +noinst_LTLIBRARIES=libphpext_domxml.la +libphpext_domxml_la_SOURCES=domxml.c Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.1 php4/ext/domxml/config.m4:1.2 --- php4/ext/domxml/config.m4:1.1 Wed Nov 24 01:21:48 1999 +++ php4/ext/domxml/config.m4 Thu Nov 25 01:56:40 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/11/24 06:21:48 steinm Exp $ +dnl $Id: config.m4,v 1.2 1999/11/25 06:56:40 steinm Exp $ AC_MSG_CHECKING(whether to include DOM support) AC_ARG_WITH(dom, @@ -12,12 +12,17 @@ yes) AC_MSG_RESULT(yes) PHP_EXTENSION(domxml) + old_LIBS=$LIBS + LIBS="$LIBS -lgz" AC_CHECK_LIB(xml, xmlNewDoc, [AC_DEFINE(HAVE_DOMXML)], [AC_MSG_ERROR(DOM module requires libxml >= 1.0)]) + LIBS=$old_LIBS AC_ADD_LIBRARY(xml) + AC_ADD_LIBRARY(gz) + AC_ADD_INCLUDE(/usr/local/include) ;; *) - test -f $withval/include/gnome-xml/tree.h && DOMXML_INCLUDE="$withval/include/gnome-xml" + test -f $withval/include/gnome-xml/tree.h && DOMXML_INCLUDE="$withval/include" test -f $withval/include/tree.h && DOMXML_INCLUDE="$withval/include" if test -n "$DOMXML_INCLUDE" ; then AC_MSG_RESULT(yes) Index: php4/ext/domxml/php3_domxml.h diff -u php4/ext/domxml/php3_domxml.h:1.1 php4/ext/domxml/php3_domxml.h:1.2 --- php4/ext/domxml/php3_domxml.h:1.1 Wed Nov 24 01:21:48 1999 +++ php4/ext/domxml/php3_domxml.h Thu Nov 25 01:56:40 1999 @@ -29,13 +29,13 @@ */ -/* $Id: php3_domxml.h,v 1.1 1999/11/24 06:21:48 steinm Exp $ */ +/* $Id: php3_domxml.h,v 1.2 1999/11/25 06:56:40 steinm Exp $ */ #ifndef _PHP3_DOMXML_H #define _PHP3_DOMXML_H #if HAVE_DOMXML -#include <parser.h> +#include <gnome-xml/parser.h> extern php3_module_entry php3_domxml_module_entry; #define php3_domxml_module_ptr &php3_domxml_module_entry