2002-10-19 Art Haas <ahaas@neosoft.com>

	* configure.in: Replace AC_CONFIG_HEADER with AC_CONFIG_HEADERS,
	add AC_HELP_STRING to all AC_ARG_WITH and AC_ARG_ENABLE macros,
	add autoconf quotes to the AC_CONFIG_AUX_DIR macro.
	* configure: Regenerated.

3 files changed, 170 insertions, 119 deletions

diff --git a/ChangeLog b/ChangeLog
index ccbc9508e3..922e0d9bb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-19  Art Haas <ahaas@neosoft.com>
+
+	* configure.in: Replace AC_CONFIG_HEADER with AC_CONFIG_HEADERS,
+	add AC_HELP_STRING to all AC_ARG_WITH and AC_ARG_ENABLE macros,
+	add autoconf quotes to the AC_CONFIG_AUX_DIR macro.
+	* configure: Regenerated.
+
 2002-10-19  Roland McGrath  <roland@redhat.com>
 
 	* configure.in: Call AC_CONFIG_SUBDIRS with empty argument
diff --git a/configure b/configure
index 225c3b0efe..81d217ae83 100755
--- a/configure
+++ b/configure
@@ -846,42 +846,45 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-sanity-checks really do not use threads (should not be used
-			  except in special situations) default=yes
-  --enable-shared         build shared library default=yes if GNU ld & ELF
-  --enable-profile        build profiled library default=yes
-  --enable-omitfp         build undebuggable optimized library default=no
-  --enable-bounded        build with runtime bounds checking default=no
-  --disable-versioning    do not include versioning information in the
-                          library objects default=yes if supported
-  --enable-oldest-abi=ABI configure the oldest ABI supported e.g. 2.2
-                          default=glibc default
-  --enable-add-ons=DIR1,DIR2...
-			  configure and build add-ons in DIR1,DIR2,...
-                          search for add-ons if no parameter given
+  --disable-sanity-checks really do not use threads (should not be used except
+                          in special situations) [default=yes]
+  --enable-shared         build shared library [default=yes if GNU ld &
+                          ELF]
+  --enable-profile        build profiled library [default=yes]
+  --enable-omitfp         build undebuggable optimized library
+                          [default=no]
+  --enable-bounded        build with runtime bounds checking
+                          [default=no]
+  --disable-versioning    do not include versioning information in the library
+                          objects [default=yes if supported]
+  --enable-oldest-abi=ABI configure the oldest ABI supported [e.g. 2.2]
+                          [default=glibc default]
+  --enable-add-ons[=DIRS...]
+                          configure and build add-ons in DIR1,DIR2,... search
+                          for add-ons if no parameter given
   --disable-hidden-plt    do not hide internal function calls to avoid PLT
-  --enable-static-nss     build static NSS modules default=no
+  --enable-static-nss     build static NSS modules [default=no]
   --disable-force-install don't force installation of files from this package,
-			  even if they are older than the installed files
-  --enable-kernel=VERSION compile for compatibility with kernel not older
-                           than VERSION
+                          even if they are older than the installed files
+  --enable-kernel=VERSION compile for compatibility with kernel not older than
+                          VERSION
   --enable-all-warnings   enable all useful warnings gcc can issue
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gmp=DIRECTORY	  find GMP source code in DIRECTORY (not needed)
+  --with-gmp=DIRECTORY    find GMP source code in DIRECTORY (not needed)
   --with-gd=DIR           find libgd include dir and library with prefix DIR
   --with-gd-include=DIR   find libgd include files in DIR
   --with-gd-lib=DIR       find libgd library files in DIR
-  --with-fp		  if using floating-point hardware default=yes
-  --with-binutils=PATH	  specify location of binutils (as and ld)
-  --with-elf		  if using the ELF object format
-  --with-xcoff		  if using the XCOFF object format
+  --with-fp               if using floating-point hardware [default=yes]
+  --with-binutils=PATH    specify location of binutils (as and ld)
+  --with-elf              if using the ELF object format
+  --with-xcoff            if using the XCOFF object format
   --without-cvs           if CVS should not be used
