From 5d3ae9c2b2ecc46e0c41a9c68994a43c0cbc857f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 25 Nov 1999 06:56:40 +0000 Subject: [PATCH] - made domxml compile --- ext/domxml/Makefile.am | 5 ++--- ext/domxml/config.m4 | 7 ++++++- ext/domxml/php3_domxml.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ext/domxml/Makefile.am b/ext/domxml/Makefile.am index df0c78924c..36775910d3 100644 --- a/ext/domxml/Makefile.am +++ b/ext/domxml/Makefile.am @@ -1,6 +1,5 @@ # $Id$ -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 diff --git a/ext/domxml/config.m4 b/ext/domxml/config.m4 index d89c973446..e0fb49837e 100644 --- a/ext/domxml/config.m4 +++ b/ext/domxml/config.m4 @@ -12,12 +12,17 @@ AC_ARG_WITH(dom, 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) diff --git a/ext/domxml/php3_domxml.h b/ext/domxml/php3_domxml.h index 13bf835ee9..8b15ce2cb0 100644 --- a/ext/domxml/php3_domxml.h +++ b/ext/domxml/php3_domxml.h @@ -35,7 +35,7 @@ #define _PHP3_DOMXML_H #if HAVE_DOMXML -#include +#include extern php3_module_entry php3_domxml_module_entry; #define php3_domxml_module_ptr &php3_domxml_module_entry -- 2.40.0