Commit 4ace1c66 authored by Murray Cumming's avatar Murray Cumming Committed by Murray Cumming

removed acinclude.m4 because we do not need it anymore because we do not

2003-12-19  Murray Cumming  <murrayc@usa.net>

        * removed acinclude.m4 because we do not need it anymore because
        we do not need AM_LIBXML now that we use pkg-config.
        * libxml++/Makefile.am: Generate a library with 2.5 in the name,
        instead of 1.0
        * configure.in: Change version to 2.5.0.
        * examples/Makefile.am_fragment: Link to the new library name.
        * Renamed libxml++-1.0.pc.in to libxml++-2.6.pc.in: and changed the
        library name that pkg-config reports for --libs.
        * So, this is now the libxml++ 2.6 API, with a library name of 2.5
        while it is unstable. It is parallel-installable with libxml++ 1.0.
parent 7a5f0c2a
2003-12-19 Murray Cumming <murrayc@usa.net>
* removed acinclude.m4 because we do not need it anymore because
we do not need AM_LIBXML now that we use pkg-config.
* libxml++/Makefile.am: Generate a library with 2.5 in the name,
instead of 1.0
* configure.in: Change version to 2.5.0.
* examples/Makefile.am_fragment: Link to the new library name.
* Renamed libxml++-1.0.pc.in to libxml++-2.6.pc.in: and changed the
library name that pkg-config reports for --libs.
* So, this is now the libxml++ 2.6 API, with a library name of 2.5
while it is unstable. It is parallel-installable with libxml++ 1.0.
This is the HEAD branch, for libxml++ 2.5/2.6.
1.0.0:
2003-12-18 Ephraim Vider <eff@eplication.com>
......
......@@ -2,12 +2,12 @@
SUBDIRS = libxml++ docs examples
EXTRA_DIST = libxml++-1.0.pc.in libxml++.spec.in
EXTRA_DIST = libxml++-2.6.pc.in libxml++.spec.in
DIST_SUBDIRS = $(SUBDIRS) win32_msvc6
# Install the pkg-config file:
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libxml++-1.0.pc
pkgconfig_DATA = libxml++-2.6.pc
......@@ -14,6 +14,6 @@ Read the file 'INSTALL' for instructions to compile and install the library.
See the examples directory for example code.
Use pkg-config to discover the necessary include and linker arguments. For instance,
pkg-config libxml++-1.0 --cflags --libs
pkg-config libxml++-2.6 --cflags --libs
Ideally you would use PKG_CHECK_MODULES in your configure.ac file.
See http://www.murrayc.com for generic help with that.
dnl AM_LIBXML([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
AC_DEFUN(AM_LIBXML,
[
AC_MSG_CHECKING(for libxml version >= 2.5.1)
if xml2-config --libs print > /dev/null 2>&1; then
vers=`xml2-config --version | sed -e "s/libxml //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
if test $vers -ge 2005001; then
AC_MSG_RESULT(yes)
LIBXML_CFLAGS=`xml2-config --cflags`
LIBXML_LIBS=`xml2-config --libs`
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
ifelse([$1], , :, [$1])
else
AC_MSG_RESULT(no)
ifelse([$2], , , [$2])
fi
elif xml-config --libs print > /dev/null 2>&1; then
vers=`xml-config --version | sed -e "s/libxml //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'`
if test $vers -ge 2000000; then
AC_MSG_RESULT(yes)
LIBXML_CFLAGS=`xml-config --cflags`
LIBXML_LIBS=`xml-config --libs`
AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
ifelse([$1], , :, [$1])
else
AC_MSG_RESULT(no)
ifelse([$2], , , [$2])
fi
else
AC_MSG_RESULT(no)
ifelse([$2], , , [$2])
fi
])
AC_INIT(libxml++/libxml++.h)
#release versioning
GENERIC_MAJOR_VERSION=1
GENERIC_MINOR_VERSION=0
GENERIC_MAJOR_VERSION=2
GENERIC_MINOR_VERSION=5
GENERIC_MICRO_VERSION=0
GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION
AC_SUBST(GENERIC_VERSION)
......@@ -71,6 +71,6 @@ AC_OUTPUT(
win32_msvc6/Makefile
win32_msvc6/examples/Makefile
libxml++-1.0.pc
libxml++-2.6.pc
libxml++.spec
)
......@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta http-equiv="Content-Language" content="en-us">
<meta name="description" content="MySQL C++ API: A C++ wrapper for the MySQL C API.">
<meta name="description" content="libxml++, libxml, C++, C++ wrapper, XML.">
<meta name="KEYWORDS" content="libxml++, libxml, C++, C++ wrapper, XML">
<title>libxml++</title>
</head>
......
......@@ -2,4 +2,4 @@
INCLUDES = -I$(top_srcdir)/ @LIBXML_CFLAGS@
#The libraries that the executable needs to link against:
LIBS = $(top_builddir)/libxml++/libxml++-1.0.la @LIBS@ @LIBXML_LIBS@
LIBS = $(top_builddir)/libxml++/libxml++-2.5.la @LIBS@ @LIBXML_LIBS@
......@@ -7,6 +7,6 @@ Name: libxml++
Description: C++ wrapper for libxml
Requires:
Version: @VERSION@
Libs: -L${libdir} -lxml++-1.0 @LIBXML_LIBS@
Cflags: -I${includedir}/libxml++-1.0 -I${libdir}/libxml++-1.0/include
Libs: -L${libdir} -lxml++-2.5 @LIBXML_LIBS@
Cflags: -I${includedir}/libxml++-2.6 -I${libdir}/libxml++-2.6/include
......@@ -7,16 +7,16 @@ h_sources_private =
cc_sources = attribute.cc dtd.cc document.cc noncopyable.cc keepblanks.cc
cc_sources_private =
lib_LTLIBRARIES = libxml++-1.0.la
libxml___1_0_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
libxml___1_0_la_LIBADD = @LIBXML_LIBS@ \
lib_LTLIBRARIES = libxml++-2.5.la
libxml___2_5_la_LDFLAGS = -version-info $(GENERIC_LIBRARY_VERSION)
libxml___2_5_la_LIBADD = @LIBXML_LIBS@ \
parsers/libparsers.la \
exceptions/libexceptions.la \
nodes/libnodes.la \
io/libio.la
libxml___1_0_la_SOURCES = $(cc_sources) $(h_sources_public) $(h_sources_private) $(cc_sources_private)
libxml___2_5_la_SOURCES = $(cc_sources) $(h_sources_public) $(h_sources_private) $(cc_sources_private)
# Install the headers:
library_includedir=$(includedir)/libxml++-1.0/libxml++
library_includedir=$(includedir)/libxml++-2.6/libxml++
library_include_HEADERS = $(h_sources_public)
......@@ -8,5 +8,5 @@ noinst_LTLIBRARIES = libexceptions.la
libexceptions_la_SOURCES = $(h_sources_public) $(cc_sources)
# Install the headers:
library_includedir=$(includedir)/libxml++-1.0/libxml++/exceptions
library_includedir=$(includedir)/libxml++-2.6/libxml++/exceptions
library_include_HEADERS = $(h_sources_public)
......@@ -9,6 +9,6 @@ noinst_LTLIBRARIES = libio.la
libio_la_SOURCES = $(cc_sources) $(h_sources_public) $(h_sources_private) $(cc_sources_private)
# Install the headers:
library_includedir=$(includedir)/libxml++-1.0/libxml++/io
library_includedir=$(includedir)/libxml++-2.6/libxml++/io
library_include_HEADERS = $(h_sources_public)
......@@ -25,5 +25,5 @@ noinst_LTLIBRARIES = libnodes.la
libnodes_la_SOURCES = $(h_sources_public) $(cc_sources)
# Install the headers:
library_includedir=$(includedir)/libxml++-1.0/libxml++/nodes
library_includedir=$(includedir)/libxml++-2.6/libxml++/nodes
library_include_HEADERS = $(h_sources_public)
......@@ -8,5 +8,5 @@ noinst_LTLIBRARIES = libparsers.la
libparsers_la_SOURCES = $(h_sources_public) $(cc_sources)
# Install the headers:
library_includedir=$(includedir)/libxml++-1.0/libxml++/parsers
library_includedir=$(includedir)/libxml++-2.6/libxml++/parsers
library_include_HEADERS = $(h_sources_public)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment