- made domxml compile

diff --git a/ext/domxml/Makefile.am b/ext/domxml/Makefile.am
index df0c78924c4315b105dc4952cbcb250184e322a7..36775910d36cb733e5e350133ac814cfccb5a9f0 100644 (file)
--- 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 d89c9734462b044dc46f436450937b8929688e51..e0fb49837edbca65b8625636161ba1f96aac346c 100644 (file)
--- 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 13bf835ee96c244d266414f27da57a3408b39c36..8b15ce2cb05e3a232bf131526591bc07c224ed71 100644 (file)
--- a/ext/domxml/php3_domxml.h
+++ b/ext/domxml/php3_domxml.h
@@ -35,7 +35,7 @@
 #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