From 622b4c77b9c52b5889db2c73e5bda9d322e4decb Mon Sep 17 00:00:00 2001
From: Neill Miller <neillm@thecodefactory.org>
Date: Fri, 30 Aug 2019 09:13:57 -0400
Subject: [PATCH] Explicitly quote the ICU_LIB shell expansion (resolves
 #1130). Update clang compiler version to 5.0.

---
 .travis.yml | 4 ++--
 install.sh  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1d7dd2fc..738b45b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ matrix:
               sources:
                 - sourceline: 'ppa:h-rayflood/llvm'
               packages:
-                - clang-3.8
+                - clang-5.0
         - os: linux
           compiler: gcc
           env: LINK=dynamic
@@ -66,7 +66,7 @@ install:
 
     # Export CC/CXX to control compiler/version.
     - if [[ $OSX   && $CLANG && $STATIC  ]]; then export CC=clang; export CXX=clang++; fi
-    - if [[ $LINUX && $CLANG && $STATIC  ]]; then export CC=clang-3.8; export CXX=clang++-3.8; fi
+    - if [[ $LINUX && $CLANG && $STATIC  ]]; then export CC=clang-5.0; export CXX=clang++-5.0; fi
     - if [[ $LINUX && $GCC   && $STATIC  ]]; then export CC=gcc; export CXX=g++; fi
     - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
     - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
diff --git a/install.sh b/install.sh
index 9c32090b..4b580e3c 100755
--- a/install.sh
+++ b/install.sh
@@ -506,7 +506,7 @@ initialize_boost_icu_configuration()
         BOOST_ICU_POSIX="off"
 
         # Extract ICU libs from package config variables and augment with -ldl.
-        ICU_LIBS=( `pkg-config icu-i18n --libs` "-ldl" )
+        ICU_LIBS="`pkg-config icu-i18n --libs` -ldl"
 
         # This is a hack for boost m4 scripts that fail with ICU dependency.
         # See custom edits in ax-boost-locale.m4 and ax_boost_regex.m4.