From: David MacKenzie Date: Tue, 5 Apr 1994 01:29:04 +0000 (+0000) Subject: Add back --no-create option. Make config.status --recheck use it. X-Git-Tag: fsf-origin~726 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06f9e6ac0ff205d12f3be4b92228d7e2ddd555a6;p=thirdparty%2Fautoconf.git Add back --no-create option. Make config.status --recheck use it. --- diff --git a/acgeneral.m4 b/acgeneral.m4 index c19ce4a10..a74957ff3 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -106,8 +106,9 @@ changequote([,])dnl build=NONE exec_prefix= host=NONE +ac_no_create= nonopt=NONE -norecursion= +ac_norecursion= prefix= program_prefix= program_suffix= @@ -182,7 +183,8 @@ changequote([,])dnl | --exec=* | --exe=* | --ex=*) exec_prefix="$ac_optarg" ;; - -gas | --gas | --ga | --g) with_gas=1 ;; # Obsolete; use --with-gas. + -gas | --gas | --ga | --g) + with_gas=1 ;; # Obsolete; use --with-gas. -help | --help | --hel | --he) cat << EOF @@ -195,11 +197,16 @@ EOF -host=* | --host=* | --hos=* | --ho=*) host="$ac_optarg" ;; - -nfp | --nfp | --nf) with_fp=no ;; # Obsolete; use --without-fp. + -nfp | --nfp | --nf) + with_fp=no ;; # Obsolete; use --without-fp. + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) + ac_no_create=yes ;; -norecursion | --norecursion | --norecursio | --norecursi \ - | --norecurs | --norecur | --norecu | --norec | --nore | --nor | --no) - norecursion=yes ;; + | --norecurs | --norecur | --norecu | --norec | --nore | --nor) + ac_norecursion=yes ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; @@ -252,7 +259,7 @@ EOF target="$ac_optarg" ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) - ac_verbose=yes ;; + ac_verbose=yes ;; -version | --version | --versio | --versi | --vers) echo "configure generated by autoconf version AC_ACVERSION" @@ -321,7 +328,18 @@ define(AC_PREPARE, trap 'rm -fr confdefs* $ac_clean_files' 0 # Save the original args if we used an alternate arg parser. -ac_configure_args="${ac_configure_args-[$]*}" +ac_configure_temp="${ac_configure_args-[$]*}" +# Strip out --no-create and --norecursion so they don't pile up. +ac_configure_args= +for ac_arg in $ac_configure_temp; do + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -norecursion | --norecursion | --norecursio | --norecursi \ + | --norecurs | --norecur | --norecu | --norec | --nore | --nor) ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; + esac +done # NLS nuisances. # These must not be set unconditionally because not all systems understand @@ -940,8 +958,8 @@ for ac_option do case "[\$]ac_option" in -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo running [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args - exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args ;; + echo running [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create + exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) echo "config.status generated by autoconf version AC_ACVERSION" exit 0 ;; @@ -1007,7 +1025,7 @@ $2 exit 0 EOF chmod +x config.status -${CONFIG_SHELL-/bin/sh} config.status +test -n "$ac_no_create" || ${CONFIG_SHELL-/bin/sh} config.status ])dnl dnl This is a subroutine of AC_OUTPUT, broken out primarily to avoid bugs dnl with long definitions in GNU m4 1.0. This is called inside a quoted diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index c19ce4a10..a74957ff3 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -106,8 +106,9 @@ changequote([,])dnl build=NONE exec_prefix= host=NONE +ac_no_create= nonopt=NONE -norecursion= +ac_norecursion= prefix= program_prefix= program_suffix= @@ -182,7 +183,8 @@ changequote([,])dnl | --exec=* | --exe=* | --ex=*) exec_prefix="$ac_optarg" ;; - -gas | --gas | --ga | --g) with_gas=1 ;; # Obsolete; use --with-gas. + -gas | --gas | --ga | --g) + with_gas=1 ;; # Obsolete; use --with-gas. -help | --help | --hel | --he) cat << EOF @@ -195,11 +197,16 @@ EOF -host=* | --host=* | --hos=* | --ho=*) host="$ac_optarg" ;; - -nfp | --nfp | --nf) with_fp=no ;; # Obsolete; use --without-fp. + -nfp | --nfp | --nf) + with_fp=no ;; # Obsolete; use --without-fp. + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) + ac_no_create=yes ;; -norecursion | --norecursion | --norecursio | --norecursi \ - | --norecurs | --norecur | --norecu | --norec | --nore | --nor | --no) - norecursion=yes ;; + | --norecurs | --norecur | --norecu | --norec | --nore | --nor) + ac_norecursion=yes ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; @@ -252,7 +259,7 @@ EOF target="$ac_optarg" ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) - ac_verbose=yes ;; + ac_verbose=yes ;; -version | --version | --versio | --versi | --vers) echo "configure generated by autoconf version AC_ACVERSION" @@ -321,7 +328,18 @@ define(AC_PREPARE, trap 'rm -fr confdefs* $ac_clean_files' 0 # Save the original args if we used an alternate arg parser. -ac_configure_args="${ac_configure_args-[$]*}" +ac_configure_temp="${ac_configure_args-[$]*}" +# Strip out --no-create and --norecursion so they don't pile up. +ac_configure_args= +for ac_arg in $ac_configure_temp; do + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -norecursion | --norecursion | --norecursio | --norecursi \ + | --norecurs | --norecur | --norecu | --norec | --nore | --nor) ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; + esac +done # NLS nuisances. # These must not be set unconditionally because not all systems understand @@ -940,8 +958,8 @@ for ac_option do case "[\$]ac_option" in -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo running [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args - exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args ;; + echo running [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create + exec [\$]{CONFIG_SHELL-/bin/sh} [$]0 [$]ac_configure_args --no-create ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) echo "config.status generated by autoconf version AC_ACVERSION" exit 0 ;; @@ -1007,7 +1025,7 @@ $2 exit 0 EOF chmod +x config.status -${CONFIG_SHELL-/bin/sh} config.status +test -n "$ac_no_create" || ${CONFIG_SHELL-/bin/sh} config.status ])dnl dnl This is a subroutine of AC_OUTPUT, broken out primarily to avoid bugs dnl with long definitions in GNU m4 1.0. This is called inside a quoted