From: Akim Demaille <akim@epita.fr>
Date: Wed, 12 Apr 2000 11:50:57 +0000 (+0000)
Subject: * acgeneral.m4 (_AC_INIT_HELP): Move --srcdir in the first
X-Git-Tag: autoconf-2.50~963
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=afd63112d9bc6779829127751d91c32e237961ad;p=thirdparty%2Fautoconf.git

* acgeneral.m4 (_AC_INIT_HELP): Move --srcdir in the first
section.
Document --help=short and recursive.
Split the `Directory' section into `Installation directories' for
--prefix and --exec-prefix, and all the others into `Fine tuning
of the installation directories'.
In the latter, don't repeat `in DIR', the user understands, and it
comes out better.
Default for --exec-prefix is PREFIX.
Reported by Kathryn Hargreaves.
Move --host before --build.
Fix a test on `$ac_init_help' which was not updated.
---

diff --git a/ChangeLog b/ChangeLog
index 7265a1e06..e7c46e00c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2000-04-12  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4 (_AC_INIT_HELP): Move --srcdir in the first
+	section.
+	Document --help=short and recursive.
+	Split the `Directory' section into `Installation directories' for
+	--prefix and --exec-prefix, and all the others into `Fine tuning
+	of the installation directories'.
+	In the latter, don't repeat `in DIR', the user understands, and it
+	comes out better.
+	Default for --exec-prefix is PREFIX.
+	Reported by Kathryn Hargreaves.
+	Move --host before --build.
+	Fix a test on `$ac_init_help' which was not updated.
+
 2000-04-11  Akim Demaille  <akim@epita.fr>
 
 	Have `make check' succeed with CC=g++.
diff --git a/THANKS b/THANKS
index 2a15b3e75..95691a1e1 100644
--- a/THANKS
+++ b/THANKS
@@ -60,6 +60,7 @@ Joseph S. Myers		jsm28@cam.ac.uk
 Julian Onions		j.onions@nexor.co.uk
 Karl Berry		karl@cs.umb.edu
 Karl Heuer		kwzh@gnu.org
+Kathryn Hargreaves	kathryn@deas.harvard.edu
 Kaveh R. Ghazi		ghazi@caip.rutgers.edu
 Ken Pizzini		ken@halcyon.com
 Ken Raeburn		raeburn@cygnus.com
