[PATCH] fix cross compiling with icu 50.1.2

[David Ostrovsky (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2112

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/2112/1

fix cross compiling with icu 50.1.2

Change-Id: Ib112a2d3f9a75890591137a78b46be982b7d43df
---
M configure.ac
1 file changed, 7 insertions(+), 0 deletions(-)



diff --git a/configure.ac b/configure.ac
index 55e4d73..abfd30b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8611,6 +8611,13 @@
         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])

-- 
To view, visit https://gerrit.libreoffice.org/2112
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib112a2d3f9a75890591137a78b46be982b7d43df
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky <David.Ostrovsky at gmx.de>