doing some testing and raising the build requirement to 2.5.10 applied

* configure.in libxslt.spec.in: doing some testing and raising
  the build requirement to 2.5.10
* libexslt/Makefile.am configure.in: applied patch from Graham Wilson
  for linking the exslt lib with the lib being build instead of the
  installed one
Daniel

5 files changed, 17 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 8c27dea9..9fb4e817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Oct 24 00:49:05 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+	* configure.in libxslt.spec.in: doing some testing and raising
+	  the build requirement to 2.5.10 
+	* libexslt/Makefile.am configure.in: applied patch from Graham Wilson
+	  for linking the exslt lib with the lib being build instead of the
+	  installed one
+
 Thu Oct 23 15:48:39 HKT 2003 William Brack <wbrack@mmm.com.hk>
 
 	* libxslt/pattern.c: Fixed problem with cascaded predicates
diff --git a/configure.in b/configure.in
index 982fb715..3459469e 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ PACKAGE=libxslt
 LIBEXSLT_MAJOR_VERSION=0
 LIBEXSLT_MINOR_VERSION=7
 LIBEXSLT_MICRO_VERSION=22
-LIBXML_REQUIRED_VERSION=2.6.0
+LIBXML_REQUIRED_VERSION=2.5.10
 
 
 LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION
@@ -388,22 +388,6 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
-#
-# Some fun with prelinking :-(
-# try to check if there is already an installed shared lib of the same level
-#
-INSTALLED_XSLT_LIB=""
-if test -d $prefix
-then
-    shared_xslt_lib="$prefix/lib/libxslt.so.$LIBXSLT_MAJOR_VERSION"
-    shared_xslt_la="$prefix/lib/libxslt.la"
-    if test -f $shared_xslt_lib -a -f $shared_xslt_la
-    then
-	INSTALLED_XSLT_LIB="-L$libdir -lxslt"
-    fi
-fi
-AC_SUBST(INSTALLED_XSLT_LIB)
-
 dnl
 dnl In build tree I use a static version with memory debug enabled
 dnl
diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am
index b2f3702d..ac540991 100644
--- a/libexslt/Makefile.am
+++ b/libexslt/Makefile.am
@@ -25,10 +25,8 @@ libexslt_la_SOURCES =                   \
 	libexslt.h			\
 	dynamic.c
 
-# The following DOES NOT WORK reliably. Sorry no prelinking to uninstalled
-# yet libraries.
-# libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
-libexslt_la_LIBADD = $(INSTALLED_XSLT_LIB) $(EXTRA_LIBS)
+# The following DOES NOT WORK reliably.
+libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
 libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@
 
 man_MANS = libexslt.3
diff --git a/libxslt.spec.in b/libxslt.spec.in
index 986919a4..b18cfeaf 100644
--- a/libxslt.spec.in
+++ b/libxslt.spec.in
@@ -1,14 +1,14 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
 Version: @VERSION@
-Release: 1
+Release: test1
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://xmlsoft.org/XSLT/
-Requires: libxml2 >= 2.5.6
-BuildRequires: libxml2-devel >= 2.5.6
+Requires: libxml2 >= 2.5.10
+BuildRequires: libxml2-devel >= 2.5.10
 BuildRequires: python python-devel
 BuildRequires: libxml2-python
 Prefix: %{_prefix}
diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h
index 71e35f78..66126c66 100644
--- a/libxslt/xsltwin32config.h
+++ b/libxslt/xsltwin32config.h
@@ -21,21 +21,21 @@ extern "C" {
  *
  * the version string like "1.2.3"
  */
-#define LIBXSLT_DOTTED_VERSION "1.0.33"
+#define LIBXSLT_DOTTED_VERSION "1.0.34"
 
 /**
  * LIBXSLT_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXSLT_VERSION 10033
+#define LIBXSLT_VERSION 10034
 
 /**
  * LIBXSLT_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXSLT_VERSION_STRING "10033"
+#define LIBXSLT_VERSION_STRING "10034"
 
 /**
  * WITH_XSLT_DEBUG: