From: Akim Demaille Date: Mon, 27 Mar 2000 15:47:35 +0000 (+0000) Subject: * acgeneral.m4 (_AC_CHECK_TOOL_PREFIX): Rename back as X-Git-Tag: autoconf-2.50~990 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdce732f0ca145c4d7e0f20b6763fe9470c67434;p=thirdparty%2Fautoconf.git * acgeneral.m4 (_AC_CHECK_TOOL_PREFIX): Rename back as AC_CHECK_TOOL_PREFIX since some packages rely on it. --- diff --git a/ChangeLog b/ChangeLog index e7cd541be..f625ef920 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-03-27 Akim Demaille + + * acgeneral.m4 (_AC_CHECK_TOOL_PREFIX): Rename back as + AC_CHECK_TOOL_PREFIX since some packages rely on it. + 2000-03-27 Akim Demaille Move all the language dependent macros into aclang.m4. diff --git a/Makefile.in b/Makefile.in index c21d1c93e..43b67bdec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -79,7 +79,7 @@ EXTRA_SCRIPTS = autoscan # s/nodistpackageDATA/nodist_pkgdata_DATA/ # and adapt dependencies once we use a more recent Automake -distpkgdataDATA = acfunctions acheaders acidentifiers acmakevars acprograms libm4.m4 acgeneral.m4 acoldnames.m4 acspecific.m4 autoconf.m4 autoheader.m4 autoupdate.m4 +distpkgdataDATA = acfunctions acheaders acidentifiers acmakevars acprograms libm4.m4 acgeneral.m4 acoldnames.m4 acspecific.m4 autoconf.m4 autoheader.m4 autoupdate.m4 aclang.m4 nodistpkgdataDATA = autoconf.m4f autoheader.m4f autoupdate.m4f acversion.m4 @@ -102,7 +102,8 @@ editsh = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''M4''@,$(M4),g' -e ' editpl = sed -e 's,@''datadir''@,$(pkgdatadir),g' -e 's,@''PERL''@,$(PERL),g' -e 's,@''VERSION''@,$(VERSION),g' -e 's,@''PACKAGE''@,$(PACKAGE),g' -common = libm4.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 acversion.m4 +common = libm4.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 acversion.m4 aclang.m4 + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = acversion.m4 diff --git a/acgeneral.m4 b/acgeneral.m4 index 53f0f4917..867712f5c 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -2405,9 +2405,9 @@ ifval([$3], [test -n "[$]$1" || $1="$3" ## -------------------- ## -# _AC_CHECK_TOOL_PREFIX +# AC_CHECK_TOOL_PREFIX # --------------------- -AC_DEFUN(_AC_CHECK_TOOL_PREFIX, +AC_DEFUN(AC_CHECK_TOOL_PREFIX, [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl if test $host != $build; then @@ -2415,13 +2415,13 @@ if test $host != $build; then else ac_tool_prefix= fi -])# _AC_CHECK_TOOL_PREFIX +])# AC_CHECK_TOOL_PREFIX # AC_PATH_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH]) # ----------------------------------------------------------------------- AC_DEFUN(AC_PATH_TOOL, -[AC_REQUIRE([_AC_CHECK_TOOL_PREFIX])dnl +[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl AC_PATH_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, ifelse([$3], , [$2]), $4) ifval([$3], [ @@ -2438,7 +2438,7 @@ fi]) # AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH]) # ------------------------------------------------------------------------ AC_DEFUN(AC_CHECK_TOOL, -[AC_REQUIRE([_AC_CHECK_TOOL_PREFIX])dnl +[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, ifelse([$3], , [$2], ), $4) ifval([$3], [ diff --git a/configure b/configure index ae21ee489..86914a8d5 100755 --- a/configure +++ b/configure @@ -424,7 +424,6 @@ if test "$ac_init_help" = "long"; then # This message is too long to be a string in the A/UX 3.1 sh. cat <<\EOF `configure' configures Autoconf 2.14a to adapt to many kinds -of systems. Usage: configure [OPTION]... [VAR=VALUE]... [HOST] @@ -482,7 +481,8 @@ EOF fi if test -n "$ac_init_help"; then - + $ac_init_help || + echo "Configuration of Autoconf 2.14a:" cat <<\EOF EOF fi @@ -672,7 +672,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6 -echo "configure:594: checking for a BSD compatible install" 1>&5 +echo "configure:595: checking for a BSD compatible install" 1>&5 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 @@ -729,7 +729,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ECHO_N "checking whether build environment is sane... $ECHO_C" 1>&6 -echo "configure:646: checking whether build environment is sane" 1>&5 +echo "configure:647: checking whether build environment is sane" 1>&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -786,7 +786,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" 1>&6 -echo "configure:699: checking whether ${MAKE-make} sets \${MAKE}" 1>&5 +echo "configure:700: 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 $ECHO_N "(cached) $ECHO_C" 1>&6 @@ -829,7 +829,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ECHO_N "checking for working aclocal... $ECHO_C" 1>&6 -echo "configure:737: checking for working aclocal" 1>&5 +echo "configure:738: 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. @@ -842,7 +842,7 @@ else fi echo $ECHO_N "checking for working autoconf... $ECHO_C" 1>&6 -echo "configure:749: checking for working autoconf" 1>&5 +echo "configure:750: 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. @@ -855,7 +855,7 @@ else fi echo $ECHO_N "checking for working automake... $ECHO_C" 1>&6 -echo "configure:761: checking for working automake" 1>&5 +echo "configure:762: 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. @@ -868,7 +868,7 @@ else fi echo $ECHO_N "checking for working autoheader... $ECHO_C" 1>&6 -echo "configure:773: checking for working autoheader" 1>&5 +echo "configure:774: 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. @@ -881,7 +881,7 @@ else fi echo $ECHO_N "checking for working makeinfo... $ECHO_C" 1>&6 -echo "configure:785: checking for working makeinfo" 1>&5 +echo "configure:786: 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. @@ -900,7 +900,7 @@ 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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:802: checking for $ac_word" 1>&5 +echo "configure:803: checking for $ac_word" 1>&5 if test "${ac_cv_path_M4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 else @@ -934,7 +934,7 @@ done test -n "$M4" || M4="m4" echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" 1>&6 -echo "configure:834: checking whether m4 supports frozen files" 1>&5 +echo "configure:835: checking whether m4 supports frozen files" 1>&5 if test "${ac_cv_prog_gnu_m4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 else @@ -955,7 +955,7 @@ 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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:854: checking for $ac_word" 1>&5 +echo "configure:855: checking for $ac_word" 1>&5 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 else @@ -988,7 +988,7 @@ test -n "$AWK" && break done echo $ECHO_N "checking for working help2man... $ECHO_C" 1>&6 -echo "configure:885: checking for working help2man" 1>&5 +echo "configure:886: 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. @@ -1003,7 +1003,7 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6 -echo "configure:899: checking for $ac_word" 1>&5 +echo "configure:900: checking for $ac_word" 1>&5 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 else @@ -1051,7 +1051,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6 -echo "configure:945: checking for a BSD compatible install" 1>&5 +echo "configure:946: checking for a BSD compatible install" 1>&5 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" 1>&6 diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 53f0f4917..867712f5c 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -2405,9 +2405,9 @@ ifval([$3], [test -n "[$]$1" || $1="$3" ## -------------------- ## -# _AC_CHECK_TOOL_PREFIX +# AC_CHECK_TOOL_PREFIX # --------------------- -AC_DEFUN(_AC_CHECK_TOOL_PREFIX, +AC_DEFUN(AC_CHECK_TOOL_PREFIX, [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl if test $host != $build; then @@ -2415,13 +2415,13 @@ if test $host != $build; then else ac_tool_prefix= fi -])# _AC_CHECK_TOOL_PREFIX +])# AC_CHECK_TOOL_PREFIX # AC_PATH_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH]) # ----------------------------------------------------------------------- AC_DEFUN(AC_PATH_TOOL, -[AC_REQUIRE([_AC_CHECK_TOOL_PREFIX])dnl +[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl AC_PATH_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, ifelse([$3], , [$2]), $4) ifval([$3], [ @@ -2438,7 +2438,7 @@ fi]) # AC_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH]) # ------------------------------------------------------------------------ AC_DEFUN(AC_CHECK_TOOL, -[AC_REQUIRE([_AC_CHECK_TOOL_PREFIX])dnl +[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl AC_CHECK_PROG($1, ${ac_tool_prefix}$2, ${ac_tool_prefix}$2, ifelse([$3], , [$2], ), $4) ifval([$3], [ diff --git a/tests/Makefile.in b/tests/Makefile.in index c116f1e27..14eb4830c 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -104,6 +104,10 @@ PERL = perl FILTER_MACROS = egrep -v -e `echo '^AC_ARG_VAR$$ ^AC_CHECK_(DECL|FILE|FUNC|HEADER|LIB|MEMBER|PROG|SIZEOF|TYPE)S?$$ ^AC_CONFIG ^AC_INIT ^AC_LANG ^AC_LINKER_OPTION$$ ^AC_LINK_FILES$$ ^AC_LIST_MEMBER_OF$$ ^AC_PATH_(TOOL|PROG)S?$$ ^AC_PROG_(CC|CXX|F77)_(GNU|WORKS)$$ ^AC_REPLACE_FUNCS$$ ^AC_SEARCH_LIBS$$ ^AC_TRY _AC_' | tr ' ' '|'` +# The files which contains macro we check for syntax. +MACRO_FILES = $(top_srcdir)/acgeneral.m4 $(top_srcdir)/acspecific.m4 $(top_srcdir)/aclang.m4 + + CLEANFILES = debug-*.sh macro configure configure.in config.status config.cache config.log config.h.in config.h DISTCLEANFILES = atconfig testsuite @@ -228,14 +232,14 @@ testsuite: atgeneral.m4 atspecific.m4 suite.m4 macros.m4 $(SUITE) chmod +x $@-tmp mv $@-tmp $@ -macros.m4: $(top_srcdir)/acgeneral.m4 $(top_srcdir)/acspecific.m4 $(srcdir)/Makefile.am - cat $(top_srcdir)/acgeneral.m4 $(top_srcdir)/acspecific.m4 | \ +macros.m4: $(MACRO_FILES) $(srcdir)/Makefile.am + cat $(MACRO_FILES) | \ sed -ne 's/^A[CU]_DEFUN(\[*\([a-zA-Z0-9_]*\).*$$/\1/p' | \ sort | uniq | $(FILTER_MACROS) >defuns # Get the list of macros that are required: there is little interest # in testing them since they will be run but the guy who requires # them. - cat $(top_srcdir)/acgeneral.m4 $(top_srcdir)/acspecific.m4 | \ + cat $(MACRO_FILES) | \ sed -ne 's/dnl.*//;s/.*AC_REQUIRE(\[*\([a-zA-Z0-9_]*\).*$$/\1/p' | \ sort | uniq >requires for macro in `cat defuns`; do \