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

[Tor Lillqvist]

 configure.in |   20 ++++++++++++++++++++
 set_soenv.in |    1 +
 2 files changed, 21 insertions(+)

New commits:
commit edab596cb00faa6e56448e6beef45b6d989716d5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu May 26 02:55:20 2011 +0300

    Add --with-icu-native-build-root switch
    
    Must be used when cross-compiling the bundled ICU. Will then be
    forwarded to the ICU configury as its --with-cross-build switch.

diff --git a/configure.in b/configure.in
index 6b6d6cf..a623d41 100755
--- a/configure.in
+++ b/configure.in
@@ -1263,6 +1263,19 @@ AC_ARG_WITH(mingw-cross-compiler,
     ],
 ,)
 
+AC_ARG_WITH(icu-native-build-root,
+    AS_HELP_STRING([--with-icu-native-build-root],
+        [Specify the the 'source' directory of a native build of ICU.])
+    [
+                          Usage:     --with-icu-native-build-root=<path>>
+
+                          When cross-compiling and not using a "system" ICU,
+                          specify the path to the "source" directory of the
+                          ICU build in a native LibreOffice build tree. For example
+                          --with-icu-native-build-root=/Users/tml/lo-macosx/icu/unxmacxi.pro/misc/build/icu/source  
+    ],
+,)
+
 AC_ARG_WITH(build-version,
     AS_HELP_STRING([--with-build-version],
         [Allows the builder to add a custom version tag that will appear in the
@@ -5494,6 +5507,12 @@ else
     AC_MSG_RESULT([internal])
     SYSTEM_ICU=NO
     BUILD_TYPE="$BUILD_TYPE ICU"
+    if test "$cross_compiling" = "yes"; then
+        if test "$with_icu_native_build_root" = "" ; then
+            AC_MSG_ERROR([when cross-compiling ICU you must use --with-icu-native-build-root])
+        fi
+        ICU_NATIVE_BUILD_ROOT="$with_icu_native_build_root"
+    fi
 fi
 AC_SUBST(SYSTEM_ICU)
 AC_SUBST(SYSTEM_GENBRK)
@@ -5502,6 +5521,7 @@ AC_SUBST(SYSTEM_GENCMN)
 AC_SUBST(ICU_MAJOR)
 AC_SUBST(ICU_MINOR)
 AC_SUBST(ICU_MICRO)
+AC_SUBST(ICU_NATIVE_BUILD_ROOT)
 
 dnl ===================================================================
 dnl Graphite
diff --git a/set_soenv.in b/set_soenv.in
index ee990a9..6aa53c5 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1773,6 +1773,7 @@ if ( '@CROSS_COMPILING@' ne '' )
    ToFile( "CXX_FOR_BUILD",     "@CXX_FOR_BUILD@",  "e" );
    ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", "@GXX_INCLUDE_PATH_FOR_BUILD@", "e" );
    ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" );
+   ToFile( "ICU_NATIVE_BUILD_ROOT", "@ICU_NATIVE_BUILD_ROOT@", "e");
 }
 else
 {