From 2cef98d7f76cdd302afcf15f1c585379537e8f1d Mon Sep 17 00:00:00 2001
From: Raul Marin <git@rmr.ninja>
Date: Fri, 23 Feb 2018 15:25:13 +0100
Subject: [PATCH] ICU DATA: Default to icu-config if u_getDataDirectory fails

---
 SConstruct | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index 649c01fff..1651824ec 100644
--- a/SConstruct
+++ b/SConstruct
@@ -830,9 +830,16 @@ int main() {
         context.did_show_result=1
     if ret[0]:
         context.Result('u_getDataDirectory returned %s' % ret[1])
+        return ret[1].strip()
     else:
-        context.Result('Failed to detect (mapnik-config will have null value)')
-    return ret[1].strip()
+        ret = call("icu-config --icudatadir", silent=True)
+        if ret:
+            context.Result('icu-config returned %s' % ret)
+            return ret
+        else:
+            context.Result('Failed to detect (mapnik-config will have null value)')
+            return ''
+
 
 def CheckGdalData(context, silent=False):