diff --git a/acgeneral.m4 b/acgeneral.m4
index f04e90d23..999d0df26 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1258,67 +1258,88 @@ define([_AC_INIT_HELP],
 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 <<\EOF
-`configure' configures ifset([AC_PACKAGE_STRING],
-                       [AC_PACKAGE_STRING],
-                       [this package]) to adapt to many kinds
+  cat <<EOF
+\`configure' configures ifset([AC_PACKAGE_STRING],
+                        [AC_PACKAGE_STRING],
+                        [this package]) to adapt to many kinds of systems.
 
-[Usage: configure [OPTION]... [VAR=VALUE]... [HOST]
+Usage: $[0] [[OPTION]... [VAR=VALUE]... [HOST]]
 
-To safely assign special values to environment variables (e.g., CC,
-CFLAGS...), give to `configure' the definition as VAR=VALUE.
+[To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.
 
 Defaults for the options are specified in brackets.
 
 Configuration:
-  -h, --help              print this message
-  -V, --version           print the version of autoconf that created configure
-  -q, --quiet, --silent   do not print `checking...' messages
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or ..]
 
 EOF
 
   cat <<EOF
-Directories:
+Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                           [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
 EOF
 
   cat <<\EOF
 
 Host type:
-  --build=BUILD      configure for building on BUILD [BUILD=HOST]
   --host=HOST        configure for HOST [guessed]
+  --build=BUILD      configure for building on BUILD [BUILD=HOST]
   --target=TARGET    configure for TARGET [TARGET=HOST]
 EOF
   cat <<\EOF]
 AC_DIVERT_POP()dnl
+dnl The order of the diversions here is
+dnl HELP_BEGIN, which may be prolongated by extra generic options
+dnl             such as with X or AC_ARG_PROGRAM.  Displayed only
+dnl             in long --help.
+dnl HELP_ENABLE, which starts with the trailer of the HELP_BEGIN
+dnl              section, then implements the header of the non
+dnl              generic options.
+dnl HELP_WITH,
+dnl HELP_VAR,
+dnl HELP_END, initialized below, in which we dump the trailer
+dnl           (handling of the recursion for instance).
 AC_DIVERT_PUSH([HELP_ENABLE])dnl
 EOF
 fi
 
 if test -n "$ac_init_help"; then
 ifset([AC_PACKAGE_STRING],
-[  $ac_init_help ||
-     echo "Configuration of AC_PACKAGE_STRING:"])
+[  case "$ac_init_help" in
+     short | recursive ) echo "Configuration of AC_PACKAGE_STRING:";;
+   esac])
   cat <<\EOF
 AC_DIVERT_POP()dnl
 AC_DIVERT_PUSH([HELP_END])dnl
diff --git a/configure b/configure
index 1cd5d3fc4..76d990199 100755
--- a/configure
+++ b/configure
@@ -435,53 +435,62 @@ srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
 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 <<\EOF
-`configure' configures Autoconf 2.14a to adapt to many kinds
+  cat <<EOF
+\`configure' configures Autoconf 2.14a to adapt to many kinds of systems.
 
-Usage: configure [OPTION]... [VAR=VALUE]... [HOST]
+Usage: $0 [OPTION]... [VAR=VALUE]... [HOST]
 
-To safely assign special values to environment variables (e.g., CC,
-CFLAGS...), give to `configure' the definition as VAR=VALUE.
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.
 
 Defaults for the options are specified in brackets.
 
 Configuration:
-  -h, --help              print this message
-  -V, --version           print the version of autoconf that created configure
-  -q, --quiet, --silent   do not print `checking...' messages
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or ..]
 
 EOF
 
   cat <<EOF
-Directories:
+Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                           [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
 EOF
 
   cat <<\EOF
 
 Host type:
-  --build=BUILD      configure for building on BUILD [BUILD=HOST]
   --host=HOST        configure for HOST [guessed]
+  --build=BUILD      configure for building on BUILD [BUILD=HOST]
   --target=TARGET    configure for TARGET [TARGET=HOST]
 EOF
   cat <<\EOF
@@ -494,8 +503,9 @@ EOF
 fi
 
 if test -n "$ac_init_help"; then
-  $ac_init_help ||
-     echo "Configuration of Autoconf 2.14a:"
+  case "$ac_init_help" in
+     short | recursive ) echo "Configuration of Autoconf 2.14a:";;
+   esac
   cat <<\EOF
 EOF
 fi
@@ -684,7 +694,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "configure:606: checking for a BSD compatible install" >&5
+echo "configure:613: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -731,7 +741,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "configure:652: result: $INSTALL" >&5
+echo "configure:659: result: $INSTALL" >&5
 echo "$ECHO_T""$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -742,7 +752,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "configure:659: checking whether build environment is sane" >&5
+echo "configure:666: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -779,7 +789,7 @@ else
 Check your system clock" >&2; exit 1; }
 fi
 rm -f conftest*
-echo "configure:694: result: yes" >&5
+echo "configure:701: result: yes" >&5
 echo "$ECHO_T""yes" >&6
 if test "$program_transform_name" = s,x,x,; then
   program_transform_name=
@@ -800,7 +810,7 @@ test "$program_suffix" != NONE &&
 # sed with no file args requires a program.
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
-echo "configure:713: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:720: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -820,11 +830,11 @@ fi
 rm -f conftestmake
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "configure:733: result: yes" >&5
+  echo "configure:740: result: yes" >&5
 echo "$ECHO_T""yes" >&6
   SET_MAKE=
 else
-  echo "configure:737: result: no" >&5
+  echo "configure:744: result: no" >&5
 echo "$ECHO_T""no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -849,78 +859,78 @@ cat >>confdefs.h <<EOF
 EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo "configure:755: checking for working aclocal" >&5
+echo "configure:762: checking for working aclocal" >&5
 echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (aclocal --version) < /dev/null > /dev/null 2>&1; then
    ACLOCAL=aclocal
-   echo "configure:762: result: found" >&5
+   echo "configure:769: result: found" >&5
 echo "$ECHO_T""found" >&6
 else
    ACLOCAL="$missing_dir/missing aclocal"
-   echo "configure:766: result: missing" >&5
+   echo "configure:773: result: missing" >&5
 echo "$ECHO_T""missing" >&6
 fi
 
-echo "configure:769: checking for working autoconf" >&5
+echo "configure:776: checking for working autoconf" >&5
 echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoconf --version) < /dev/null > /dev/null 2>&1; then
    AUTOCONF=autoconf
-   echo "configure:776: result: found" >&5
+   echo "configure:783: result: found" >&5
 echo "$ECHO_T""found" >&6
 else
    AUTOCONF="$missing_dir/missing autoconf"
-   echo "configure:780: result: missing" >&5
+   echo "configure:787: result: missing" >&5
 echo "$ECHO_T""missing" >&6
 fi
 
-echo "configure:783: checking for working automake" >&5
+echo "configure:790: checking for working automake" >&5
 echo $ECHO_N "checking for working automake... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (automake --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake
-   echo "configure:790: result: found" >&5
+   echo "configure:797: result: found" >&5
 echo "$ECHO_T""found" >&6
 else
    AUTOMAKE="$missing_dir/missing automake"
-   echo "configure:794: result: missing" >&5
+   echo "configure:801: result: missing" >&5
 echo "$ECHO_T""missing" >&6
 fi
 
-echo "configure:797: checking for working autoheader" >&5
+echo "configure:804: checking for working autoheader" >&5
 echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoheader --version) < /dev/null > /dev/null 2>&1; then
    AUTOHEADER=autoheader
-   echo "configure:804: result: found" >&5
+   echo "configure:811: result: found" >&5
 echo "$ECHO_T""found" >&6
 else
    AUTOHEADER="$missing_dir/missing autoheader"
-   echo "configure:808: result: missing" >&5
+   echo "configure:815: result: missing" >&5
 echo "$ECHO_T""missing" >&6
 fi
 
-echo "configure:811: checking for working makeinfo" >&5
+echo "configure:818: checking for working makeinfo" >&5
 echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
    MAKEINFO=makeinfo
-   echo "configure:818: result: found" >&5
+   echo "configure:825: result: found" >&5
 echo "$ECHO_T""found" >&6
 else
    MAKEINFO="$missing_dir/missing makeinfo"
-   echo "configure:822: result: missing" >&5
+   echo "configure:829: result: missing" >&5
 echo "$ECHO_T""missing" >&6
 fi
 
@@ -930,7 +940,7 @@ for ac_prog in gm4 gnum4 m4
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "configure:830: checking for $ac_word" >&5
+echo "configure:837: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_M4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -955,10 +965,10 @@ esac
 fi
 M4=$ac_cv_path_M4
 if test -n "$M4"; then
-  echo "configure:855: result: $M4" >&5
+  echo "configure:862: result: $M4" >&5
 echo "$ECHO_T""$M4" >&6
 else
-  echo "configure:858: result: no" >&5
+  echo "configure:865: result: no" >&5
 echo "$ECHO_T""no" >&6
 fi
 
@@ -966,7 +976,7 @@ test -n "$M4" && break
 done
 test -n "$M4" || M4="m4"
 
-echo "configure:864: checking whether m4 supports frozen files" >&5
+echo "configure:871: checking whether m4 supports frozen files" >&5
 echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6
 if test "${ac_cv_prog_gnu_m4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -978,7 +988,7 @@ if test x"$M4" != x; then
   esac
 fi
 fi
-echo "configure:876: result: $ac_cv_prog_gnu_m4" >&5
+echo "configure:883: result: $ac_cv_prog_gnu_m4" >&5
 echo "$ECHO_T""$ac_cv_prog_gnu_m4" >&6
 if test x"$ac_cv_prog_gnu_m4" != xyes; then
   { echo "configure: error: GNU m4 1.4 is required" >&2; exit 1; }
@@ -988,7 +998,7 @@ for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "configure:885: checking for $ac_word" >&5
+echo "configure:892: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1013,34 +1023,34 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "configure:910: result: $AWK" >&5
+  echo "configure:917: result: $AWK" >&5
 echo "$ECHO_T""$AWK" >&6
 else
-  echo "configure:913: result: no" >&5
+  echo "configure:920: result: no" >&5
 echo "$ECHO_T""no" >&6
 fi
 
 test -n "$AWK" && break
 done
 
-echo "configure:918: checking for working help2man" >&5
+echo "configure:925: checking for working help2man" >&5
 echo $ECHO_N "checking for working help2man... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (help2man --version) < /dev/null > /dev/null 2>&1; then
    HELP2MAN=help2man
-   echo "configure:925: result: found" >&5
+   echo "configure:932: result: found" >&5
 echo "$ECHO_T""found" >&6
 else
    HELP2MAN="\${SHELL} \${top_srcdir}/missing help2man"
-   echo "configure:929: result: missing" >&5
+   echo "configure:936: result: missing" >&5
 echo "$ECHO_T""missing" >&6
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-echo "configure:934: checking for $ac_word" >&5
+echo "configure:941: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1066,10 +1076,10 @@ esac
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
-  echo "configure:960: result: $PERL" >&5
+  echo "configure:967: result: $PERL" >&5
 echo "$ECHO_T""$PERL" >&6
 else
-  echo "configure:963: result: no" >&5
+  echo "configure:970: result: no" >&5
 echo "$ECHO_T""no" >&6
 fi
 
@@ -1090,7 +1100,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "configure:982: checking for a BSD compatible install" >&5
+echo "configure:989: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -1137,7 +1147,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "configure:1028: result: $INSTALL" >&5
+echo "configure:1035: result: $INSTALL" >&5
 echo "$ECHO_T""$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index f04e90d23..999d0df26 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1258,67 +1258,88 @@ define([_AC_INIT_HELP],
 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 <<\EOF
-`configure' configures ifset([AC_PACKAGE_STRING],
-                       [AC_PACKAGE_STRING],
-                       [this package]) to adapt to many kinds
+  cat <<EOF
+\`configure' configures ifset([AC_PACKAGE_STRING],
+                        [AC_PACKAGE_STRING],
+                        [this package]) to adapt to many kinds of systems.
 
-[Usage: configure [OPTION]... [VAR=VALUE]... [HOST]
+Usage: $[0] [[OPTION]... [VAR=VALUE]... [HOST]]
 
-To safely assign special values to environment variables (e.g., CC,
-CFLAGS...), give to `configure' the definition as VAR=VALUE.
+[To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.
 
 Defaults for the options are specified in brackets.
 
 Configuration:
-  -h, --help              print this message
-  -V, --version           print the version of autoconf that created configure
-  -q, --quiet, --silent   do not print `checking...' messages
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or ..]
 
 EOF
 
   cat <<EOF
-Directories:
+Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                           [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
 EOF
 
   cat <<\EOF
 
 Host type:
-  --build=BUILD      configure for building on BUILD [BUILD=HOST]
   --host=HOST        configure for HOST [guessed]
+  --build=BUILD      configure for building on BUILD [BUILD=HOST]
   --target=TARGET    configure for TARGET [TARGET=HOST]
 EOF
   cat <<\EOF]
 AC_DIVERT_POP()dnl
+dnl The order of the diversions here is
+dnl HELP_BEGIN, which may be prolongated by extra generic options
+dnl             such as with X or AC_ARG_PROGRAM.  Displayed only
+dnl             in long --help.
+dnl HELP_ENABLE, which starts with the trailer of the HELP_BEGIN
+dnl              section, then implements the header of the non
+dnl              generic options.
+dnl HELP_WITH,
+dnl HELP_VAR,
+dnl HELP_END, initialized below, in which we dump the trailer
+dnl           (handling of the recursion for instance).
 AC_DIVERT_PUSH([HELP_ENABLE])dnl
 EOF
 fi
 
 if test -n "$ac_init_help"; then
 ifset([AC_PACKAGE_STRING],
-[  $ac_init_help ||
-     echo "Configuration of AC_PACKAGE_STRING:"])
+[  case "$ac_init_help" in
+     short | recursive ) echo "Configuration of AC_PACKAGE_STRING:";;
+   esac])
   cat <<\EOF
 AC_DIVERT_POP()dnl
 AC_DIVERT_PUSH([HELP_END])dnl