[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

 configure.in |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 8961452bdb957a6c83e3b4592d1a864aa3a118db
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 13 01:07:18 2011 +0300

    Use system libxml2 on iOS

diff --git a/configure.in b/configure.in
index 04fd7c9..8857c24 100755
--- a/configure.in
+++ b/configure.in
@@ -4332,7 +4332,7 @@ AC_SUBST(XSLTPROC)
 # ===================================================================
 AC_MSG_CHECKING([which libxml to use])
 if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
-            "$_os" = "Darwin" && \
+            "$_os" = "Darwin" -o $_os = iOS && \
     test "$with_system_libxml" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBXML=YES
@@ -4341,6 +4341,11 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
         LIBXML_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/usr/include/libxml2"
         dnl omit -L/usr/lib
         LIBXML_LIBS="-lxml2 -lz -lpthread -liconv -lm"
+    elif test $_os = iOS; then
+        dnl make sure to use SDK path
+        usr=`echo '#include <stdlib.h>' | $CC -E -MD - | grep usr/include/stdlib.h | head -1 | sed -e 's,# 1 ",,' -e 's,/usr/include/.*,/usr,'`
+        LIBXML_CFLAGS="-I$usr/include/libxml2"
+        LIBXML_LIBS="-L$usr/lib -lxml2 -liconv"
     else
         PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0)
     fi