From a19a55bf7cd604e69715d2c025667bb1cf7e85c8 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 8 Mar 2000 11:03:33 +0000 Subject: [PATCH] * acgeneral.m4 (AC_INIT_PARSE_ARGS): Rename as... (_AC_INIT_PARSE_ARGS): this. Move the display of help and version strings to... (_AC_INIT_HELP, _AC_INIT_VERSION): here. (AC_INIT): Adjust. Also, fix quotation. --- ChangeLog | 8 ++ acgeneral.m4 | 183 ++++++++++++++++++++++------------------ lib/autoconf/general.m4 | 183 ++++++++++++++++++++++------------------ 3 files changed, 212 insertions(+), 162 deletions(-) diff --git a/ChangeLog b/ChangeLog index c47a8e8e..9ce737cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-03-08 Akim Demaille + + * acgeneral.m4 (AC_INIT_PARSE_ARGS): Rename as... + (_AC_INIT_PARSE_ARGS): this. + Move the display of help and version strings to... + (_AC_INIT_HELP, _AC_INIT_VERSION): here. + (AC_INIT): Adjust. Also, fix quotation. + 2000-03-08 Akim Demaille Some tests are failing with srcdir != builddir, because they can't diff --git a/acgeneral.m4 b/acgeneral.m4 index 87be654c..13533edc 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -564,11 +564,13 @@ ac_default_prefix=$1 AC_DIVERT_POP()]) -# AC_INIT_PARSE_ARGS -# ------------------ +# _AC_INIT_PARSE_ARGS +# ------------------- AC_DEFUN(AC_INIT_PARSE_ARGS, [[ # Initialize some variables set by options. +ac_init_help=false +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. build=NONE @@ -694,80 +696,7 @@ do with_gas=yes ;; -help | --help | --hel | --he | -h) - # 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 software source code packages to adapt to many kinds -of systems. - -Usage: configure [OPTION]... [VAR=VALUE]... [HOST] - -To safely assign special values to environment variables (e.g., CC, -CFLAGS...), give to `configure' the definition 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 - --cache-file=FILE cache test results in FILE - -n, --no-create do not create output files - -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 ..] - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names - -EOF - cat <<\EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] - -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF]] -dnl It would be great to sort, unfortunately, since each entry maybe -dnl split on several lines, it is not as evident as a simple `| sort'. -[[ test -n "$ac_arg_enable_help" && echo " -Optional features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes]\ -$ac_arg_enable_help" - test -n "$ac_arg_with_help" && echo " -Optional packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)\ -$ac_arg_with_help" - test -n "$ac_arg_var_help" && echo " -Some influent environment variables:$ac_arg_var_help" - exit 0 ;; - + ac_init_help=: ;; -host | --host | --hos | --ho) ac_prev=host ;; -host=* | --host=* | --hos=* | --ho=*) @@ -915,8 +844,7 @@ Some influent environment variables:$ac_arg_var_help" verbose=yes ;; -version | --version | --versio | --versi | --vers | -V) - echo "configure generated by autoconf version ]AC_ACVERSION[" - exit 0 ;; + ac_init_version=: ;; -with-* | --with-*) ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'` @@ -988,7 +916,98 @@ done if test -n "$ac_prev"; then ]AC_MSG_ERROR(missing argument to --`echo $ac_prev | sed 's/_/-/g'`)[ fi -]])# AC_INIT_PARSE_ARGS +]])# _AC_INIT_PARSE_ARGS + + +# _AC_INIT_HELP +# ------------- +# Handle the `configure --help' message. +define([_AC_INIT_HELP], +[[if $ac_init_help; 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 software source code packages to adapt to many kinds +of systems. + +Usage: configure [OPTION]... [VAR=VALUE]... [HOST] + +To safely assign special values to environment variables (e.g., CC, +CFLAGS...), give to `configure' the definition 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 + --cache-file=FILE cache test results in FILE + -n, --no-create do not create output files + +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 ..] + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names + +EOF + cat <<\EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] + +X features: + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF]] +dnl It would be great to sort, unfortunately, since each entry maybe +dnl split on several lines, it is not as evident as a simple `| sort'. +[[ test -n "$ac_arg_enable_help" && echo " +Optional features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes]\ +$ac_arg_enable_help" + test -n "$ac_arg_with_help" && echo " +Optional packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)\ +$ac_arg_with_help" + test -n "$ac_arg_var_help" && echo " +Some influent environment variables:$ac_arg_var_help" + exit 0 +fi]])# _AC_INIT_HELP + + +# _AC_INIT_VERSION +# ---------------- +# Handle the `configure --version' message. +define([_AC_INIT_VERSION], +[if $ac_init_version; then + echo "configure generated by autoconf version AC_ACVERSION" + exit 0 +fi])# _AC_INIT_VERSION # AC_INIT_BINSH @@ -1027,8 +1046,10 @@ AC_INIT_NOTICE AC_DIVERT_POP()dnl to KILL AC_DIVERT_POP()dnl to NORMAL AC_DIVERT_PUSH(AC_DIVERSION_INIT)dnl -AC_INIT_PARSE_ARGS -AC_INIT_PREPARE($1)dnl +_AC_INIT_PARSE_ARGS +_AC_INIT_HELP +_AC_INIT_VERSION +AC_INIT_PREPARE([$1])dnl AC_DIVERT_POP()dnl to NORMAL ]) diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 87be654c..13533edc 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -564,11 +564,13 @@ ac_default_prefix=$1 AC_DIVERT_POP()]) -# AC_INIT_PARSE_ARGS -# ------------------ +# _AC_INIT_PARSE_ARGS +# ------------------- AC_DEFUN(AC_INIT_PARSE_ARGS, [[ # Initialize some variables set by options. +ac_init_help=false +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. build=NONE @@ -694,80 +696,7 @@ do with_gas=yes ;; -help | --help | --hel | --he | -h) - # 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 software source code packages to adapt to many kinds -of systems. - -Usage: configure [OPTION]... [VAR=VALUE]... [HOST] - -To safely assign special values to environment variables (e.g., CC, -CFLAGS...), give to `configure' the definition 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 - --cache-file=FILE cache test results in FILE - -n, --no-create do not create output files - -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 ..] - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names - -EOF - cat <<\EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] - -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF]] -dnl It would be great to sort, unfortunately, since each entry maybe -dnl split on several lines, it is not as evident as a simple `| sort'. -[[ test -n "$ac_arg_enable_help" && echo " -Optional features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes]\ -$ac_arg_enable_help" - test -n "$ac_arg_with_help" && echo " -Optional packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)\ -$ac_arg_with_help" - test -n "$ac_arg_var_help" && echo " -Some influent environment variables:$ac_arg_var_help" - exit 0 ;; - + ac_init_help=: ;; -host | --host | --hos | --ho) ac_prev=host ;; -host=* | --host=* | --hos=* | --ho=*) @@ -915,8 +844,7 @@ Some influent environment variables:$ac_arg_var_help" verbose=yes ;; -version | --version | --versio | --versi | --vers | -V) - echo "configure generated by autoconf version ]AC_ACVERSION[" - exit 0 ;; + ac_init_version=: ;; -with-* | --with-*) ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'` @@ -988,7 +916,98 @@ done if test -n "$ac_prev"; then ]AC_MSG_ERROR(missing argument to --`echo $ac_prev | sed 's/_/-/g'`)[ fi -]])# AC_INIT_PARSE_ARGS +]])# _AC_INIT_PARSE_ARGS + + +# _AC_INIT_HELP +# ------------- +# Handle the `configure --help' message. +define([_AC_INIT_HELP], +[[if $ac_init_help; 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 software source code packages to adapt to many kinds +of systems. + +Usage: configure [OPTION]... [VAR=VALUE]... [HOST] + +To safely assign special values to environment variables (e.g., CC, +CFLAGS...), give to `configure' the definition 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 + --cache-file=FILE cache test results in FILE + -n, --no-create do not create output files + +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 ..] + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names + +EOF + cat <<\EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] + +X features: + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF]] +dnl It would be great to sort, unfortunately, since each entry maybe +dnl split on several lines, it is not as evident as a simple `| sort'. +[[ test -n "$ac_arg_enable_help" && echo " +Optional features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes]\ +$ac_arg_enable_help" + test -n "$ac_arg_with_help" && echo " +Optional packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)\ +$ac_arg_with_help" + test -n "$ac_arg_var_help" && echo " +Some influent environment variables:$ac_arg_var_help" + exit 0 +fi]])# _AC_INIT_HELP + + +# _AC_INIT_VERSION +# ---------------- +# Handle the `configure --version' message. +define([_AC_INIT_VERSION], +[if $ac_init_version; then + echo "configure generated by autoconf version AC_ACVERSION" + exit 0 +fi])# _AC_INIT_VERSION # AC_INIT_BINSH @@ -1027,8 +1046,10 @@ AC_INIT_NOTICE AC_DIVERT_POP()dnl to KILL AC_DIVERT_POP()dnl to NORMAL AC_DIVERT_PUSH(AC_DIVERSION_INIT)dnl -AC_INIT_PARSE_ARGS -AC_INIT_PREPARE($1)dnl +_AC_INIT_PARSE_ARGS +_AC_INIT_HELP +_AC_INIT_VERSION +AC_INIT_PREPARE([$1])dnl AC_DIVERT_POP()dnl to NORMAL ])