diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2001-09-12 20:19:58 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2001-09-12 20:19:58 +0000 |
| commit | 07cdb2a84f11404d9f4afe2b89e599e96d79e36e (patch) | |
| tree | 01510bccbe5f9ec91557b722f4180da0cb616c6c | |
| parent | 04382ae3d6fbca19e73220337512a7e1c21c002f (diff) | |
| download | libxml2-07cdb2a84f11404d9f4afe2b89e599e96d79e36e.tar.gz | |
moved includes to includedir/libxml2/libxml, updated the configuration
* config.h.in configure.in libxml.spec.in include/libxml/Makefile.am
libxml-2.0.pc.in: moved includes to includedir/libxml2/libxml,
updated the configuration scripts systems accordingly
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | include/libxml/Makefile.am | 4 | ||||
| -rw-r--r-- | libxml-2.0.pc.in | 4 | ||||
| -rw-r--r-- | libxml.spec.in | 7 |
6 files changed, 14 insertions, 12 deletions
@@ -1,3 +1,9 @@ +Wed Sep 12 22:14:55 CEST 2001 Daniel Veillard <daniel@veillard.com> + + * config.h.in configure.in libxml.spec.in include/libxml/Makefile.am + libxml-2.0.pc.in: moved includes to includedir/libxml2/libxml, + updated the configuration scripts systems accordingly + Wed Sep 12 20:49:32 CEST 2001 Daniel Veillard <daniel@veillard.com> * configure.in: preparing for 2.4.4 diff --git a/config.h.in b/config.h.in index 07ded072..bf54bc04 100644 --- a/config.h.in +++ b/config.h.in @@ -91,9 +91,6 @@ /* Define if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H -/* Define if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - /* Define if you have the <errno.h> header file. */ #undef HAVE_ERRNO_H diff --git a/configure.in b/configure.in index a80634fd..3a8eadfa 100644 --- a/configure.in +++ b/configure.in @@ -143,7 +143,7 @@ AC_CHECK_FUNC(isinf, AC_DEFINE(HAVE_ISINF) , AC_CHECK_LIB(m, isinf, [AC_DEFINE(HAVE_ISINF)])) XML_LIBDIR='-L${libdir}' -XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}' +XML_INCLUDEDIR='-I${includedir}/libxml2/libxml -I${includedir}/libxml2' dnl dnl Extra flags diff --git a/include/libxml/Makefile.am b/include/libxml/Makefile.am index 38ad0ef5..d2843285 100644 --- a/include/libxml/Makefile.am +++ b/include/libxml/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -xmlincdir = $(includedir)/libxml +xmlincdir = $(includedir)/libxml2/libxml xmlinc_HEADERS = \ SAX.h \ @@ -32,6 +32,6 @@ xmlinc_HEADERS = \ catalog.h install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml + $(mkinstalldirs) $(DESTDIR)$(xmlincdir)/libxml2 $(DESTDIR)$(xmlincdir)/libxml2/libxml EXTRA_DIST = xmlversion.h.in xmlwin32version.h.in diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in index d93b3e77..328059ba 100644 --- a/libxml-2.0.pc.in +++ b/libxml-2.0.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: libXML Version: @VERSION@ -Description: libXML library. +Description: libXML library version2. Requires: Libs: -L${libdir} -lxml2 @Z_LIBS@ @M_LIBS@ @LIBS@ -Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ +Cflags: -I${includedir}/libxml2/libxml @XML_CFLAGS@ diff --git a/libxml.spec.in b/libxml.spec.in index efef779b..9303d3fc 100644 --- a/libxml.spec.in +++ b/libxml.spec.in @@ -117,8 +117,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO -%doc /usr/share/man/man1/xmllint.1* -%doc /usr/share/man/man4/libxml.4* +%doc %{prefix}/share/man/man1/xmllint.1* +%doc %{prefix}/share/man/man4/libxml.4* %{prefix}/lib/lib*.so.* %{prefix}/bin/xmllint @@ -136,5 +136,4 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/include/* %{prefix}/bin/xml2-config %{prefix}/share/aclocal/libxml.m4 -# I'm not certain if this should be included in the distribution or not. -#%{prefix}/lib/pkgconfig/libxml-2.0.pc +%{prefix}/lib/pkgconfig/libxml-2.0.pc |