[Libreoffice-commits] .: redland/raptor

[Christian Lohmaier]

 redland/raptor/makefile.mk                 |   10 ++++++++--
 redland/raptor/raptor-1.4.18.libxml.patch  |   13 +++++++++++++
 redland/raptor/raptor-1.4.18.libxslt.patch |   13 +++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 4a97a447960d97441d2e151f8ed10ccc4a1b8431
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Jun 4 02:03:19 2011 +0200

    make sure to compile against SDK version of libxml/libxslt
    
    might not be the most elegant solution, but should do the trick

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 61d1e5a..e0e4968 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -36,8 +36,8 @@ TARGET=so_raptor
 
 .IF "$(SYSTEM_REDLAND)" == "YES"
 all:
-    @echo "An already available installation of Redland RDF should exist on your system."
-    @echo "Therefore the version provided here does not need to be built in addition."
+	@echo "An already available installation of Redland RDF should exist on your system."
+	@echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -66,6 +66,12 @@ OOO_PATCH_FILES += \
 
 PATCH_FILES=$(OOO_PATCH_FILES)
 
+.IF "$(SYSTEM_LIBXML)" == "YES"
+PATCH_FILES+=raptor-1.4.18.libxml.patch
+.ENDIF
+.IF "$(SYSTEM_LIBXSLT)" == "YES"
+PATCH_FILES+=raptor-1.4.18.libxslt.patch
+.ENDIF
 
 .IF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
diff --git a/redland/raptor/raptor-1.4.18.libxml.patch b/redland/raptor/raptor-1.4.18.libxml.patch
new file mode 100644
index 0000000..d5627cd
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.libxml.patch
@@ -0,0 +1,13 @@
+--- misc/raptor-1.4.18/configure	2011-06-04 01:25:04.000000000 +0200
++++ misc/build/raptor-1.4.18/configure	2011-06-04 01:24:57.000000000 +0200
+@@ -26447,8 +26447,8 @@
+     CPPFLAGS="-I$srcdir/libxml $CPPFLAGS"
+     LIBS="$LIBS -Llibxml -llibxml"
+   else
+-    LIBS="$LIBS `$XML_CONFIG --libs`"
+-    CPPFLAGS="`$XML_CONFIG --cflags` $CPPFLAGS"
++    LIBS="$LIBS $LIBXML_LIBS"
++    CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS"
+   fi
+   RAPTOR_XML_PARSER=libxml
+ fi
diff --git a/redland/raptor/raptor-1.4.18.libxslt.patch b/redland/raptor/raptor-1.4.18.libxslt.patch
new file mode 100644
index 0000000..488aa48
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.libxslt.patch
@@ -0,0 +1,13 @@
+--- misc/raptor-1.4.18/configure	2011-06-04 01:34:34.000000000 +0200
++++ misc/build/raptor-1.4.18/configure	2011-06-04 01:34:08.000000000 +0200
+@@ -26474,8 +26474,8 @@
+ fi
+ 
+ if test $need_libxslt = 1; then
+-  LIBS="$LIBS `$XSLT_CONFIG --libs`"
+-  CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS"
++  LIBS="$LIBS $LIBXSLT_LIBS"
++  CPPFLAGS="$LIBXSLT_CFLAGS $CPPFLAGS"
+ fi
+ 
+ RAPTOR_LIBTOOLLIBS=libraptor.la