Update ICU to 54.1 step 1

source/configure.ac

Index: source/configure.ac
diff --git a/source/configure.ac b/source/configure.ac
index f56b533b4534e13b75d97984caa66b569fe7e2ab..b30c8d0313ee801808f63548d7e4df820243d23c 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -1,5 +1,5 @@
 # -*-autoconf-*-
-AC_COPYRIGHT([ Copyright (c) 1999-2013, International Business Machines Corporation and others. All Rights Reserved. ])
+AC_COPYRIGHT([ Copyright (c) 1999-2014, International Business Machines Corporation and others. All Rights Reserved. ])
 # configure.in for ICU
 # Stephen F. Booth, heavily modified by Yves and others
 
@@ -7,15 +7,13 @@ AC_COPYRIGHT([ Copyright (c) 1999-2013, International Business Machines Corporat
 AC_PREREQ(2.68)
 
 # Process this file with autoconf to produce a configure script
-AC_INIT([ICU])
-
-#TODO: IcuBug:8502
-#AC_INIT([ICU],
-#        m4_esyscmd_s([sed -n 's/^[ 	]*#[ 	]*define[ 	]*U_ICU_VERSION[ 	]*"\([^"]*\)".*/\1/p' "./common/unicode/uvernum.h]"),
-#        [http://icu-project.org/bugs],
-#        [International Components for Unicode],
-#        [http://icu-project.org])
+AC_INIT([ICU],
+        m4_esyscmd_s([sed -n 's/^[ 	]*#[ 	]*define[ 	]*U_ICU_VERSION[ 	]*"\([^"]*\)".*/\1/p' "./common/unicode/uvernum.h]"),
+        [http://icu-project.org/bugs],
+        [International Components for Unicode],
+        [http://icu-project.org])
 
+AC_CONFIG_MACRO_DIR([config/m4])
 AC_CONFIG_SRCDIR([common/unicode/utypes.h])
 
 PACKAGE="icu"
@@ -137,6 +135,10 @@ AC_PROG_CC([clang gcc cc c99 c89 xlc_r xlc cl.exe icc])
 # The g++ compiler is less likely to support C++11.
 AC_PROG_CXX([clang++ g++ c++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC])
 
+# pkg-config is needed for harfbuzz support
+PKG_PROG_PKG_CONFIG([0.20])
+PKG_CHECK_MODULES(ICULEHB, icu-le-hb, have_icu_le_hb=true, :)
+
 # Ensure that if CXXFLAGS/CFLAGS were not set when calling configure, set it correctly based on (enable/disable) debug or release option
 # The release mode use is the default one for autoconf
 if test "$GCC" = yes; then
@@ -330,7 +332,7 @@ AC_SUBST(UCLN_NO_AUTO_CLEANUP)
 MSVC_RELEASE_FLAG=""
 if test $enabled = yes
 then
-    if test $icu_cv_host_frag = mh-cygwin-msvc
+    if test $icu_cv_host_frag = mh-cygwin-msvc -o $icu_cv_host_frag = mh-msys-msvc
     then
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
     #if defined _MSC_VER && _MSC_VER >= 1400
@@ -1063,7 +1065,7 @@ ICU_CONDITIONAL(ICUIO, test "$icuio" = true)
 
 # Enable/disable layout
 AC_ARG_ENABLE(layout,
-	[  --enable-layout         build ICU's layout library [default=yes]],
+	[  --enable-layout         build ICU's DEPRECATED layout library [default=yes]],
 	[case "${enableval}" in
 		yes) layout=true ;;
 		no)  layout=false ;;
@@ -1072,6 +1074,19 @@ AC_ARG_ENABLE(layout,
 	layout=true)
 ICU_CONDITIONAL(LAYOUT, test "$layout" = true)
 
+# Enable/disable layoutex
+AC_ARG_ENABLE(layoutex,
+	[  --enable-layoutex         build ICU's Paragraph Layout library [default=same-as-layout].
+            If not building with the ICU Layout library, then icu-le-hb must be installed via pkg-config.
+            See http://harfbuzz.org],
+	[case "${enableval}" in
+		yes) layoutex=true ;;
+		no)  layoutex=false ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-layoutex) ;;
+		esac],
+	layoutex=$layout)
+ICU_CONDITIONAL(LAYOUTEX, test "$layoutex" = true)
+
 # Enable/disable tools
 AC_ARG_ENABLE(tools,
 	[  --enable-tools         build ICU's tools [default=yes]],
@@ -1084,7 +1099,13 @@ AC_ARG_ENABLE(tools,
 ICU_CONDITIONAL(TOOLS, test "$tools" = true)
 
 AC_ARG_WITH(data-packaging,
-	[  --with-data-packaging=type specify how to package ICU data (files, archive, library, static, auto) [default=auto]],
+	[  --with-data-packaging     specify how to package ICU data. Possible values:
+        files    raw files (.res, etc)
+        archive  build a single icudtXX.dat file
+        library  shared library (.dll/.so/etc.)
+        static   static library (.a/.lib/etc.)
+        auto     build shared if possible (default)
+           See http://userguide.icu-project.org/icudata for more info.],
 	[case "${withval}" in
                 files|archive|library) datapackaging=$withval ;;
 		auto) datapackaging=$withval ;;
@@ -1325,6 +1346,7 @@ AC_CONFIG_FILES([icudefs.mk \
 		test/perf/Makefile \
 		test/perf/collationperf/Makefile \
 		test/perf/collperf/Makefile \
+		test/perf/collperf2/Makefile \
 		test/perf/dicttrieperf/Makefile \
 		test/perf/ubrkperf/Makefile \
 		test/perf/charperf/Makefile \
@@ -1338,7 +1360,7 @@ AC_CONFIG_FILES([icudefs.mk \
 		test/perf/ustrperf/Makefile \
 		test/perf/utfperf/Makefile \
 		test/perf/utrie2perf/Makefile \
-                test/perf/leperf/Makefile \
+		test/perf/leperf/Makefile \
 		samples/Makefile samples/date/Makefile \
 		samples/cal/Makefile samples/layout/Makefile])
 AC_OUTPUT