-  --with-headers=PATH     location of system headers to use
-                          e.g. /usr/src/linux/include
-                          default=compiler default
+  --with-headers=PATH     location of system headers to use (for example
+                          /usr/src/linux/include) [default=compiler
+                          default]
   --with-tls              enable support for TLS
   --without-__thread      do not use TLS features even when supporting them
 
@@ -1318,7 +1321,8 @@ config_vars=
 # Check whether --with-gmp or --without-gmp was given.
 if test "${with_gmp+set}" = set; then
   withval="$with_gmp"
-  case "$with_gmp" in
+
+case "$with_gmp" in
 yes) { { echo "$as_me:$LINENO: error: --with-gmp requires an argument; use --with-gmp=DIRECTORY" >&5
 echo "$as_me: error: --with-gmp requires an argument; use --with-gmp=DIRECTORY" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -4880,7 +4884,7 @@ if test "${libc_cv_asm_underscores+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4883 "configure"
+#line 4887 "configure"
 #include "confdefs.h"
 void underscore_test(void) {
 return; }
@@ -5177,7 +5181,7 @@ if test "${libc_cv_gcc_dwarf2_unwind_info+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat > conftest.c <<EOF
-#line 5180 "configure"
+#line 5184 "configure"
 static char *__EH_FRAME_BEGIN__;
 _start ()
 {
@@ -5276,7 +5280,7 @@ if test "${libc_cv_gcc_builtin_expect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat > conftest.c <<EOF
-#line 5279 "configure"
+#line 5283 "configure"
 int foo (int a)
 {
   a = __builtin_expect (a, 10);
@@ -5344,7 +5348,7 @@ if test "${libc_cv_gcc_subtract_local_labels+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat > conftest.c <<EOF
-#line 5347 "configure"
+#line 5351 "configure"
 int foo (int a)
 {
   static const int ar[] = { &&l1 - &&l1, &&l2 - &&l1 };
diff --git a/configure.in b/configure.in
index df18b8b935..5e5ba827af 100644
--- a/configure.in
+++ b/configure.in
@@ -3,26 +3,28 @@ AC_REVISION([$CVSid$])
 AC_PREREQ(2.53)dnl		dnl Minimum Autoconf version required.
 AC_INIT([GNU C Library], [(see version.h)], [glibc])
 AC_CONFIG_SRCDIR([include/features.h])
-AC_CONFIG_HEADER(config.h)
-AC_CONFIG_AUX_DIR(scripts)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([scripts])
 
 # This will get text that should go into config.make.
 config_vars=
 
 # Check for a --with-gmp argument and set gmp-srcdir in config.make.
-AC_ARG_WITH(gmp, dnl
-  --with-gmp=DIRECTORY	  find GMP source code in DIRECTORY (not needed),
-	    [dnl
+AC_ARG_WITH([gmp],
+            AC_HELP_STRING([--with-gmp=DIRECTORY],
+                           [find GMP source code in DIRECTORY (not needed)]),
+	    [
 case "$with_gmp" in
-yes) AC_MSG_ERROR(--with-gmp requires an argument; use --with-gmp=DIRECTORY) ;;
+yes) AC_MSG_ERROR([--with-gmp requires an argument; use --with-gmp=DIRECTORY]) ;;
 ''|no) ;;
 *) config_vars="$config_vars
 gmp-srcdir = $withval" ;;
 esac
 ])
 # Check for a --with-gd argument and set libgd-LDFLAGS in config.make.
-AC_ARG_WITH(gd, dnl
-  --with-gd=DIR           find libgd include dir and library with prefix DIR,
+AC_ARG_WITH([gd],
+            AC_HELP_STRING([--with-gd=DIR],
+                           [find libgd include dir and library with prefix DIR]),
 	    [dnl
 case "$with_gd" in
 yes|''|no) ;;
@@ -30,16 +32,18 @@ yes|''|no) ;;
    libgd_ldflags="-L$withval/lib" ;;
 esac
 ])
-AC_ARG_WITH(gd-include, dnl
-  --with-gd-include=DIR   find libgd include files in DIR,
+AC_ARG_WITH([gd-include],
+            AC_HELP_STRING([--with-gd-include=DIR],
+                           [find libgd include files in DIR]),
             [dnl
 case "$with_gd_include" in
 ''|no) ;;
 *) libgd_include="-I$withval" ;;
 esac
 ])
-AC_ARG_WITH(gd-lib, dnl
-  --with-gd-lib=DIR       find libgd library files in DIR,
+AC_ARG_WITH([gd-lib],
+            AC_HELP_STRING([--with-gd-lib=DIR],
+                           [find libgd library files in DIR]),
             [dnl
 case "$with_gd_lib" in
 ''|no) ;;
@@ -57,22 +61,32 @@ libgd-LDFLAGS = $libgd_ldflags"
 fi
 
 dnl Arguments to specify presence of other packages/features.
-AC_ARG_WITH(fp, dnl
-[  --with-fp		  if using floating-point hardware [default=yes]],
-	    with_fp=$withval, with_fp=yes)
+AC_ARG_WITH([fp],
+            AC_HELP_STRING([--with-fp],
+                           [if using floating-point hardware @<:@default=yes@:>@]),
+	    [with_fp=$withval],
+	    [with_fp=yes])
 AC_SUBST(with_fp)
-AC_ARG_WITH(binutils, dnl
-  --with-binutils=PATH	  specify location of binutils (as and ld),
-	    path_binutils=$withval, path_binutils='')
-AC_ARG_WITH(elf, dnl
-  --with-elf		  if using the ELF object format,
-	    elf=$withval, elf=no)
-AC_ARG_WITH(xcoff, dnl
-  --with-xcoff		  if using the XCOFF object format,
-	    xcoff=$withval, xcoff=no)
-AC_ARG_WITH(cvs, dnl
-[  --without-cvs           if CVS should not be used],
-	    with_cvs=$withval, with_cvs=yes)
+AC_ARG_WITH([binutils],
+            AC_HELP_STRING([--with-binutils=PATH],
+                           [specify location of binutils (as and ld)]),
+	    [path_binutils=$withval],
+	    [path_binutils=''])
+AC_ARG_WITH([elf],
+            AC_HELP_STRING([--with-elf],
+                           [if using the ELF object format]),
+	    [elf=$withval],
+	    [elf=no])
+AC_ARG_WITH([xcoff],
+            AC_HELP_STRING([--with-xcoff],
+                           [if using the XCOFF object format]),
+	    [xcoff=$withval],
+	    [xcoff=no])
+AC_ARG_WITH([cvs],
+            AC_HELP_STRING([--without-cvs],
+                           [if CVS should not be used]),
+	    [with_cvs=$withval],
+	    [with_cvs=yes])
 if test "$with_cvs" = yes; then
   if test -d $srcdir/CVS && grep :pserver: $srcdir/CVS/Root > /dev/null
   then
@@ -81,46 +95,61 @@ if test "$with_cvs" = yes; then
 fi
 AC_SUBST(with_cvs)
 
-AC_ARG_WITH(headers, dnl
-[  --with-headers=PATH     location of system headers to use
-                          [e.g. /usr/src/linux/include]
-                          [default=compiler default]],
-	    sysheaders=$withval, sysheaders='')
+AC_ARG_WITH([headers],
+            AC_HELP_STRING([--with-headers=PATH],
+	                   [location of system headers to use
+			    (for example /usr/src/linux/include)
+			    @<:@default=compiler default@:>@]),
+	    [sysheaders=$withval],
+	    [sysheaders=''])
 
-AC_ARG_ENABLE(sanity-checks, dnl
-[  --disable-sanity-checks really do not use threads (should not be used
-			  except in special situations) [default=yes]],
-              enable_sanity=$enableval, enable_sanity=yes)
+AC_ARG_ENABLE([sanity-checks],
+              AC_HELP_STRING([--disable-sanity-checks],
+                             [really do not use threads (should not be used except in special situations) @<:@default=yes@:>@]),
+	      [enable_sanity=$enableval],
+	      [enable_sanity=yes])
 
 dnl Arguments to enable or disable building the static, shared, profiled,
 dnl and -fomit-frame-pointer libraries.
 dnl I've disabled this for now since we cannot build glibc without static
 dnl libraries built in the moment.
-dnl AC_ARG_ENABLE(static, dnl
-dnl [  --enable-static         build static library [default=yes]],
-dnl	      static=$enableval, static=yes)
+dnl AC_ARG_ENABLE([static],
+dnl               AC_HELP_STRING([--enable-static],
+dnl                              [build static library @<:@default=yes@:>@]),
+dnl               [static=$enableval],
+dnl               [static=yes])
 static=yes
-AC_ARG_ENABLE(shared, dnl
-[  --enable-shared         build shared library [default=yes if GNU ld & ELF]],
-	      shared=$enableval, shared=default)
-AC_ARG_ENABLE(profile, dnl
-[  --enable-profile        build profiled library [default=yes]],
-	      profile=$enableval, profile=yes)
-AC_ARG_ENABLE(omitfp, dnl
-[  --enable-omitfp         build undebuggable optimized library [default=no]],
-	      omitfp=$enableval, omitfp=no)
-AC_ARG_ENABLE(bounded, dnl
-[  --enable-bounded        build with runtime bounds checking [default=no]],
-	      bounded=$enableval, bounded=no)
-AC_ARG_ENABLE(versioning, dnl
-[  --disable-versioning    do not include versioning information in the
-                          library objects [default=yes if supported]],
-             enable_versioning=$enableval, enable_versioning=yes)
-
-AC_ARG_ENABLE(oldest-abi, dnl
-[  --enable-oldest-abi=ABI configure the oldest ABI supported [e.g. 2.2]
-                          [default=glibc default]],
-	    oldest_abi=$enableval, oldest_abi=no)
+AC_ARG_ENABLE([shared],
+              AC_HELP_STRING([--enable-shared],
+                             [build shared library @<:@default=yes if GNU ld & ELF@:>@]),
+	      [shared=$enableval],
+	      [shared=default])
+AC_ARG_ENABLE([profile],
+              AC_HELP_STRING([--enable-profile],
+                             [build profiled library @<:@default=yes@:>@]),
+	      [profile=$enableval],
+	      [profile=yes])
+AC_ARG_ENABLE([omitfp],
+              AC_HELP_STRING([--enable-omitfp],
+                             [build undebuggable optimized library @<:@default=no@:>@]),
+	      [omitfp=$enableval],
+	      [omitfp=no])
+AC_ARG_ENABLE([bounded],
+              AC_HELP_STRING([--enable-bounded],
+                             [build with runtime bounds checking @<:@default=no@:>@]),
+	      [bounded=$enableval],
+	      [bounded=no])
+AC_ARG_ENABLE([versioning],
+              AC_HELP_STRING([--disable-versioning],
+                             [do not include versioning information in the library objects @<:@default=yes if supported@:>@]),
+	      [enable_versioning=$enableval],
+	      [enable_versioning=yes])
+
+AC_ARG_ENABLE([oldest-abi],
+              AC_HELP_STRING([--enable-oldest-abi=ABI],
+                             [configure the oldest ABI supported @<:@e.g. 2.2@:>@ @<:@default=glibc default@:>@]),
+	      [oldest_abi=$enableval],
+	      [oldest_abi=no])
 if test "$oldest_abi" = yes || test "$oldest_abi" = no; then
   oldest_abi=default
 else
@@ -129,10 +158,9 @@ fi
 AC_SUBST(oldest_abi)
 
 dnl Generic infrastructure for drop-in additions to libc.
-AC_ARG_ENABLE(add-ons, dnl
-[  --enable-add-ons[=DIR1,DIR2]...
-			  configure and build add-ons in DIR1,DIR2,...
-                          search for add-ons if no parameter given],
+AC_ARG_ENABLE([add-ons],
+              AC_HELP_STRING([--enable-add-ons@<:@=DIRS...@:>@],
+                             [configure and build add-ons in DIR1,DIR2,...  search for add-ons if no parameter given]),
   [case "$enableval" in
     yes) add_ons=`cd $srcdir && echo */configure | sed -e 's!/configure!!g'`
 	 test "$add_ons" = "*" && add_ons= ;;
@@ -142,17 +170,23 @@ AC_ARG_ENABLE(add-ons, dnl
 
 dnl Let the user avoid using TLS.  Don't know why but...
 dnl XXX For now we disable support by default.
-AC_ARG_WITH(tls, dnl
-[  --with-tls              enable support for TLS],
-	    usetls=$withval, usetls=no)
-
-AC_ARG_WITH(__thread, dnl
-[  --without-__thread      do not use TLS features even when supporting them],
-	    use__thread=$withval, use__thread=yes)
-
-AC_ARG_ENABLE(hidden-plt, dnl
-[  --disable-hidden-plt    do not hide internal function calls to avoid PLT],
-	      hidden=$enableval, hidden=yes)
+AC_ARG_WITH([tls],
+            AC_HELP_STRING([--with-tls],
+                           [enable support for TLS]),
+	    [usetls=$withval],
+	    [usetls=no])
+
+AC_ARG_WITH([__thread],
+            AC_HELP_STRING([--without-__thread],
+                           [do not use TLS features even when supporting them]),
+	    [use__thread=$withval],
+	    [use__thread=yes])
+
+AC_ARG_ENABLE([hidden-plt],
+              AC_HELP_STRING([--disable-hidden-plt],
+                             [do not hide internal function calls to avoid PLT]),
+	      [hidden=$enableval],
+	      [hidden=yes])
 if test "x$hidden" = xno; then
   AC_DEFINE(NO_HIDDEN)
 fi
@@ -191,27 +225,31 @@ fi
 
 dnl On some platforms we cannot use dynamic loading.  We must provide
 dnl static NSS modules.
-AC_ARG_ENABLE(static-nss, dnl
-[  --enable-static-nss     build static NSS modules [default=no]],
-	      static_nss=$enableval, static_nss=no)
+AC_ARG_ENABLE([static-nss],
+              AC_HELP_STRING([--enable-static-nss],
+                             [build static NSS modules @<:@default=no@:>@]),
+	      [static_nss=$enableval],
+	      [static_nss=no])
 dnl Enable static NSS also if we build no shared objects.
 if test x"$static_nss" = xyes || test x"$shared" = xno; then
   static_nss=yes
   AC_DEFINE(DO_STATIC_NSS)
 fi
 
-AC_ARG_ENABLE(force-install,
-[  --disable-force-install don't force installation of files from this package,
-			  even if they are older than the installed files],
-	      force_install=$enableval, force_install=yes)
+AC_ARG_ENABLE([force-install],
+              AC_HELP_STRING([--disable-force-install],
+                             [don't force installation of files from this package, even if they are older than the installed files]),
+	      [force_install=$enableval],
+	      [force_install=yes])
 AC_SUBST(force_install)
 
 dnl On some platforms we allow dropping compatibility with all kernel
 dnl versions.
-AC_ARG_ENABLE(kernel,
-[  --enable-kernel=VERSION compile for compatibility with kernel not older
-                           than VERSION],
-              minimum_kernel=$enableval)
+AC_ARG_ENABLE([kernel],
+              AC_HELP_STRING([--enable-kernel=VERSION],
+                             [compile for compatibility with kernel not older than VERSION]),
+	      [minimum_kernel=$enableval],
+	      [])
 dnl Prevent unreasonable values.
 if test "$minimum_kernel" = yes || test "$minimum_kernel" = no; then
   # Better nothing than this.
@@ -225,9 +263,11 @@ fi
 dnl For the development we sometimes want gcc to issue even more warnings.
 dnl This is not the default since many of the extra warnings are not
 dnl appropriate.
-AC_ARG_ENABLE(all-warnings,
-[  --enable-all-warnings   enable all useful warnings gcc can issue],
-	      all_warnings=$enableval)
+AC_ARG_ENABLE([all-warnings],
+	      AC_HELP_STRING([--enable-all-warnings],
+                             [enable all useful warnings gcc can issue]),
+	      [all_warnings=$enableval],
+	      [])
 AC_SUBST(all_warnings)
 
 AC_CANONICAL_HOST