- Makefile.am configure.in libxml-2.0.pc.in: started working on getting

libxml2-devel installable in // as libxml-devel.
Daniel

ChangeLog

@@ -1,3 +1,8 @@
+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
+	  libxml2-devel installable in // as libxml-devel.
+
 Sat Jan 27 18:49:02 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* doc/Makefile.am: fixed make rebuild in doc

Makefile.am

@@ -11,11 +11,11 @@ bin_PROGRAMS = xmllint
 bin_SCRIPTS=xml-config
 
 lib_LTLIBRARIES = libxml.la
-libxml_la_LIBADD = @Z_LIBS@
+libxml2_la_LIBADD = @Z_LIBS@
 
-libxml_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
+libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
 
-libxml_la_SOURCES = \
+libxml2_la_SOURCES = \
 		SAX.c \
 		entities.c \
 		encoding.c \
@@ -38,8 +38,8 @@ libxml_la_SOURCES = \
 		nanohttp.c \
 		nanoftp.c
 
-DEPS = $(top_builddir)/libxml.la
-LDADDS = $(top_builddir)/libxml.la @Z_LIBS@ @M_LIBS@
+DEPS = $(top_builddir)/libxml2.la
+LDADDS = $(top_builddir)/libxml2.la @Z_LIBS@ @M_LIBS@
 
 man_MANS = xmllint.1 xml-config.1 libxml.4
 
@@ -79,7 +79,7 @@ $(srcdir)/libxml:
 
 install-data: $(srcdir)/libxml
 
-$(libxml_la_SOURCES): $(srcdir)/libxml
+$(libxml2_la_SOURCES): $(srcdir)/libxml
 
 testall : tests SVGtests SAXtests
 

configure.in

@@ -145,7 +145,7 @@ AC_CHECK_FUNC(isinf, , AC_CHECK_LIB(m, isinf,
 
 XML_LIBDIR='-L${libdir}'
 XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
-XML_LIBS="-lxml $Z_LIBS $M_LIBS $LIBS"
+XML_LIBS="-lxml2 $Z_LIBS $M_LIBS $LIBS"
 
 dnl
 dnl Extra flags

libxml-2.0.pc.in

@@ -8,5 +8,5 @@ Name: libXML
 Version: @VERSION@
 Description: libXML library.
 Requires:
-Libs: -L${libdir} -lxml @Z_LIBS@ @M_LIBS@ @LIBS@
+Libs: -L${libdir} -lxml2 @Z_LIBS@ @M_LIBS@ @LIBS@
 Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@