From: Akim Demaille Date: Fri, 25 Feb 2000 13:19:35 +0000 (+0000) Subject: 2000-02-25 Akim Demaille X-Git-Tag: autoconf-2.50~1124 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab73229498a5d1f2965b5666df7186b80cc2d2a0;p=thirdparty%2Fautoconf.git 2000-02-25 Akim Demaille * doc/autoconf.texi (Default Includes): Export the knowledge on disabling echo's trailing new line. * acspecific.m4 (AC_PROG_ECHO_N): Renamed as... (_AC_PROG_ECHO): this. Set ECHO_N, ECHO_C, ECHO_T instead of ac_n, ac_c and ac_t. All dependencies changed. * doc/autoconf.texi (Preset Output Variables): Document ECHO_C, ECHO_N and ECHO_T. * m4/atconfig.m4 (fp_PROG_ECHO): Removed. (AT_CONFIG): Don't use it. --- diff --git a/ChangeLog b/ChangeLog index 15421720d..d14d85493 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2000-02-25 Akim Demaille + + Export the knowledge on disabling echo's trailing new line. + + * acspecific.m4 (AC_PROG_ECHO_N): Renamed as... + (_AC_PROG_ECHO): this. + Set ECHO_N, ECHO_C, ECHO_T instead of ac_n, ac_c and ac_t. + All dependencies changed. + * doc/autoconf.texi (Preset Output Variables): Document ECHO_C, + ECHO_N and ECHO_T. + * m4/atconfig.m4 (fp_PROG_ECHO): Removed. + (AT_CONFIG): Don't use it. + 2000-02-24 Akim Demaille * autoconf.sh (AC_ACLOCALDIR): Use `(aclocal) 2>/dev/null`, not diff --git a/acgeneral.m4 b/acgeneral.m4 index c168d056c..6dc8eb95a 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -1,7 +1,8 @@ # This file is part of Autoconf. -*- Autoconf -*- # Parameterized macros. # Requires GNU m4. -# Copyright (C) 1992, 93, 94, 95, 96, 98, 1999 Free Software Foundation, Inc. +# Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000 +# Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1139,7 +1140,7 @@ ac_exeext= dnl By default assume that objects files use an extension of .o. Only dnl change it if the script calls AC_OBJEXT. ac_objext=o -AC_PROG_ECHO_N +_AC_PROG_ECHO()dnl dnl Substitute for predefined variables. AC_SUBST(SHELL)dnl AC_SUBST(CFLAGS)dnl @@ -1467,7 +1468,7 @@ dnl Set the other $[1] vars. Propagate the failures of config.sub. ac_cv_$1_vendor=`echo $ac_cv_$1 | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'` ac_cv_$1_os=`echo $ac_cv_$1 | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'` else - echo $ac_n "(cached) $ac_c" 1>&AC_FD_MSG + echo $ECHO_N "(cached) $ECHO_C" 1>&AC_FD_MSG fi AC_MSG_RESULT($ac_cv_$1) @@ -1619,7 +1620,7 @@ define(AC_CACHE_VAL, dnl shell variable, so we need the eval. dnl if test "${$1+set}" = set; then AC_VAR_IF_SET([$1], - [echo $ac_n "(cached) $ac_c" 1>&AC_FD_MSG], + [echo $ECHO_N "(cached) $ECHO_C" 1>&AC_FD_MSG], [$2])]) @@ -1756,7 +1757,7 @@ define([_AC_ECHO], # _AC_ECHO_N(STRING [ , FD ]) # Same as _AC_ECHO, but echo doesn't return to a new line. define(_AC_ECHO_N, -[echo $ac_n "_AC_SH_QUOTE($1)$ac_c" 1>&ifelse($2,,AC_FD_MSG,$2)]) +[echo $ECHO_N "_AC_SH_QUOTE($1)$ECHO_C" 1>&ifelse($2,,AC_FD_MSG,$2)]) # AC_MSG_CHECKING(FEATURE-DESCRIPTION) define(AC_MSG_CHECKING, @@ -1770,12 +1771,12 @@ _AC_ECHO([configure:__oline__: checking $1], AC_FD_CC)]) # AC_MSG_RESULT(RESULT-DESCRIPTION) define(AC_MSG_RESULT, -[_AC_ECHO([$ac_t""$1])]) +[_AC_ECHO([$ECHO_T""$1])]) # AC_MSG_RESULT_UNQUOTED(RESULT-DESCRIPTION) # Likewise, but perform $ ` \ shell substitutions. define(AC_MSG_RESULT_UNQUOTED, -[_AC_ECHO_UNQUOTED([$ac_t""$1])]) +[_AC_ECHO_UNQUOTED([$ECHO_T""$1])]) # AC_VERBOSE(RESULT-DESCRIPTION) define(AC_VERBOSE, @@ -2204,7 +2205,7 @@ AC_DEFUN(AC_PREFIX_PROGRAM, pushdef(AC_Prog, translit($1, a-z, A-Z))dnl if test "x$prefix" = xNONE; then dnl We reimplement AC_MSG_CHECKING (mostly) to avoid the ... in the middle. -echo $ac_n "checking for prefix by $ac_c" 1>&AC_FD_MSG +echo $ECHO_N "checking for prefix by $ECHO_C" 1>&AC_FD_MSG AC_PATH_PROG(AC_Prog, $1) if test -n "$ac_cv_path_[]AC_Prog"; then prefix=`echo $ac_cv_path_[]AC_Prog | [sed 's%/[^/][^/]*//*[^/][^/]*$%%']` diff --git a/acspecific.m4 b/acspecific.m4 index e81a5be44..1dda93a5d 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -1,6 +1,7 @@ # This file is part of Autoconf. -*- Autoconf -*- # Macros that test for specific features. -# Copyright (C) 1992, 93, 94, 95, 96, 98, 1999 Free Software Foundation, Inc. +# Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000 +# Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -54,23 +55,31 @@ ## --------------------- ## +# _AC_PROG_ECHO +# ------------- # Check whether to use -n, \c, or newline-tab to separate # checking messages from result messages. +# Don't try to cache, since the results of this macro are needed to +# display the checking message. In addition, caching something used once +# has little interest. # Idea borrowed from dist 3.0. -# Internal use only. -AC_DEFUN(AC_PROG_ECHO_N, +AC_DEFUN(_AC_PROG_ECHO, [if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says Kaveh Ghazi + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' + ECHO_N= ECHO_C=' +' ECHO_T=' ' else - ac_n=-n ac_c= ac_t= + ECHO_N=-n ECHO_C= ECHO_T= fi else - ac_n= ac_c='\c' ac_t= + ECHO_N= ECHO_C='\c' ECHO_T= fi -]) +AC_SUBST(ECHO_C)dnl +AC_SUBST(ECHO_N)dnl +AC_SUBST(ECHO_T)dnl +])# _AC_PROG_ECHO + # AC_PROG_CC([COMPILER ...]) # -------------------------- diff --git a/configure b/configure index 1dfe8c0ff..c458a8ff1 100755 --- a/configure +++ b/configure @@ -564,15 +564,15 @@ cross_compiling=$ac_cv_prog_cc_cross ac_exeext= ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says Kaveh Ghazi + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' + ECHO_N= ECHO_C=' +' ECHO_T=' ' else - ac_n=-n ac_c= ac_t= + ECHO_N=-n ECHO_C= ECHO_T= fi else - ac_n= ac_c='\c' ac_t= + ECHO_N= ECHO_C='\c' ECHO_T= fi ac_aux_dir= @@ -609,11 +609,11 @@ 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 $ac_n "checking for a BSD compatible install... $ac_c" 1>&6 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6 echo "configure:614: checking for a BSD compatible install" 1>&5 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do @@ -656,7 +656,7 @@ fi INSTALL="$ac_install_sh" fi fi -echo "$ac_t""$INSTALL" 1>&6 +echo "$ECHO_T""$INSTALL" 1>&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -666,7 +666,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo $ac_n "checking whether build environment is sane... $ac_c" 1>&6 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" 1>&6 echo "configure:671: checking whether build environment is sane" 1>&5 # Just in case sleep 1 @@ -703,7 +703,7 @@ else Check your system clock" 1>&2; exit 1; } fi rm -f conftest* -echo "$ac_t""yes" 1>&6 +echo "$ECHO_T""yes" 1>&6 if test "$program_transform_name" = s,x,x,; then program_transform_name= else @@ -723,11 +723,11 @@ test "$program_suffix" != NONE && # sed with no file args requires a program. test "$program_transform_name" = "" && program_transform_name="s,x,x," -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}... $ac_c" 1>&6 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" 1>&6 echo "configure:728: checking whether ${MAKE-make} sets \${MAKE}" 1>&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else cat >conftestmake <<\EOF all: @@ -743,10 +743,10 @@ fi rm -f conftestmake fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 + echo "$ECHO_T""yes" 1>&6 SET_MAKE= else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -766,106 +766,81 @@ cat >>confdefs.h <&6 +echo $ECHO_N "checking for working aclocal... $ECHO_C" 1>&6 echo "configure:771: checking for working aclocal" 1>&5 # 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 "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else ACLOCAL="$missing_dir/missing aclocal" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi -echo $ac_n "checking for working autoconf... $ac_c" 1>&6 +echo $ECHO_N "checking for working autoconf... $ECHO_C" 1>&6 echo "configure:784: checking for working autoconf" 1>&5 # 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 "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else AUTOCONF="$missing_dir/missing autoconf" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi -echo $ac_n "checking for working automake... $ac_c" 1>&6 +echo $ECHO_N "checking for working automake... $ECHO_C" 1>&6 echo "configure:797: checking for working automake" 1>&5 # 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 "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else AUTOMAKE="$missing_dir/missing automake" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi -echo $ac_n "checking for working autoheader... $ac_c" 1>&6 +echo $ECHO_N "checking for working autoheader... $ECHO_C" 1>&6 echo "configure:810: checking for working autoheader" 1>&5 # 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 "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else AUTOHEADER="$missing_dir/missing autoheader" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi -echo $ac_n "checking for working makeinfo... $ac_c" 1>&6 +echo $ECHO_N "checking for working makeinfo... $ECHO_C" 1>&6 echo "configure:823: checking for working makeinfo" 1>&5 # 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 "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else MAKEINFO="$missing_dir/missing makeinfo" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi AT_TESTPATH=.. -echo $ac_n "checking how to suppress newlines using echo... $ac_c" 1>&6 -echo "configure:838: checking how to suppress newlines using echo" 1>&5 -if test "${fp_cv_prog_echo_nonl+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - fp_cv_prog_echo_nonl=no - else - fp_cv_prog_echo_nonl=option - fi -else - fp_cv_prog_echo_nonl=escape -fi - -fi -echo "$ac_t""$fp_cv_prog_echo_nonl" 1>&6 -test $fp_cv_prog_echo_nonl = no \ - && echo 2>&1 "WARNING: \`echo' not powerful enough for \`make check'" -case $fp_cv_prog_echo_nonl in - no) ECHO_N= ECHO_C= ;; - option) ECHO_N=-n ECHO_C= ;; - escape) ECHO_N= ECHO_C='\c' ;; -esac - 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 $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:867: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:842: checking for $ac_word" 1>&5 if test "${ac_cv_path_M4+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else case "$M4" in /* | ?:/*) @@ -887,19 +862,19 @@ esac fi M4="$ac_cv_path_M4" if test -n "$M4"; then - echo "$ac_t""$M4" 1>&6 + echo "$ECHO_T""$M4" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi test -n "$M4" && break done test -n "$M4" || M4="m4" -echo $ac_n "checking whether m4 supports frozen files... $ac_c" 1>&6 -echo "configure:901: checking whether m4 supports frozen files" 1>&5 +echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" 1>&6 +echo "configure:876: checking whether m4 supports frozen files" 1>&5 if test "${ac_cv_prog_gnu_m4+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else ac_cv_prog_gnu_m4=no if test x"$M4" != x; then @@ -908,7 +883,7 @@ if test x"$M4" != x; then esac fi fi -echo "$ac_t""$ac_cv_prog_gnu_m4" 1>&6 +echo "$ECHO_T""$ac_cv_prog_gnu_m4" 1>&6 if test x"$ac_cv_prog_gnu_m4" != xyes; then { echo "configure: error: GNU m4 1.4 is required" 1>&2; exit 1; } fi @@ -917,10 +892,10 @@ 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 $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:922: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:897: checking for $ac_word" 1>&5 if test "${ac_cv_prog_AWK+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -939,33 +914,33 @@ fi fi AWK="$ac_cv_prog_AWK" if test -n "$AWK"; then - echo "$ac_t""$AWK" 1>&6 + echo "$ECHO_T""$AWK" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi test -n "$AWK" && break done -echo $ac_n "checking for working help2man... $ac_c" 1>&6 -echo "configure:952: checking for working help2man" 1>&5 +echo $ECHO_N "checking for working help2man... $ECHO_C" 1>&6 +echo "configure:927: checking for working help2man" 1>&5 # 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 "$ac_t""found" 1>&6 + echo "$ECHO_T""found" 1>&6 else HELP2MAN="\${SHELL} \${top_srcdir}/missing help2man" - echo "$ac_t""missing" 1>&6 + echo "$ECHO_T""missing" 1>&6 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo $ac_n "checking for $ac_word... $ac_c" 1>&6 -echo "configure:967: checking for $ac_word" 1>&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 +echo "configure:942: checking for $ac_word" 1>&5 if test "${ac_cv_path_PERL+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else case "$PERL" in /* | ?:/*) @@ -988,9 +963,9 @@ esac fi PERL="$ac_cv_path_PERL" if test -n "$PERL"; then - echo "$ac_t""$PERL" 1>&6 + echo "$ECHO_T""$PERL" 1>&6 else - echo "$ac_t""no" 1>&6 + echo "$ECHO_T""no" 1>&6 fi if test "$PERL" != no; then @@ -1010,11 +985,11 @@ 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 $ac_n "checking for a BSD compatible install... $ac_c" 1>&6 -echo "configure:1015: checking for a BSD compatible install" 1>&5 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6 +echo "configure:990: checking for a BSD compatible install" 1>&5 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo $ECHO_N "(cached) $ECHO_C" 1>&6 else IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do @@ -1057,7 +1032,7 @@ fi INSTALL="$ac_install_sh" fi fi -echo "$ac_t""$INSTALL" 1>&6 +echo "$ECHO_T""$INSTALL" 1>&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1297,6 +1272,9 @@ if test -n "\$CONFIG_FILES"; then # Protect against being on the right side of a sed subst in config.status. sed 's/%@/@@/; s/@%/@@/; s/%;t t\$/@;t t/; /@;t t\$/s/[\\\\&%]/\\\\&/g; s/@@/%@/; s/@@/@%/; s/@;t t\$/%;t t/' >\$ac_cs_root.subs <<\\CEOF +s%@ECHO_C@%$ECHO_C%;t t +s%@ECHO_N@%$ECHO_N%;t t +s%@ECHO_T@%$ECHO_T%;t t s%@SHELL@%$SHELL%;t t s%@CFLAGS@%$CFLAGS%;t t s%@CPPFLAGS@%$CPPFLAGS%;t t @@ -1332,8 +1310,6 @@ s%@AUTOHEADER@%$AUTOHEADER%;t t s%@MAKEINFO@%$MAKEINFO%;t t s%@SET_MAKE@%$SET_MAKE%;t t s%@AT_TESTPATH@%$AT_TESTPATH%;t t -s%@ECHO_N@%$ECHO_N%;t t -s%@ECHO_C@%$ECHO_C%;t t s%@M4@%$M4%;t t s%@AWK@%$AWK%;t t s%@HELP2MAN@%$HELP2MAN%;t t diff --git a/doc/Makefile.in b/doc/Makefile.in index a4ee8eeef..c161c4d33 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -57,11 +57,14 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AT_TESTPATH = @AT_TESTPATH@ AWK = @AWK@ HELP2MAN = @HELP2MAN@ M4 = @M4@ +PACKAGE = @PACKAGE@ PERL = @PERL@ PERLSCRIPTS = @PERLSCRIPTS@ +VERSION = @VERSION@ standards_texi = @standards_texi@ MAKEINFO = makeinfo --no-split @@ -85,9 +88,6 @@ DIST_COMMON = $(autoconf_TEXINFOS) $(standards_TEXINFOS) Makefile.am \ Makefile.in mdate-sh stamp-vti texinfo.tex version.texi -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 26ede3899..5a6d7a5b6 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -45,7 +45,7 @@ This file documents the GNU Autoconf package for creating scripts to configure source code packages using templates and an @code{m4} macro package. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999 Free Software +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this @@ -80,7 +80,7 @@ approved by the Foundation. @page @vskip 0pt plus 1filll -Copyright @copyright{} 1992, 93, 94, 95, 96, 98, 99 Free Software +Copyright @copyright{} 1992, 93, 94, 95, 96, 98, 99, 2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this @@ -1227,6 +1227,26 @@ set when you call @code{AC_PROG_CXX} (or empty if you don't). C++ features. @end defvar +@defvar ECHO_C +@defvarx ECHO_N +@defvarx ECHO_T +@ovindex ECHO_C +@ovindex ECHO_N +@ovindex ECHO_T +How to suppress the trailing newline from @code{echo} for +question... answer reports: + +@example +echo $ECHO_N "And the winner is... $ECHO_C" +sleep 100000000000 +echo "$@{ECHO_T@}dead." +@end example + +@noindent +Some old and uncommon @code{echo} offer no means to achieve this, in +which case @code{ECHO_T} is set to tab. You might not want to use it. +@end defvar + @defvar FFLAGS @ovindex FFLAGS Debugging and optimization options for the Fortran 77 compiler. If it diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index c168d056c..6dc8eb95a 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -1,7 +1,8 @@ # This file is part of Autoconf. -*- Autoconf -*- # Parameterized macros. # Requires GNU m4. -# Copyright (C) 1992, 93, 94, 95, 96, 98, 1999 Free Software Foundation, Inc. +# Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000 +# Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1139,7 +1140,7 @@ ac_exeext= dnl By default assume that objects files use an extension of .o. Only dnl change it if the script calls AC_OBJEXT. ac_objext=o -AC_PROG_ECHO_N +_AC_PROG_ECHO()dnl dnl Substitute for predefined variables. AC_SUBST(SHELL)dnl AC_SUBST(CFLAGS)dnl @@ -1467,7 +1468,7 @@ dnl Set the other $[1] vars. Propagate the failures of config.sub. ac_cv_$1_vendor=`echo $ac_cv_$1 | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'` ac_cv_$1_os=`echo $ac_cv_$1 | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'` else - echo $ac_n "(cached) $ac_c" 1>&AC_FD_MSG + echo $ECHO_N "(cached) $ECHO_C" 1>&AC_FD_MSG fi AC_MSG_RESULT($ac_cv_$1) @@ -1619,7 +1620,7 @@ define(AC_CACHE_VAL, dnl shell variable, so we need the eval. dnl if test "${$1+set}" = set; then AC_VAR_IF_SET([$1], - [echo $ac_n "(cached) $ac_c" 1>&AC_FD_MSG], + [echo $ECHO_N "(cached) $ECHO_C" 1>&AC_FD_MSG], [$2])]) @@ -1756,7 +1757,7 @@ define([_AC_ECHO], # _AC_ECHO_N(STRING [ , FD ]) # Same as _AC_ECHO, but echo doesn't return to a new line. define(_AC_ECHO_N, -[echo $ac_n "_AC_SH_QUOTE($1)$ac_c" 1>&ifelse($2,,AC_FD_MSG,$2)]) +[echo $ECHO_N "_AC_SH_QUOTE($1)$ECHO_C" 1>&ifelse($2,,AC_FD_MSG,$2)]) # AC_MSG_CHECKING(FEATURE-DESCRIPTION) define(AC_MSG_CHECKING, @@ -1770,12 +1771,12 @@ _AC_ECHO([configure:__oline__: checking $1], AC_FD_CC)]) # AC_MSG_RESULT(RESULT-DESCRIPTION) define(AC_MSG_RESULT, -[_AC_ECHO([$ac_t""$1])]) +[_AC_ECHO([$ECHO_T""$1])]) # AC_MSG_RESULT_UNQUOTED(RESULT-DESCRIPTION) # Likewise, but perform $ ` \ shell substitutions. define(AC_MSG_RESULT_UNQUOTED, -[_AC_ECHO_UNQUOTED([$ac_t""$1])]) +[_AC_ECHO_UNQUOTED([$ECHO_T""$1])]) # AC_VERBOSE(RESULT-DESCRIPTION) define(AC_VERBOSE, @@ -2204,7 +2205,7 @@ AC_DEFUN(AC_PREFIX_PROGRAM, pushdef(AC_Prog, translit($1, a-z, A-Z))dnl if test "x$prefix" = xNONE; then dnl We reimplement AC_MSG_CHECKING (mostly) to avoid the ... in the middle. -echo $ac_n "checking for prefix by $ac_c" 1>&AC_FD_MSG +echo $ECHO_N "checking for prefix by $ECHO_C" 1>&AC_FD_MSG AC_PATH_PROG(AC_Prog, $1) if test -n "$ac_cv_path_[]AC_Prog"; then prefix=`echo $ac_cv_path_[]AC_Prog | [sed 's%/[^/][^/]*//*[^/][^/]*$%%']` diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index e81a5be44..1dda93a5d 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -1,6 +1,7 @@ # This file is part of Autoconf. -*- Autoconf -*- # Macros that test for specific features. -# Copyright (C) 1992, 93, 94, 95, 96, 98, 1999 Free Software Foundation, Inc. +# Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000 +# Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -54,23 +55,31 @@ ## --------------------- ## +# _AC_PROG_ECHO +# ------------- # Check whether to use -n, \c, or newline-tab to separate # checking messages from result messages. +# Don't try to cache, since the results of this macro are needed to +# display the checking message. In addition, caching something used once +# has little interest. # Idea borrowed from dist 3.0. -# Internal use only. -AC_DEFUN(AC_PROG_ECHO_N, +AC_DEFUN(_AC_PROG_ECHO, [if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says Kaveh Ghazi + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' + ECHO_N= ECHO_C=' +' ECHO_T=' ' else - ac_n=-n ac_c= ac_t= + ECHO_N=-n ECHO_C= ECHO_T= fi else - ac_n= ac_c='\c' ac_t= + ECHO_N= ECHO_C='\c' ECHO_T= fi -]) +AC_SUBST(ECHO_C)dnl +AC_SUBST(ECHO_N)dnl +AC_SUBST(ECHO_T)dnl +])# _AC_PROG_ECHO + # AC_PROG_CC([COMPILER ...]) # -------------------------- diff --git a/m4/Makefile.in b/m4/Makefile.in index 6f1d12159..c7758a1c2 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -57,11 +57,15 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AT_TESTPATH = @AT_TESTPATH@ AWK = @AWK@ HELP2MAN = @HELP2MAN@ M4 = @M4@ +MAKEINFO = @MAKEINFO@ +PACKAGE = @PACKAGE@ PERL = @PERL@ PERLSCRIPTS = @PERLSCRIPTS@ +VERSION = @VERSION@ standards_texi = @standards_texi@ EXTRA_DIST = init.m4 missing.m4 sanity.m4 atconfig.m4 @@ -70,9 +74,6 @@ CONFIG_CLEAN_FILES = DIST_COMMON = Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar diff --git a/m4/atconfig.m4 b/m4/atconfig.m4 index dbd739716..91d008a7e 100644 --- a/m4/atconfig.m4 +++ b/m4/atconfig.m4 @@ -8,35 +8,4 @@ AC_DEFUN(AT_CONFIG, [AT_TESTPATH=ifelse($1, , ., $1) AC_SUBST(AT_TESTPATH) -fp_PROG_ECHO -]) - -## ----------------------------------------- ## -## Find how to suppress newlines with echo. ## -## ----------------------------------------- ## - -# Once this macro is called, you may output with no echo in a Makefile or -# script using: echo @ECHO_N@ "STRING_TO_OUTPUT@ECHO_C@". - -AC_DEFUN(fp_PROG_ECHO, -[AC_CACHE_CHECK(how to suppress newlines using echo, fp_cv_prog_echo_nonl, -[if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - fp_cv_prog_echo_nonl=no - else - fp_cv_prog_echo_nonl=option - fi -else - fp_cv_prog_echo_nonl=escape -fi -]) -test $fp_cv_prog_echo_nonl = no \ - && echo 2>&1 "WARNING: \`echo' not powerful enough for \`make check'" -case $fp_cv_prog_echo_nonl in - no) ECHO_N= ECHO_C= ;; - option) ECHO_N=-n ECHO_C= ;; - escape) ECHO_N= ECHO_C='\c' ;; -esac -AC_SUBST(ECHO_N)dnl -AC_SUBST(ECHO_C)dnl ]) diff --git a/man/Makefile.in b/man/Makefile.in index f15168deb..cf08485c7 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -57,11 +57,15 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AT_TESTPATH = @AT_TESTPATH@ AWK = @AWK@ HELP2MAN = @HELP2MAN@ M4 = @M4@ +MAKEINFO = @MAKEINFO@ +PACKAGE = @PACKAGE@ PERL = @PERL@ PERLSCRIPTS = @PERLSCRIPTS@ +VERSION = @VERSION@ standards_texi = @standards_texi@ man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 autoscan.1 @@ -83,9 +87,6 @@ NROFF = nroff DIST_COMMON = Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar diff --git a/tests/Makefile.in b/tests/Makefile.in index f3a3c361a..dc4da1a03 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -57,10 +57,14 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +AT_TESTPATH = @AT_TESTPATH@ AWK = @AWK@ HELP2MAN = @HELP2MAN@ M4 = @M4@ +MAKEINFO = @MAKEINFO@ +PACKAGE = @PACKAGE@ PERLSCRIPTS = @PERLSCRIPTS@ +VERSION = @VERSION@ standards_texi = @standards_texi@ AUTOMAKE_OPTIONS = gnits @@ -81,9 +85,6 @@ CONFIG_CLEAN_FILES = atconfig DIST_COMMON = Makefile.am Makefile.in atconfig.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar