From f9aafb7b4563a0bb523ce3a4031a037409063ec4 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 24 Jan 2001 10:04:47 +0000 Subject: [PATCH] configure -q did not work since 2000-11-03. * acgeneral.m4 (_AC_INIT_DEFAULTS_FDS): Don't check for $silent, tie AS_MESSAGE_FD to stdout unconditionally. (_AC_INIT_PARSE_ARGS): If $silent redirect AS_MESSAGE_FD to /dev/null. * tests/base.at (AC_CACHE_CHECK): New test. --- ChangeLog | 10 +++ acgeneral.m4 | 10 +-- configure | 174 +++++++++++++++++++--------------------- lib/autoconf/general.m4 | 10 +-- tests/base.at | 21 +++++ 5 files changed, 123 insertions(+), 102 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93fa23ef..1c69ece7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-01-24 Alexandre Duret-Lutz + + configure -q did not work since 2000-11-03. + + * acgeneral.m4 (_AC_INIT_DEFAULTS_FDS): Don't check for $silent, + tie AS_MESSAGE_FD to stdout unconditionally. + (_AC_INIT_PARSE_ARGS): If $silent redirect AS_MESSAGE_FD to + /dev/null. + * tests/base.at (AC_CACHE_CHECK): New test. + 2001-01-24 Tim Van Holder * m4sh.m4 (AS_EXECUTABLE_P, _AS_TEST_PREPARE): New macros. diff --git a/acgeneral.m4 b/acgeneral.m4 index 139ba549..d30c2050 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -684,14 +684,10 @@ m4_define([_AC_INIT_DEFAULTS_FDS], # 0 standard input # 1 file creation # 2 errors and warnings -@%:@ AS_MESSAGE_FD checking for... messages and results @%:@ AS_MESSAGE_LOG_FD compiler messages saved in config.log -if test "$silent" = yes; then - exec AS_MESSAGE_FD>/dev/null -else - exec AS_MESSAGE_FD>&1 -fi +@%:@ AS_MESSAGE_FD checking for... messages and results exec AS_MESSAGE_LOG_FD>>config.log +exec AS_MESSAGE_FD>&1 ])# _AC_INIT_DEFAULTS_FDS @@ -1224,6 +1220,8 @@ fi ac_tool_prefix= test -n "$host_alias" && ac_tool_prefix=$host_alias- +test "$silent" = yes && exec AS_MESSAGE_FD>/dev/null + m4_divert_pop([PARSE_ARGS])dnl ])# _AC_INIT_PARSE_ARGS diff --git a/configure b/configure index bb29937b..48e11f82 100755 --- a/configure +++ b/configure @@ -122,14 +122,10 @@ EOF # 0 standard input # 1 file creation # 2 errors and warnings -# 6 checking for... messages and results # 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi +# 6 checking for... messages and results exec 5>>config.log +exec 6>&1 # # Initializations. @@ -248,7 +244,7 @@ do ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null && - { { echo "$as_me:251: error: invalid feature name: $ac_feature" >&5 + { { echo "$as_me:247: error: invalid feature name: $ac_feature" >&5 echo "$as_me: error: invalid feature name: $ac_feature" >&2;} { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` @@ -258,7 +254,7 @@ echo "$as_me: error: invalid feature name: $ac_feature" >&2;} ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null && - { { echo "$as_me:261: error: invalid feature name: $ac_feature" >&5 + { { echo "$as_me:257: error: invalid feature name: $ac_feature" >&5 echo "$as_me: error: invalid feature name: $ac_feature" >&2;} { (exit 1); exit 1; }; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` @@ -441,7 +437,7 @@ echo "$as_me: error: invalid feature name: $ac_feature" >&2;} ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null && - { { echo "$as_me:444: error: invalid package name: $ac_package" >&5 + { { echo "$as_me:440: error: invalid package name: $ac_package" >&5 echo "$as_me: error: invalid package name: $ac_package" >&2;} { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` @@ -455,7 +451,7 @@ echo "$as_me: error: invalid package name: $ac_package" >&2;} ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null && - { { echo "$as_me:458: error: invalid package name: $ac_package" >&5 + { { echo "$as_me:454: error: invalid package name: $ac_package" >&5 echo "$as_me: error: invalid package name: $ac_package" >&2;} { (exit 1); exit 1; }; } ac_package=`echo $ac_package | sed 's/-/_/g'` @@ -479,7 +475,7 @@ echo "$as_me: error: invalid package name: $ac_package" >&2;} | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { { echo "$as_me:482: error: unrecognized option: $ac_option + -*) { { echo "$as_me:478: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2;} @@ -490,7 +486,7 @@ Try \`$0 --help' for more information." >&2;} ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null && - { { echo "$as_me:493: error: invalid variable name: $ac_envvar" >&5 + { { echo "$as_me:489: error: invalid variable name: $ac_envvar" >&5 echo "$as_me: error: invalid variable name: $ac_envvar" >&2;} { (exit 1); exit 1; }; } ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` @@ -499,10 +495,10 @@ echo "$as_me: error: invalid variable name: $ac_envvar" >&2;} *) # FIXME: should be removed in autoconf 3.0. - { echo "$as_me:502: WARNING: you should use --build, --host, --target" >&5 + { echo "$as_me:498: WARNING: you should use --build, --host, --target" >&5 echo "$as_me: WARNING: you should use --build, --host, --target" >&2;} expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null && - { echo "$as_me:505: WARNING: invalid host type: $ac_option" >&5 + { echo "$as_me:501: WARNING: invalid host type: $ac_option" >&5 echo "$as_me: WARNING: invalid host type: $ac_option" >&2;} : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -512,7 +508,7 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { { echo "$as_me:515: error: missing argument to $ac_option" >&5 + { { echo "$as_me:511: error: missing argument to $ac_option" >&5 echo "$as_me: error: missing argument to $ac_option" >&2;} { (exit 1); exit 1; }; } fi @@ -526,7 +522,7 @@ do case $ac_val in [\\/$]* | ?:[\\/]* ) ;; NONE ) ;; - *) { { echo "$as_me:529: error: expected an absolute path for --$ac_var: $ac_val" >&5 + *) { { echo "$as_me:525: error: expected an absolute path for --$ac_var: $ac_val" >&5 echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;} { (exit 1); exit 1; }; };; esac @@ -542,7 +538,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - { echo "$as_me:545: WARNING: If you wanted to set the --build type, don't use --host. + { echo "$as_me:541: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&5 echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2;} @@ -554,6 +550,8 @@ fi ac_tool_prefix= test -n "$host_alias" && ac_tool_prefix=$host_alias- +test "$silent" = yes && exec 6>/dev/null + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes @@ -570,11 +568,11 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { { echo "$as_me:573: error: cannot find sources in $ac_confdir or .." >&5 + { { echo "$as_me:571: error: cannot find sources in $ac_confdir or .." >&5 echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2;} { (exit 1); exit 1; }; } else - { { echo "$as_me:577: error: cannot find sources in $srcdir" >&5 + { { echo "$as_me:575: error: cannot find sources in $srcdir" >&5 echo "$as_me: error: cannot find sources in $srcdir" >&2;} { (exit 1); exit 1; }; } fi @@ -700,7 +698,7 @@ if test "$ac_init_help" = "recursive"; then echo $ac_configure --help else - { echo "$as_me:703: WARNING: no configuration information is in $ac_subdir" >&5 + { echo "$as_me:701: WARNING: no configuration information is in $ac_subdir" >&5 echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;} fi cd $ac_popdir @@ -813,7 +811,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:816: loading cache $cache_file" >&5 + { echo "$as_me:814: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -821,7 +819,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:824: creating cache $cache_file" >&5 + { echo "$as_me:822: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -837,30 +835,30 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:840: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:838: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_suggest_removing_cache=: ;; ,set) - { echo "$as_me:844: WARNING: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:842: WARNING: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;} ac_suggest_removing_cache=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:850: WARNING: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:848: WARNING: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:852: WARNING: former value: $ac_old_val" >&5 + { echo "$as_me:850: WARNING: former value: $ac_old_val" >&5 echo "$as_me: WARNING: former value: $ac_old_val" >&2;} - { echo "$as_me:854: WARNING: current value: $ac_new_val" >&5 + { echo "$as_me:852: WARNING: current value: $ac_new_val" >&5 echo "$as_me: WARNING: current value: $ac_new_val" >&2;} ac_suggest_removing_cache=: fi;; esac done if $ac_suggest_removing_cache; then - { echo "$as_me:861: WARNING: changes in the environment can compromise the build" >&5 + { echo "$as_me:859: WARNING: changes in the environment can compromise the build" >&5 echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;} - { echo "$as_me:863: WARNING: consider removing $cache_file and starting over" >&5 + { echo "$as_me:861: WARNING: consider removing $cache_file and starting over" >&5 echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;} fi @@ -894,7 +892,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:897: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:895: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -914,7 +912,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 "$as_me:917: checking for a BSD compatible install" >&5 +echo "$as_me:915: 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 @@ -963,7 +961,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:966: result: $INSTALL" >&5 +echo "$as_me:964: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -974,7 +972,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:977: checking whether build environment is sane" >&5 +echo "$as_me:975: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -997,7 +995,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1000: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:998: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1010,14 +1008,14 @@ then # Ok. : else - { { echo "$as_me:1013: error: newly created file is older than distributed files! + { { echo "$as_me:1011: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest* -echo "$as_me:1020: result: yes" >&5 +echo "$as_me:1018: result: yes" >&5 echo "${ECHO_T}yes" >&6 if test "$program_transform_name" = s,x,x,; then program_transform_name= @@ -1038,7 +1036,7 @@ test "$program_suffix" != NONE && # sed with no file args requires a program. test -z "$program_transform_name" && program_transform_name="s,x,x," -echo "$as_me:1041: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:1039: 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 @@ -1058,11 +1056,11 @@ fi rm -f conftestmake fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1061: result: yes" >&5 + echo "$as_me:1059: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1065: result: no" >&5 + echo "$as_me:1063: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1072,7 +1070,7 @@ PACKAGE=autoconf VERSION=2.49c if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1075: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:1073: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1086,78 +1084,78 @@ cat >>confdefs.h <&5 +echo "$as_me:1087: 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 "$as_me:1096: result: found" >&5 + echo "$as_me:1094: result: found" >&5 echo "${ECHO_T}found" >&6 else ACLOCAL="$SHELL $missing_dir/missing aclocal" - echo "$as_me:1100: result: missing" >&5 + echo "$as_me:1098: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1104: checking for working autoconf" >&5 +echo "$as_me:1102: 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 "$as_me:1111: result: found" >&5 + echo "$as_me:1109: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOCONF="$SHELL $missing_dir/missing autoconf" - echo "$as_me:1115: result: missing" >&5 + echo "$as_me:1113: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1119: checking for working automake" >&5 +echo "$as_me:1117: 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 "$as_me:1126: result: found" >&5 + echo "$as_me:1124: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOMAKE="$SHELL $missing_dir/missing automake" - echo "$as_me:1130: result: missing" >&5 + echo "$as_me:1128: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1134: checking for working autoheader" >&5 +echo "$as_me:1132: 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 "$as_me:1141: result: found" >&5 + echo "$as_me:1139: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOHEADER="$SHELL $missing_dir/missing autoheader" - echo "$as_me:1145: result: missing" >&5 + echo "$as_me:1143: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1149: checking for working makeinfo" >&5 +echo "$as_me:1147: 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 "$as_me:1156: result: found" >&5 + echo "$as_me:1154: result: found" >&5 echo "${ECHO_T}found" >&6 else MAKEINFO="$SHELL $missing_dir/missing makeinfo" - echo "$as_me:1160: result: missing" >&5 + echo "$as_me:1158: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi @@ -1166,7 +1164,7 @@ AUTOTEST_PATH=.. # Extract the first word of "expr", so it can be a program name with args. set dummy expr; ac_word=$2 -echo "$as_me:1169: checking for $ac_word" >&5 +echo "$as_me:1167: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_EXPR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1193,10 +1191,10 @@ fi EXPR=$ac_cv_path_EXPR if test -n "$EXPR"; then - echo "$as_me:1196: result: $EXPR" >&5 + echo "$as_me:1194: result: $EXPR" >&5 echo "${ECHO_T}$EXPR" >&6 else - echo "$as_me:1199: result: no" >&5 + echo "$as_me:1197: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1208,7 +1206,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 "$as_me:1211: checking for $ac_word" >&5 +echo "$as_me:1209: 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 @@ -1235,10 +1233,10 @@ fi M4=$ac_cv_path_M4 if test -n "$M4"; then - echo "$as_me:1238: result: $M4" >&5 + echo "$as_me:1236: result: $M4" >&5 echo "${ECHO_T}$M4" >&6 else - echo "$as_me:1241: result: no" >&5 + echo "$as_me:1239: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1246,7 +1244,7 @@ fi done test -n "$M4" || M4="m4" -echo "$as_me:1249: checking whether m4 supports frozen files" >&5 +echo "$as_me:1247: 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 @@ -1258,10 +1256,10 @@ if test x"$M4" != x; then esac fi fi -echo "$as_me:1261: result: $ac_cv_prog_gnu_m4" >&5 +echo "$as_me:1259: 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 "$as_me:1264: error: GNU m4 1.4 is required" >&5 + { { echo "$as_me:1262: error: GNU m4 1.4 is required" >&5 echo "$as_me: error: GNU m4 1.4 is required" >&2;} { (exit 1); exit 1; }; } fi @@ -1273,7 +1271,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 "$as_me:1276: checking for $ac_word" >&5 +echo "$as_me:1274: 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 @@ -1295,10 +1293,10 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:1298: result: $AWK" >&5 + echo "$as_me:1296: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:1301: result: no" >&5 + echo "$as_me:1299: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1306,25 +1304,25 @@ fi done # Generating man pages. -echo "$as_me:1309: checking for working help2man" >&5 +echo "$as_me:1307: 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 "$as_me:1316: result: found" >&5 + echo "$as_me:1314: result: found" >&5 echo "${ECHO_T}found" >&6 else HELP2MAN="$SHELL $missing_dir/missing help2man" - echo "$as_me:1320: result: missing" >&5 + echo "$as_me:1318: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi # We use a path for perl so the #! line in autoscan will work. # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "$as_me:1327: checking for $ac_word" >&5 +echo "$as_me:1325: 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 @@ -1352,17 +1350,17 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - echo "$as_me:1355: result: $PERL" >&5 + echo "$as_me:1353: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "$as_me:1358: result: no" >&5 + echo "$as_me:1356: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$PERL" != no; then PERLSCRIPTS=autoscan else - { echo "$as_me:1365: WARNING: autoscan will not be built since perl is not found" >&5 + { echo "$as_me:1363: WARNING: autoscan will not be built since perl is not found" >&5 echo "$as_me: WARNING: autoscan will not be built since perl is not found" >&2;} fi @@ -1378,7 +1376,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 "$as_me:1381: checking for a BSD compatible install" >&5 +echo "$as_me:1379: 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 @@ -1427,7 +1425,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1430: result: $INSTALL" >&5 +echo "$as_me:1428: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1541,7 +1539,7 @@ rm -f confdef2opt.sed : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:1544: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:1542: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<\_ACEOF #! /bin/sh @@ -1580,7 +1578,7 @@ if test -x conftest.file; then elif test -f conftest.file; then as_executable_p="test -f" else - { { echo "$as_me:1583: error: cannot check whether a file is executable on this system" >&5 + { { echo "$as_me:1581: error: cannot check whether a file is executable on this system" >&5 echo "$as_me: error: cannot check whether a file is executable on this system" >&2;} { (exit 1); exit 1; }; } fi @@ -1616,14 +1614,10 @@ $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } # 0 standard input # 1 file creation # 2 errors and warnings -# 6 checking for... messages and results # 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi +# 6 checking for... messages and results exec 5>>config.log +exec 6>&1 cat >&5 << EOF @@ -1720,7 +1714,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:1723: error: ambiguous option: $1 + { { echo "$as_me:1717: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -1747,12 +1741,12 @@ Try \`$0 --help' for more information." >&2;} 'tests/atconfig' ) CONFIG_FILES="$CONFIG_FILES tests/atconfig" ;; # This is an error. - -*) { { echo "$as_me:1750: error: unrecognized option: $1 + -*) { { echo "$as_me:1744: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} { (exit 1); exit 1; }; } ;; - *) { { echo "$as_me:1755: error: invalid argument: $1" >&5 + *) { { echo "$as_me:1749: error: invalid argument: $1" >&5 echo "$as_me: error: invalid argument: $1" >&2;} { (exit 1); exit 1; }; };; esac @@ -1962,7 +1956,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:1965: creating $ac_file" >&5 + { echo "$as_me:1959: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -1980,7 +1974,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]* | ?:[\\/]*) # Absolute - test -f "$f" || { { echo "$as_me:1983: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:1977: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -1993,7 +1987,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $ac_given_srcdir/$f else # /dev/null tree - { { echo "$as_me:1996: error: cannot find input file: $f" >&5 + { { echo "$as_me:1990: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 139ba549..d30c2050 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -684,14 +684,10 @@ m4_define([_AC_INIT_DEFAULTS_FDS], # 0 standard input # 1 file creation # 2 errors and warnings -@%:@ AS_MESSAGE_FD checking for... messages and results @%:@ AS_MESSAGE_LOG_FD compiler messages saved in config.log -if test "$silent" = yes; then - exec AS_MESSAGE_FD>/dev/null -else - exec AS_MESSAGE_FD>&1 -fi +@%:@ AS_MESSAGE_FD checking for... messages and results exec AS_MESSAGE_LOG_FD>>config.log +exec AS_MESSAGE_FD>&1 ])# _AC_INIT_DEFAULTS_FDS @@ -1224,6 +1220,8 @@ fi ac_tool_prefix= test -n "$host_alias" && ac_tool_prefix=$host_alias- +test "$silent" = yes && exec AS_MESSAGE_FD>/dev/null + m4_divert_pop([PARSE_ARGS])dnl ])# _AC_INIT_PARSE_ARGS diff --git a/tests/base.at b/tests/base.at index 31ebf55a..71bc3bb6 100644 --- a/tests/base.at +++ b/tests/base.at @@ -194,3 +194,24 @@ AT_CHECK_AUTOCONF AT_CHECK_CONFIGURE AT_CLEANUP + + +## -------------- ## +## AC_CACHE_CHECK ## +## -------------- ## + +# make sure AC_CACH_CHECK is silent with -q + +AT_SETUP([AC_CACHE_CHECK]) + +AT_DATA([configure.ac], +[[AC_INIT +AC_CACHE_CHECK([for nothing],[ac_nothing],[ac_nothing=found]) +]]) + +AT_CHECK_AUTOCONF +AT_CHECK([./configure -q], 0) +AT_CHECK_CONFIGURE([], 0, [checking for nothing... found +]) + +AT_CLEANUP