[Libreoffice-commits] core.git: configure.ac

[David Ostrovsky]

 configure.ac |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit c260273f4dfff579d3a3a1132742b46cdb699e70
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Mon Feb 11 22:31:52 2013 +0100

    fix cross compiling with icu 50.1.2
    
    Change-Id: Ib112a2d3f9a75890591137a78b46be982b7d43df
    Reviewed-on: https://gerrit.libreoffice.org/2112
    Reviewed-by: Joren De Cuyper <joren.libreoffice at telenet.be>
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/configure.ac b/configure.ac
index 55e4d73..c906e0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8611,6 +8611,13 @@ You can use --with-system-icu-for-build=force to use it anyway.])
         fi
     fi
 
+    if test "$cross_compiling" = "yes"; then
+       if test "$ICU_MAJOR" -ge "50"; then
+            AC_MSG_RESULT([Ignore ICU_MINOR as obviously the libraries don't include the minor version in their names any more])
+            ICU_MINOR=""
+       fi
+    fi
+
     libo_MINGW_CHECK_DLL([ICUDATA], [icudata][$ICU_MAJOR][$ICU_MINOR])
     libo_MINGW_CHECK_DLL([ICUI18N], [icui18n][$ICU_MAJOR][$ICU_MINOR])
     libo_MINGW_CHECK_DLL([ICUUC], [icuuc][$ICU_MAJOR][$ICU_MINOR])