From: Eric Blake Date: Fri, 28 Sep 2007 01:35:55 +0000 (-0600) Subject: Configure whitespace touchups. X-Git-Tag: v2.62~250 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afdb9d6e9f6f492f042086badbdd954511ea0649;p=thirdparty%2Fautoconf.git Configure whitespace touchups. * lib/autoconf/general.m4 (_AC_INIT_HELP): Fix alignment of installation directories, and avoid TAB, in configure --help output. * configure.ac: Avoid extra trailing newline. * lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL): Avoid space-tab. * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Avoid TAB in config.status --help output. * configure: Regenerate. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index 69049521..bb157c73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2007-09-27 Eric Blake + Configure whitespace touchups. + * lib/autoconf/general.m4 (_AC_INIT_HELP): Fix alignment of + installation directories, and avoid TAB, in configure --help + output. + * configure.ac: Avoid extra trailing newline. + * lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL): Avoid space-tab. + * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Avoid TAB in + config.status --help output. + * configure: Regenerate. + Fix underquotation in AS_HELP_STRING. * lib/m4sugar/m4sh.m4 (AS_HELP_STRING): Don't underquote lhs argument. diff --git a/configure b/configure index a6f20ace..f0b5215e 100755 --- a/configure +++ b/configure @@ -190,7 +190,7 @@ else as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -1262,9 +1262,9 @@ Configuration: Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1274,25 +1274,25 @@ 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] - --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] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --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/autoconf] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --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] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --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/autoconf] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -3364,7 +3364,7 @@ Usage: $0 [OPTIONS] [FILE]... -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE Configuration files: $config_files @@ -4003,4 +4003,3 @@ Below you will find information on the status of this version of Autoconf. EOF sed -n '/^\* Status/,$p' $srcdir/BUGS - diff --git a/configure.ac b/configure.ac index bbb3e87f..1a32ea32 100644 --- a/configure.ac +++ b/configure.ac @@ -151,10 +151,10 @@ AC_PROG_SED ## ------------ ## AC_CONFIG_FILES([Makefile doc/Makefile - lib/Makefile lib/Autom4te/Makefile lib/autoscan/Makefile - lib/m4sugar/Makefile - lib/autoconf/Makefile lib/autotest/Makefile - bin/Makefile]) + lib/Makefile lib/Autom4te/Makefile lib/autoscan/Makefile + lib/m4sugar/Makefile + lib/autoconf/Makefile lib/autotest/Makefile + bin/Makefile]) AC_OUTPUT # Report the state of this version of Autoconf if this is a beta. @@ -169,4 +169,4 @@ Below you will find information on the status of this version of Autoconf. EOF sed -n '/^\* Status/,$p' $srcdir/BUGS -]) +])dnl diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index ce3b48ed..81f3a957 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -1012,10 +1012,10 @@ Configuration: --srcdir=DIR find the sources in DIR [configure dir or \`..'] Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] +]AS_HELP_STRING([--prefix=PREFIX], + [install architecture-independent files in PREFIX [$ac_default_prefix]]) +AS_HELP_STRING([--exec-prefix=EPREFIX], + [install architecture-dependent files in EPREFIX [PREFIX]])[ By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1025,25 +1025,27 @@ 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] - --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] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --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/m4_ifset([AC_PACKAGE_TARNAME], [AC_PACKAGE_TARNAME], [PACKAGE])@:>@[ - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --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] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] +]AS_HELP_STRING([--docdir=DIR], + [documentation root ]@<:@DATAROOTDIR/doc/m4_ifset([AC_PACKAGE_TARNAME], + [AC_PACKAGE_TARNAME], [PACKAGE])@:>@)[ + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF] diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4 index 5b43e116..6364629e 100644 --- a/lib/autoconf/status.m4 +++ b/lib/autoconf/status.m4 @@ -1293,13 +1293,13 @@ Usage: $[0] [[OPTIONS]] [[FILE]]... -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions m4_ifdef([_AC_SEEN_CONFIG(FILES)], -[[ --file=FILE[:TEMPLATE] - instantiate the configuration file FILE -]])dnl + [AS_HELP_STRING([[--file=FILE[:TEMPLATE]]], + [instantiate the configuration file FILE], [ ]) +])dnl m4_ifdef([_AC_SEEN_CONFIG(HEADERS)], -[[ --header=FILE[:TEMPLATE] - instantiate the configuration header FILE -]])dnl + [AS_HELP_STRING([[--header=FILE[:TEMPLATE]]], + [instantiate the configuration header FILE], [ ]) +])dnl m4_ifdef([_AC_SEEN_CONFIG(FILES)], [Configuration files: diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 index c03995b7..3334bdd6 100644 --- a/lib/m4sugar/m4sh.m4 +++ b/lib/m4sugar/m4sh.m4 @@ -243,7 +243,7 @@ if test "x$CONFIG_SHELL" = x; then AS_IF([_AS_RUN([_AS_DETECT_REQUIRED_BODY]) 2>/dev/null], [as_have_required=yes], [as_have_required=no]) - AS_IF([test $as_have_required = yes && dnl + AS_IF([test $as_have_required = yes &&dnl _AS_RUN([_AS_DETECT_SUGGESTED_BODY]) 2> /dev/null], [], [as_candidate_shells=