Renamed the library to libxml2 and made the changes needed to have

libxml-devel and libxml2-devel to coexist:
- Makefile.am configure.in libxml.spec.in example/Makefile.am:
  Changed the library name, in order to get libxml-devel and
  libxml2-devel to coexist on a single system
- xml-config.1 xml-config.in xmlConf.sh.in: renamed
- xml2-config.1 xml2-config.in xml2Conf.sh.in: new files
Daniel

ChangeLog

@@ -1,3 +1,11 @@
+Sun Jan 28 08:37:03 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* Makefile.am configure.in libxml.spec.in example/Makefile.am:
+	  Changed the library name, in order to get libxml-devel and
+	  libxml2-devel to coexist on a single system
+	* xml-config.1 xml-config.in xmlConf.sh.in: renamed
+	* xml2-config.1 xml2-config.in xml2Conf.sh.in: new files
+
 Sat Jan 27 19:58:22 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* Makefile.am configure.in libxml-2.0.pc.in: started working on getting

Makefile.am

@@ -8,9 +8,9 @@ noinst_PROGRAMS=testSAX testHTML testXPath testURI
 
 bin_PROGRAMS = xmllint
 
-bin_SCRIPTS=xml-config
+bin_SCRIPTS=xml2-config
 
-lib_LTLIBRARIES = libxml.la
+lib_LTLIBRARIES = libxml2.la
 libxml2_la_LIBADD = @Z_LIBS@
 
 libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
@@ -41,7 +41,7 @@ libxml2_la_SOURCES = \
 DEPS = $(top_builddir)/libxml2.la
 LDADDS = $(top_builddir)/libxml2.la @Z_LIBS@ @M_LIBS@
 
-man_MANS = xmllint.1 xml-config.1 libxml.4
+man_MANS = xmllint.1 xml2-config.1 libxml.4
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libxml.m4
@@ -392,19 +392,19 @@ cleantar:
 rpm: cleantar distcheck
 	rpm -ta $(distdir).tar.gz
 
-## We create xmlConf.sh here and not from configure because we want
+## We create xml2Conf.sh here and not from configure because we want
 ## to get the paths expanded correctly.  Macros like srcdir are given
 ## the value NONE in configure if the user doesn't specify them (this
 ## is an autoconf feature, not a bug).
 
 confexecdir=$(libdir)
-confexec_DATA = xmlConf.sh
+confexec_DATA = xml2Conf.sh
 
-CLEANFILES=xmlConf.sh
+CLEANFILES=xml2Conf.sh
 
 confexecdir=$(libdir)
-confexec_DATA = xmlConf.sh
-EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec libxml.m4 \
+confexec_DATA = xml2Conf.sh
+EXTRA_DIST = 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 \
 	     win32/README.MSDev win32/Makefile.mingw \
@@ -414,11 +414,11 @@ EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec libxml.m4 \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libxml-2.0.pc
 
-xmlConf.sh: xmlConf.sh.in Makefile
+xml2Conf.sh: xml2Conf.sh.in Makefile
 ## Use sed and then mv to avoid problems if the user interrupts.
 	sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
 	    -e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
 	    -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
 	    -e 's?\@VERSION\@?$(VERSION)?g' \
-	      < $(srcdir)/xmlConf.sh.in > xmlConf.tmp \
-	  && mv xmlConf.tmp xmlConf.sh
+	      < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
+	  && mv xml2Conf.tmp xml2Conf.sh

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 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 @@ 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
-    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"

configure.in

@@ -6,7 +6,7 @@ AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=2
-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
 
@@ -396,5 +396,5 @@ then
     ln -s $srcdir/include/libxml libxml
 fi
 
-AC_OUTPUT(libxml.spec Makefile include/Makefile doc/Makefile example/Makefile libxml/xmlversion.h xml-config libxml-2.0.pc)
+AC_OUTPUT(libxml.spec Makefile include/Makefile doc/Makefile example/Makefile libxml/xmlversion.h xml2-config libxml-2.0.pc xml2Conf.sh)
 

example/Makefile.am

@@ -4,5 +4,5 @@ INCLUDES =					\
 	-I$(top_builddir) -I$(top_srcdir)	\
 	-I@srcdir@
 
-LDADD = $(top_builddir)/libxml.la @Z_LIBS@
+LDADD = $(top_builddir)/libxml2.la @Z_LIBS@
 

libxml.spec.in

@@ -110,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO
 %doc /usr/man/man1/xmllint.1*
-%doc /usr/man/man1/xml-config.1*
+%doc /usr/man/man1/xml2-config.1*
 %doc /usr/man/man4/libxml.4*
 %doc doc/*.html doc/html
 
@@ -124,4 +124,4 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/*a
 %{prefix}/lib/*.sh
 %{prefix}/include/*
-%{prefix}/bin/xml-config
+%{prefix}/bin/xml2-config