ICU 56 update step 1

source/configure.ac

 # -*-autoconf-*-
-AC_COPYRIGHT([ Copyright (c) 1999-2014, International Business Machines Corporation and others. All Rights Reserved. ])
+AC_COPYRIGHT([ Copyright (c) 1999-2015, International Business Machines Corporation and others. All Rights Reserved. ])
 # configure.in for ICU
 # Stephen F. Booth, heavily modified by Yves and others
 
+# NOTE: please use 'autoreconf' to rebuild, otherwise 'aclocal && autoconf'.
+
 # Check for autoconf version
-AC_PREREQ(2.68)
+AC_PREREQ(2.69)
 
-# Process this file with autoconf to produce a configure script
+# Process this file with autoreconf to produce a configure script
 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"
@@ skipping 382 matching lines @@
 )
 AC_MSG_RESULT($enabled)
 AC_SUBST(U_ENABLE_TRACING)
 
 # check if elf.h is present.
 AC_CHECK_HEADERS([elf.h])
 if test "x$ac_cv_header_elf_h" = "xyes"; then
     CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
 fi
 
+# Enable/disable plugins
+AC_ARG_ENABLE(plugins,
+        [  --enable-plugins        enable plugins [default=no]],
+        [case "${enableval}" in
+                yes) plugins=true ;;
+                no)  plugins=false ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-plugins) ;;
+                esac],
+        plugins=false)
+ICU_CONDITIONAL(PLUGINS, test "$plugins" = true)
+
+if test "x$plugins" = "xtrue"; then
+   UCONFIG_CPPFLAGS="$UCONFIG_CPPFLAGS -DUCONFIG_ENABLE_PLUGINS=1"
+fi
+
+
 U_ENABLE_DYLOAD=1
 enable=yes
-AC_MSG_CHECKING([whether to enable dynamic loading of plugins])
+AC_MSG_CHECKING([whether to enable dynamic loading of plugins. Ignored if plugins disabled.])
 AC_ARG_ENABLE(dyload,
     [  --disable-dyload        disable dynamic loading [default=no]],
     [ case "${enableval}" in
              yes|"")
                      U_ENABLE_DYLOAD=1
                      enable=yes
                      ;;
              no)
                  U_ENABLE_DYLOAD=0;
                  enable=no;
@@ skipping 87 matching lines @@
 else
         U_HAVE_ATOMIC=0
 fi
 # Make this available via CPPFLAGS
 CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_ATOMIC=${U_HAVE_ATOMIC}"
 AC_SUBST(U_HAVE_ATOMIC)
 
 AC_LANG_POP([C++])
 
 # Always build ICU with multi-threading support.
-threads=true
-ICU_USE_THREADS=1
 OLD_LIBS=${LIBS}
 
-if test $threads = true; then
-  # For Compaq Tru64 (OSF1), we must look for pthread_attr_init
-  # and must do this before seaching for pthread_mutex_destroy, or
-  # we will pick up libpthreads.so not libpthread.so
-  # If this fails, then we must test for HPUX specials, before
-  # moving on to a more generic test
+# For Compaq Tru64 (OSF1), we must look for pthread_attr_init
+# and must do this before seaching for pthread_mutex_destroy, or
+# we will pick up libpthreads.so not libpthread.so
+# If this fails, then we must test for HPUX specials, before
+# moving on to a more generic test
 
-  AC_CHECK_LIB(pthread, pthread_attr_init)
-  if test $ac_cv_lib_pthread_pthread_attr_init = yes; then
-    ICU_USE_THREADS=1
+AC_CHECK_LIB(pthread, pthread_attr_init)
+if test $ac_cv_lib_pthread_pthread_attr_init = yes; then
+  :
+else
+  # Locate the right library for POSIX threads. We look for the
+  # symbols in the libraries first, because on Solaris libc provides
+  # pthread_create but libpthread has the real code :(
+  # AIX uses libpthreads instead of libpthread, and HP/UX uses libpthread
+  # FreeBSD users may need libpthread if they do not have libc_r.
+
+  AC_SEARCH_LIBS_FIRST(pthread_mutex_destroy, pthread pthreads c_r )
+
+  if test "$ac_cv_search_pthread_mutex_destroy" != no; then
+    :
   else
-    # Locate the right library for POSIX threads. We look for the
-    # symbols in the libraries first, because on Solaris libc provides
-    # pthread_create but libpthread has the real code :(
-    # AIX uses libpthreads instead of libpthread, and HP/UX uses libpthread
-    # FreeBSD users may need libpthread if they do not have libc_r.
-
-    AC_SEARCH_LIBS_FIRST(pthread_mutex_destroy, pthread pthreads c_r )
-
-    if test "$ac_cv_search_pthread_mutex_destroy" != no; then
-      ICU_USE_THREADS=1
-    else
-      # For HP 11
-      AC_CHECK_LIB(pthread, pthread_mutex_init)
-      if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
-        ICU_USE_THREADS=1
-      fi
-    fi
-
-    AC_CHECK_FUNC(pthread_mutex_lock)
-
-    if test $ac_cv_func_pthread_mutex_lock = yes; then
-      ICU_USE_THREADS=1
+    # For HP 11
+    AC_CHECK_LIB(pthread, pthread_mutex_init)
+    if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
+      :
     fi
   fi
