fixed make distcheck and rebuilding the rpms Daniel
* include/Makefile.am include/libxml/Makefile.am: fixed make
distcheck and rebuilding the rpms
Daniel
diff --git a/ChangeLog b/ChangeLog
index 23b0800..cda4f00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 23 23:54:12 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+ * include/Makefile.am include/libxml/Makefile.am configure.in:
+ fixed make distcheck and rebuilding the rpms
+
Sat Jun 23 20:50:53 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* configure.in: should finish the migration of exported includes
diff --git a/Makefile.am b/Makefile.am
index 2bf9750..0e3faa4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -451,7 +451,7 @@
EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml.spec \
libxml.m4 \
example/Makefile.am example/gjobread.c example/gjobs.xml \
- $(man_MANS) libxml-2.0.pc.in xmlversion.h.in \
+ $(man_MANS) libxml-2.0.pc.in \
win32/README.MSDev win32/Makefile.mingw \
win32/libxml2/libxml2.dsp win32/libxml2/libxml2_so.dsp \
win32/libxml2/libxml2_a.dsp win32/libxml2/xmllint.dsp \
diff --git a/aclocal.m4 b/aclocal.m4
index e372675..869e5fc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -620,35 +620,31 @@
])
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-convenience to the
-# configure arguments. Note that LIBLTDL and INCLTDL are not
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
-# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
-# with '${top_builddir}/' and INCLTDL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!). If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'. Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case "$enable_ltdl_convenience" in
no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
"") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+ LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library and INCLTDL to the include flags for
-# the libltdl header and adds --enable-ltdl-install to the configure
-# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
-# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
-# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
-# with '${top_srcdir}/' (note the single quotes!). If your package is
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'. Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_CHECK_LIB(ltdl, main,
@@ -661,8 +657,8 @@
])
if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install"
- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+ LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl"
diff --git a/configure.in b/configure.in
index ce1dc69..594fc2e 100644
--- a/configure.in
+++ b/configure.in
@@ -454,5 +454,5 @@
ln -s $srcdir/include/libxml libxml
fi
-AC_OUTPUT(libxml.spec Makefile include/Makefile doc/Makefile example/Makefile libxml/xmlversion.h xml2-config libxml-2.0.pc xml2Conf.sh)
+AC_OUTPUT(libxml.spec Makefile include/Makefile include/libxml/Makefile doc/Makefile example/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc xml2Conf.sh)
diff --git a/include/Makefile.am b/include/Makefile.am
index 5f7e733..cd4d00c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,43 +1,5 @@
## Process this file with automake to produce Makefile.in
+SUBDIRS=libxml
-xmlincdir = $(includedir)
+EXTRA_DIST = win32config.h
-xmlinc_HEADERS = \
- libxml/SAX.h \
- libxml/entities.h \
- libxml/encoding.h \
- libxml/parser.h \
- libxml/parserInternals.h \
- libxml/xmlerror.h \
- libxml/HTMLparser.h \
- libxml/HTMLtree.h \
- libxml/debugXML.h \
- libxml/tree.h \
- libxml/list.h \
- libxml/hash.h \
- libxml/xpath.h \
- libxml/xpathInternals.h \
- libxml/xpointer.h \
- libxml/xinclude.h \
- libxml/xmlIO.h \
- libxml/xmlmemory.h \
- libxml/nanohttp.h \
- libxml/nanoftp.h \
- libxml/uri.h \
- libxml/valid.h \
- libxml/xlink.h \
- libxml/xmlversion.h \
- libxml/DOCBparser.h \
- libxml/catalog.h
-
-install-exec-hook:
- $(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml
-
-EXTRA_DIST = win32config.h libxml/xmlversion.h.in
-
-all: $(srcdir)/libxml
-
-$(xmlinc_HEADERS): $(srcdir)/libxml
-
-$(srcdir)/libxml:
- @(cd $(srcdir); ln -s .. libxml)
diff --git a/include/libxml/Makefile.am b/include/libxml/Makefile.am
new file mode 100644
index 0000000..769d2e5
--- /dev/null
+++ b/include/libxml/Makefile.am
@@ -0,0 +1,36 @@
+## Process this file with automake to produce Makefile.in
+
+xmlincdir = $(includedir)
+
+xmlinc_HEADERS = \
+ SAX.h \
+ entities.h \
+ encoding.h \
+ parser.h \
+ parserInternals.h \
+ xmlerror.h \
+ HTMLparser.h \
+ HTMLtree.h \
+ debugXML.h \
+ tree.h \
+ list.h \
+ hash.h \
+ xpath.h \
+ xpathInternals.h \
+ xpointer.h \
+ xinclude.h \
+ xmlIO.h \
+ xmlmemory.h \
+ nanohttp.h \
+ nanoftp.h \
+ uri.h \
+ valid.h \
+ xlink.h \
+ xmlversion.h \
+ DOCBparser.h \
+ catalog.h
+
+install-exec-hook:
+ $(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml
+
+EXTRA_DIST = xmlversion.h.in
diff --git a/include/libxml/xmlversion.h b/include/libxml/xmlversion.h
index 06620e0..f188e80 100644
--- a/include/libxml/xmlversion.h
+++ b/include/libxml/xmlversion.h
@@ -153,7 +153,7 @@
*
* Whether the memory debugging is configured in
*/
-#if 1
+#if 0
#define DEBUG_MEMORY_LOCATION
#endif