- configure.in include/libxml/xmlwin32version.h: released 2.3.13

- Makefile.am example/Makefile.am: workaround automake generating
  erroneous deps
Daniel

ChangeLog

@@ -1,3 +1,9 @@
+Thu Jun 28 18:16:28 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* configure.in include/libxml/xmlwin32version.h: released 2.3.13
+	* Makefile.am example/Makefile.am: workaround automake generating
+	  erroneous deps
+
 Thu Jun 28 15:08:22 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* include/win32config.h: bug #56801 Yon Derek provided a patch

Makefile.am

@@ -1,8 +1,9 @@
 ## Process this file with automake to produce Makefile.in
+AUTOMAKE_OPTIONS=no-dependencies
 
 SUBDIRS = include . doc example
 
-INCLUDES = -I@srcdir@/include -I./include @Z_CFLAGS@ @CORBA_CFLAGS@ 
+INCLUDES = -I@srcdir@/include -I$(top_builddir)/include @Z_CFLAGS@ @CORBA_CFLAGS@ 
 
 noinst_PROGRAMS=testSAX testHTML testXPath testURI testDocbook testCatalog
 

aclocal.m4

@@ -620,35 +620,31 @@ esac
 ])
 
 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library and INCLTDL to the include flags for
+# the libltdl convenience library, adds --enable-ltdl-convenience to
-# the libltdl header and adds --enable-ltdl-convenience to the
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-# configure arguments.  Note that LIBLTDL and INCLTDL are not
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
+# '${top_builddir}/' (note the single quotes!) if your package is not
-# with '${top_builddir}/' and INCLTDL will be prefixed with
+# flat, and, if you're not using automake, define top_builddir as
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# appropriate in the Makefiles.
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately 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
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+  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 installable library, and adds --enable-ltdl-install to
-# the libltdl header and adds --enable-ltdl-install to the configure
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
+# '${top_builddir}/' (note the single quotes!) if your package is not
-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
+# flat, and, if you're not using automake, define top_builddir as
-# with '${top_srcdir}/' (note the single quotes!).  If your package is
+# appropriate in the Makefiles.
-# not flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately 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 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   ])
   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
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+    INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
   else
     ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
     LIBLTDL="-lltdl"

configure.in

@@ -6,7 +6,7 @@ AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=3
-LIBXML_MICRO_VERSION=12
+LIBXML_MICRO_VERSION=13
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
 

example/Makefile.am

@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS=no-dependencies
+
 noinst_PROGRAMS	= gjobread
 
 INCLUDES =					\

include/libxml/xmlwin32version.h

@@ -18,10 +18,10 @@ extern "C" {
  * use those to be sure nothing nasty will happen if
  * your library and includes mismatch
  */
-#define LIBXML_DOTTED_VERSION "2.3.12"
+#define LIBXML_DOTTED_VERSION "2.3.13"
-#define LIBXML_VERSION 20312
+#define LIBXML_VERSION 20313
-#define LIBXML_VERSION_STRING "20312"
+#define LIBXML_VERSION_STRING "20313"
-#define LIBXML_TEST_VERSION xmlCheckVersion(20312);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20313);
 
 /**
  * WITH_TRIO: