Ticket #40044: patch-configure.ac.diff

configure.ac

@@ -55 +55 @@
 # regex grammar
 # check bison is installed and print its version
 #
-AX_PROG_BISON([echo -n "bison version is... " && bison --version | head -n 1])
+AX_PROG_BISON([printf "bison version is... " && bison --version | head -n 1])
 
 # libintl.h would be necessary if we used Bison's i18n setup
 #AC_CHECK_HEADERS([libintl.h])
@@ -81 +81 @@
   # Add a trailing slash if we don't have one
   case "$ICU_CONFIG" in
   */) ;;
-  *) ICU_CONFIG+='/' ;;
+  *) ICU_CONFIG="${ICU_CONFIG}/" ;;
   esac
 
   # Check that icu-config exists
@@ -93 +93 @@
 # FIXME: icu-config from ICU cross-compiled with mingw wants libicuuc.dll,
 # which won't exist if ICU was compiled static only, so we temporarily add
 # --noverify until we figure out what to do about this.
-ICU_CONFIG+='icu-config --noverify'
+ICU_CONFIG="${ICU_CONFIG}icu-config --noverify"
 
 AC_MSG_WARN([Disregard the next few lines where ICU_* are printed.])
 AC_MSG_WARN([They're all wrong but we fix them up before using them.])
@@ -131 +131 @@
 duff_icu_compile_flags='-ansi -g -O2 -O3 -std=c99 -pthread -mthreads'
 if test x"$CXX" = "xclang++" ; then
   # These cause clang to freak out on Fedora 18
-  duff_icu_compile_flags+=' -Wp,-D_FORTIFY_SOURCE=2'
+  duff_icu_compile_flags="$duff_icu_compile_flags -Wp,-D_FORTIFY_SOURCE=2"
 fi
 
 LG_REMOVE_FLAGS([ICU_CFLAGS],   [$duff_icu_compile_flags])
@@ -307 +307 @@
 AX_APPEND_COMPILE_FLAGS([$ICU_CPPFLAGS $BOOST_CPPFLAGS], [CPPFLAGS])
 AX_APPEND_COMPILE_FLAGS([$ICU_CXXFLAGS $BOOST_CXXFLAGS], [CXXFLAGS]) 
 
-LG_UNIQ_FLAGS([CPPFLAGS])
-LG_UNIQ_FLAGS([CFLAGS])
-LG_UNIQ_FLAGS([CXXFLAGS])