ICU-8502 still do the previous version scan, but at least let autoconf know what...

X-SVN-Rev: 36375

diff --git a/icu4c/source/configure b/icu4c/source/configure
index bf1f012e471508d3dd5421d14926feaded64065f..c900991426caf11206a015fe48c4ea28c537dec9 100755 (executable)
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
@@ -1,6 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.69 for ICU 54.1.
+#
+# Report bugs to <http://icu-project.org/bugs>.
 #
 #  Copyright (c) 1999-2014, International Business Machines Corporation and others. All Rights Reserved.
 #
@@ -266,7 +268,8 @@ fi
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: http://icu-project.org/bugs about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -577,14 +580,13 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="ICU"
+PACKAGE_NAME='ICU'
+PACKAGE_TARNAME='International Components for Unicode'
+PACKAGE_VERSION='54.1'
+PACKAGE_STRING='ICU 54.1'
+PACKAGE_BUGREPORT='http://icu-project.org/bugs'
+PACKAGE_URL='http://icu-project.org'
+
 ac_unique_file="common/unicode/utypes.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -834,7 +836,7 @@ sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
@@ -1334,7 +1336,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures ICU 54.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1382,7 +1384,8 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/International
+                          Components for Unicode]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1398,7 +1401,9 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of ICU 54.1:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -1420,7 +1425,7 @@ Optional Features:
   --enable-weak-threads   weakly reference the threading library default=no
   --enable-extras         build ICU extras default=yes
   --enable-icuio          build ICU's icuio library default=yes
-  --enable-layout         build ICU's layout library default=no
+  --enable-layout         build ICU's DEPRECATED layout library default=yes
   --enable-tools         build ICU's tools default=yes
   --enable-tests          build ICU tests default=yes
   --enable-samples        build ICU samples default=yes
@@ -1457,7 +1462,8 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to the package provider.
+Report bugs to <http://icu-project.org/bugs>.
+ICU home page: <http://icu-project.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1520,7 +1526,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-configure
+ICU configure 54.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2067,6 +2073,10 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ------------------------------------------ ##
+## Report this to http://icu-project.org/bugs ##
+## ------------------------------------------ ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -2208,7 +2218,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by ICU $as_me 54.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2557,13 +2567,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-#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])
-
 
 
 PACKAGE="icu"
@@ -7254,7 +7257,7 @@ if test "${enable_layout+set}" = set; then :
                *) as_fn_error $? "bad value ${enableval} for --enable-layout" "$LINENO" 5 ;;
                esac
 else
-  layout=false
+  layout=true
 fi
 
 
@@ -8040,7 +8043,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by ICU $as_me 54.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8087,13 +8090,14 @@ Usage: $0 [OPTION]... [TAG]...
 Configuration files:
 $config_files
 
-Report bugs to the package provider."
+Report bugs to <http://icu-project.org/bugs>.
+ICU home page: <http://icu-project.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-config.status
+ICU config.status 54.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/icu4c/source/configure.ac b/icu4c/source/configure.ac
index 99cc950ae6809007b3b81fbc65d102393dc7cc34..35ae378d2c5da96af69c85ae978071c284316cd2 100644 (file)
--- a/icu4c/source/configure.ac
+++ b/icu4c/source/configure.ac
@@ -7,14 +7,11 @@ AC_COPYRIGHT([ Copyright (c) 1999-2014, 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_SRCDIR([common/unicode/utypes.h])