-  # Check to see if we are using CygWin with MSVC
-  case "${host}" in
-  *-pc-cygwin*|*-pc-mingw*)
-    # For gcc, the thread options are set by mh-mingw/mh-cygwin
-    # For msvc, the thread options are set by runConfigureICU
-    ICU_USE_THREADS=1
-    ;;
-  *-*-hpux*)
-    # Add -mt because it does several nice things on newer compilers.
-    case "${icu_cv_host_frag}" in
-      mh-hpux-acc)
-        OLD_CXXFLAGS="${CXXFLAGS}"
-        CXXFLAGS="${CXXFLAGS} -mt"
-        if test x"`${CXX} ${CXXFLAGS} 2>&1`" != x""; then
-           CXXFLAGS="${OLD_CXXFLAGS}"
-        else
-           UCONFIG_CXXFLAGS="${UCONFIG_CXXFLAGS} -mt"
-        fi
-      ;;
-    esac
-    ;;
-  *-*-solaris*)
-    case "${icu_cv_host_frag}" in
-      mh-solaris)
-           LIBS="${LIBS} -mt"
-      ;;
-    esac
+
+  AC_CHECK_FUNC(pthread_mutex_lock)
+
+  if test $ac_cv_func_pthread_mutex_lock = yes; then
+    :
+  fi
+fi
+# Check to see if we are using CygWin with MSVC
+case "${host}" in
+*-pc-cygwin*|*-pc-mingw*)
+  # For gcc, the thread options are set by mh-mingw/mh-cygwin
+  # For msvc, the thread options are set by runConfigureICU
+  :
+  ;;
+*-*-hpux*)
+  # Add -mt because it does several nice things on newer compilers.
+  case "${icu_cv_host_frag}" in
+    mh-hpux-acc)
+      OLD_CXXFLAGS="${CXXFLAGS}"
+      CXXFLAGS="${CXXFLAGS} -mt"
+      if test x"`${CXX} ${CXXFLAGS} 2>&1`" != x""; then
+         CXXFLAGS="${OLD_CXXFLAGS}"
+      else
+         UCONFIG_CXXFLAGS="${UCONFIG_CXXFLAGS} -mt"
+      fi
     ;;
   esac
-fi
+  ;;
+*-*-solaris*)
+  case "${icu_cv_host_frag}" in
+    mh-solaris)
+         LIBS="${LIBS} -mt"
+    ;;
+  esac
+  ;;
+esac
 
 AC_ARG_ENABLE(weak-threads,
         [  --enable-weak-threads   weakly reference the threading library [default=no]],
         [case "${enableval}" in
                 yes)
             LIB_THREAD="${LIBS%${OLD_LIBS}}"
             LIBS=${OLD_LIBS}
             ;;
                 no)  ;;
                 *) AC_MSG_ERROR(bad value ${enableval} for --enable-weak-threads) ;;
@@ skipping 41 matching lines @@
         X*) GENCCODE_ASSEMBLY="-a sun-x86" ;;
         esac
         unset asv
     else
         GENCCODE_ASSEMBLY="-a sun-x86"
     fi ;;
 sparc-*-solaris*)
     GENCCODE_ASSEMBLY="-a sun"
     ;;
 ia64-*-hpux*)
-    GENCCODE_ASSEMBLY="-a aCC-ia64"
+# There has been some issues with building ICU data on HPUX ia64 aCC
+# when using the assemble code setting below.  For now, build without
+# assemble code for this platform.  This will increase the build time.   
+#    GENCCODE_ASSEMBLY="-a aCC-ia64"
     ;;
 esac
 AC_SUBST(GENCCODE_ASSEMBLY)
 
 AC_MSG_RESULT($GENCCODE_ASSEMBLY)
 
 # Checks for header files
 AC_CHECK_HEADERS(inttypes.h)
 if test $ac_cv_header_inttypes_h = no; then
  U_HAVE_INTTYPES_H=0
@@ skipping 775 matching lines @@
    echo "C++ apps may want to build with CXXFLAGS = ${UCONFIG_CXXFLAGS}"
 fi
 
 if test "$tools" = false;
 then
         echo "## Note: you have disabled ICU's tools. This ICU cannot build its own data or tests."
         echo "## Expect build failures in the 'data', 'test', and other directories."
 fi
 
 $as_unset _CXX_CXXSUFFIX