[xslt] 1.0.27 patches



1. Properly work when trio is needed. Note you need to drop in trio.h
   and triodef.h into the libxslt directory.
2. Sync Python detection with libxml 2.5.5.

-- 
albert chin (china@thewrittenword.com)

-- snip snip
--- libxslt/xsltutils.c.orig	Mon Mar 24 20:27:33 2003
+++ libxslt/xsltutils.c	Mon Mar 24 20:54:17 2003
@@ -48,9 +48,7 @@
 
 #ifdef XSLT_NEED_TRIO
 #include "trio.h"
-#ifdef __VMS 
-# define vsnprintf trio_vsnprintf
-#endif
+#define vsnprintf trio_vsnprintf
 #endif
 
 /************************************************************************
--- python/Makefile.am.orig	Mon Mar 24 00:22:54 2003
+++ python/Makefile.am	Tue Mar 25 16:40:11 2003
@@ -6,6 +6,7 @@
 INCLUDES = \
 	-I$(PYTHON_INCLUDES) \
 	 $(LIBXML_CFLAGS) \
+	-I$(top_srcdir)/libxslt \
 	-I$(top_srcdir)
 
 DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
--- python/libxslt.c.orig	Tue Mar 25 15:47:09 2003
+++ python/libxslt.c	Tue Mar 25 17:10:25 2003
@@ -21,6 +21,9 @@
 
 #if (defined(_MSC_VER) || defined(__MINGW32__)) && !defined(vsnprintf)
 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
+#elif defined(XSLT_NEED_TRIO)
+#include "trio.h"
+#define vsnprintf trio_vsnprintf
 #endif
 
 /* #define DEBUG */
--- configure.in.orig	Mon Mar 24 00:22:24 2003
+++ configure.in	Tue Mar 25 16:24:52 2003
@@ -153,12 +153,18 @@
 PYTHON_SITE_PACKAGES=
 AC_ARG_WITH(python, [  --with-python[=DIR]    Build Python bindings if found])
 if test "$with_python" != "no" ; then
-    if test -x "$with_python"
+    if test -x "$with_python/bin/python"
     then
-        echo Found python in $with_python
-        PYTHON="$with_python"
+        echo Found python in $with_python/bin/python
+        PYTHON="$with_python/bin/python"
     else
-	AC_PATH_PROG(PYTHON, python python2.2 python2.1 python2.0 python1.6 python1.5)
+	if test -x "$with_python"
+	then
+	    echo Found python in $with_python
+	    PYTHON="$with_python"
+	else
+	    AC_PATH_PROG(PYTHON, python python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
+	fi
     fi
     if test "$PYTHON" != ""
     then
@@ -405,12 +411,6 @@
 AC_SUBST(PYTHON_SITE_PACKAGES)
 
 XSLT_LIBDIR='-L${libdir}'
-
-case ${host} in
-    *-*-solaris*)
-        XSLT_LIBDIR="${XSLT_LIBDIR} -R${libdir}"
-	;;
-esac
 
 XSLT_INCLUDEDIR='-I${includedir}'
 XSLT_LIBS="-lxslt $LIBXML_LIBS $M_LIBS"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]