[Libreoffice-commits] .: configure.in set_soenv.in

[Tor Lillqvist]

 configure.in |    9 ++++++++-
 set_soenv.in |    1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 5c1411208c1432646f6ab4409dcf9fedef2f1804
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue May 24 02:48:19 2011 +0300

    Use the build OS xsltproc when cross-compiling

diff --git a/configure.in b/configure.in
index 0d58e83..6ed7ea1 100755
--- a/configure.in
+++ b/configure.in
@@ -4311,11 +4311,18 @@ else
    AC_MSG_RESULT([internal])
    SYSTEM_LIBXSLT=NO
    BUILD_TYPE="$BUILD_TYPE LIBXSLT"
+
+   if test "$cross_compiling" = "yes"; then
+      AC_PATH_PROG(XSLTPROC, xsltproc, no)
+      if test "$XSLTPROC" = "no"; then
+         AC_MSG_ERROR([xsltproc is required])
+      fi
+   fi
 fi
 AC_SUBST(SYSTEM_LIBXSLT)
 AC_SUBST(LIBXSLT_CFLAGS)
 AC_SUBST(LIBXSLT_LIBS)
-
+AC_SUBST(XSLTPROC)
 
 dnl ===================================================================
 dnl Check for system libxml
diff --git a/set_soenv.in b/set_soenv.in
index 0744891..ee990a9 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1975,6 +1975,7 @@ ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
 ToFile( "SYSTEM_LIBXSLT",    "@SYSTEM_LIBXSLT@",   "e" );
 ToFile( "LIBXSLT_CFLAGS",    "@LIBXSLT_CFLAGS@",   "e" );
 ToFile( "LIBXSLT_LIBS",      "@LIBXSLT_LIBS@",     "e" );
+ToFile( "XSLTPROC",          "@XSLTPROC@",         "e" );
 ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" );
 ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" );
 ToFile( "SYSTEM_MESA_HEADERS","@SYSTEM_MESA_HEADERS@","e" );