Update ICU to 54.1 step 1

source/acinclude.m4

-# Copyright (c) 1999-2013, International Business Machines Corporation and
+# Copyright (c) 1999-2014, International Business Machines Corporation and
 # others. All Rights Reserved.
 # acinclude.m4 for ICU
 # Don't edit aclocal.m4, do edit acinclude.m4
 # Stephen F. Booth
 
 # @TOP@
 
 # ICU_CHECK_MH_FRAG
 AC_DEFUN([ICU_CHECK_MH_FRAG], [
         AC_CACHE_CHECK(
@@ skipping 13 matching lines @@
         else
                 icu_cv_host_frag=mh-alpha-linux-cc
         fi ;;
 powerpc*-*-linux*)
         if test "$GCC" = yes; then
                 icu_cv_host_frag=mh-linux
         else
                 icu_cv_host_frag=mh-linux-va
         fi ;;
 *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
-*-*-cygwin|*-*-mingw32|*-*-mingw64)
+i[[34567]]86-*-cygwin) 
         if test "$GCC" = yes; then
-                AC_TRY_COMPILE([
-#ifndef __MINGW32__
-#error This is not MinGW
-#endif], [], AC_TRY_COMPILE([
-#ifndef __MINGW64__
-#error This is not MinGW64
-#endif], [], icu_cv_host_frag=mh-mingw64, icu_cv_host_frag=mh-mingw), icu_cv_host_frag=mh-cygwin)
+                icu_cv_host_frag=mh-cygwin
         else
                 icu_cv_host_frag=mh-cygwin-msvc
         fi ;;
+x86_64-*-cygwin) 
+        if test "$GCC" = yes; then
+                icu_cv_host_frag=mh-cygwin64
+        else
+                icu_cv_host_frag=mh-cygwin-msvc
+        fi ;;
+*-*-mingw*)
+        if test "$GCC" = yes; then
+                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#ifndef __MINGW64__
+#error This is not MinGW64
+#endif]])],                        [icu_cv_host_frag=mh-mingw64],
+                                   [icu_cv_host_frag=mh-mingw])
+        else
+                case "${host}" in
+                *-*-mingw*) icu_cv_host_frag=mh-msys-msvc ;;
+                *-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
+                esac
+        fi ;;
 *-*-*bsd*|*-*-dragonfly*)       icu_cv_host_frag=mh-bsd-gcc ;;
 *-*-aix*)
         if test "$GCC" = yes; then
                 icu_cv_host_frag=mh-aix-gcc
         else
                 icu_cv_host_frag=mh-aix-va
         fi ;;
 *-*-hpux*)
         if test "$GCC" = yes; then
                 icu_cv_host_frag=mh-hpux-gcc
@@ skipping 198 matching lines @@
                 case "${host}" in
                 sparc*-*-solaris*)
                     # 1. try -m64
                     CFLAGS="${CFLAGS} -m64"
                     CXXFLAGS="${CXXFLAGS} -m64"
                     AC_RUN_IFELSE([AC_LANG_SOURCE([int main(void) {return (sizeof(void*)*8==64)?0:1;}])],
                        CAN_BUILD_64=yes, CAN_BUILD_64=no, CAN_BUILD_64=unknown)
                     if test "$CAN_BUILD_64" != yes; then
                         # Nope. back out changes.
                         CFLAGS="${CFLAGS_OLD}"
-                        CXXFLAGS="${CFLAGS_OLD}"
+                        CXXFLAGS="${CXXFLAGS_OLD}"
                         # 2. try xarch=v9 [deprecated]
                         ## TODO: cross compile: the following won't work.
                         SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
                         SOL64=`$CXX -xarch=v9 2>&1 && $CC -xarch=v9 2>&1 | grep -v usage:`
                         # "Warning: -xarch=v9 is deprecated, use -m64 to create 64-bit programs"
                         if test -z "$SOL64" && test -n "$SPARCV9"; then
                             CFLAGS="${CFLAGS} -xtarget=ultra -xarch=v9"
                             CXXFLAGS="${CXXFLAGS} -xtarget=ultra -xarch=v9"
                             LDFLAGS="${LDFLAGS} -xtarget=ultra -xarch=v9"
                             CAN_BUILD_64=yes
@@ skipping 174 matching lines @@
             ac_use_strict_options=yes
         fi
       ], [ac_use_strict_options=yes])
     AC_MSG_RESULT($ac_use_strict_options)
 
     if test "$ac_use_strict_options" = yes
     then
         if test "$GCC" = yes
         then
             case "${host}" in
-            *-*-solaris*)
-                # Don't use -std=c99 option on Solaris/GCC
-                ;;
             *)
                 # Do not use -ansi. It limits us to C90, and it breaks some platforms.
                 # We use -std=c99 to disable the gnu99 defaults and its associated warnings
                 CFLAGS="$CFLAGS -std=c99"
                 ;;
             esac
             
             CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
         else
             case "${host}" in
             *-*-cygwin)
                 if test "`$CC /help 2>&1 | head -c9`" = "Microsoft"
                 then
                     CFLAGS="$CFLAGS /W4"
-                fi
+                fi ;;
+            *-*-mingw*)
+                CFLAGS="$CFLAGS -W4" ;;
             esac
         fi
         if test "$GXX" = yes
         then
             CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
         else
             case "${host}" in
             *-*-cygwin)
                 if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
                 then
                     CXXFLAGS="$CXXFLAGS /W4"
-                fi
+                fi ;;
+            *-*-mingw*)
+                CFLAGS="$CFLAGS -W4" ;;
             esac
         fi
     fi
 ])