From: Akim Demaille Date: Tue, 14 Mar 2000 08:27:19 +0000 (+0000) Subject: * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): When there were no X-Git-Tag: autoconf-2.50~1049 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00121046aa6d34c6d2ff55d230338df16efc4d94;p=thirdparty%2Fautoconf.git * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): When there were no CONFIG_FILES, we had to expand _AC_OUTPUT_FILES into the KILL diversion, because it is AC_OUTPUT_FILES which undiverted the AC_SUBST sed script at its proper place, otherwise it would have been undiverted at the end of `configure', leading to an sh syntax error. Now that we no longer use a diversion, we don't need to call AC_OUTPUT_FILES if useless. (AC_OUTPUT_FILES): Rename as _AC_OUTPUT_FILES. (AC_OUTPUT_LINKS): Rename as _AC_OUTPUT_LINKS. --- diff --git a/ChangeLog b/ChangeLog index 308a5bd83..0cb6e377e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2000-03-14 Akim Demaille + + * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): When there were no + CONFIG_FILES, we had to expand _AC_OUTPUT_FILES into the KILL + diversion, because it is AC_OUTPUT_FILES which undiverted the + AC_SUBST sed script at its proper place, otherwise it would have + been undiverted at the end of `configure', leading to an sh syntax + error. + Now that we no longer use a diversion, we don't need to call + AC_OUTPUT_FILES if useless. + (AC_OUTPUT_FILES): Rename as _AC_OUTPUT_FILES. + (AC_OUTPUT_LINKS): Rename as _AC_OUTPUT_LINKS. + 2000-03-14 Akim Demaille AC_ARG_PROGRAM must not be expanded twice, which is likely since diff --git a/acgeneral.m4 b/acgeneral.m4 index d7b3e0fc0..13dd7f76a 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -1847,7 +1847,7 @@ define([_AC_SUBST_SED_PROGRAM]) # empty value, not an empty second argument. # # Beware that if you change this macro, you also have to change the -# sed script at the top of AC_OUTPUT_FILES. +# sed script at the top of _AC_OUTPUT_FILES. define([AC_SUBST], [ifval([$2], [$1=$2 ])[]dnl @@ -3782,23 +3782,12 @@ _AC_OUTPUT_COMMANDS_INIT() EOF]) -dnl The following three sections are in charge of their own here +dnl The following four sections are in charge of their own here dnl documenting into $CONFIG_STATUS. - -dnl Because AC_OUTPUT_FILES is in charge of undiverting the AC_SUBST -dnl section, it is better to divert it to void and *call it*, rather -dnl than not calling it at all -ifset([AC_LIST_FILES], - [AC_OUTPUT_FILES()], - [AC_DIVERT_PUSH([KILL])dnl - AC_OUTPUT_FILES()dnl - AC_DIVERT_POP()])dnl -ifset([AC_LIST_HEADERS], - [_AC_OUTPUT_HEADERS()])dnl -ifset([AC_LIST_LINKS], - [AC_OUTPUT_LINKS()])dnl -ifset([AC_LIST_COMMANDS], - [_AC_OUTPUT_COMMANDS()])dnl +ifset([AC_LIST_FILES], [_AC_OUTPUT_FILES()])dnl +ifset([AC_LIST_HEADERS], [_AC_OUTPUT_HEADERS()])dnl +ifset([AC_LIST_LINKS], [_AC_OUTPUT_LINKS()])dnl +ifset([AC_LIST_COMMANDS], [_AC_OUTPUT_COMMANDS()])dnl cat >>$CONFIG_STATUS <<\EOF @@ -3844,14 +3833,14 @@ rm -f conftest.defs ]])# AC_OUTPUT_MAKE_DEFS -# AC_OUTPUT_FILES -# --------------- +# _AC_OUTPUT_FILES +# ---------------- # Do the variable substitutions to create the Makefiles or whatever. # This is a subroutine of AC_OUTPUT. # # It has to send itself into $CONFIG_STATUS (eg, via here documents). # Upon exit, no here document shall be opened. -define(AC_OUTPUT_FILES, +define(_AC_OUTPUT_FILES, [cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF # @@ -4303,7 +4292,7 @@ AC_LIST_LINKS_COMMANDS()dnl ])dnl fi; done EOF -])# AC_OUTPUT_LINKS +])# _AC_OUTPUT_LINKS # _AC_OUTPUT_COMMANDS diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index d7b3e0fc0..13dd7f76a 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -1847,7 +1847,7 @@ define([_AC_SUBST_SED_PROGRAM]) # empty value, not an empty second argument. # # Beware that if you change this macro, you also have to change the -# sed script at the top of AC_OUTPUT_FILES. +# sed script at the top of _AC_OUTPUT_FILES. define([AC_SUBST], [ifval([$2], [$1=$2 ])[]dnl @@ -3782,23 +3782,12 @@ _AC_OUTPUT_COMMANDS_INIT() EOF]) -dnl The following three sections are in charge of their own here +dnl The following four sections are in charge of their own here dnl documenting into $CONFIG_STATUS. - -dnl Because AC_OUTPUT_FILES is in charge of undiverting the AC_SUBST -dnl section, it is better to divert it to void and *call it*, rather -dnl than not calling it at all -ifset([AC_LIST_FILES], - [AC_OUTPUT_FILES()], - [AC_DIVERT_PUSH([KILL])dnl - AC_OUTPUT_FILES()dnl - AC_DIVERT_POP()])dnl -ifset([AC_LIST_HEADERS], - [_AC_OUTPUT_HEADERS()])dnl -ifset([AC_LIST_LINKS], - [AC_OUTPUT_LINKS()])dnl -ifset([AC_LIST_COMMANDS], - [_AC_OUTPUT_COMMANDS()])dnl +ifset([AC_LIST_FILES], [_AC_OUTPUT_FILES()])dnl +ifset([AC_LIST_HEADERS], [_AC_OUTPUT_HEADERS()])dnl +ifset([AC_LIST_LINKS], [_AC_OUTPUT_LINKS()])dnl +ifset([AC_LIST_COMMANDS], [_AC_OUTPUT_COMMANDS()])dnl cat >>$CONFIG_STATUS <<\EOF @@ -3844,14 +3833,14 @@ rm -f conftest.defs ]])# AC_OUTPUT_MAKE_DEFS -# AC_OUTPUT_FILES -# --------------- +# _AC_OUTPUT_FILES +# ---------------- # Do the variable substitutions to create the Makefiles or whatever. # This is a subroutine of AC_OUTPUT. # # It has to send itself into $CONFIG_STATUS (eg, via here documents). # Upon exit, no here document shall be opened. -define(AC_OUTPUT_FILES, +define(_AC_OUTPUT_FILES, [cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF # @@ -4303,7 +4292,7 @@ AC_LIST_LINKS_COMMANDS()dnl ])dnl fi; done EOF -])# AC_OUTPUT_LINKS +])# _AC_OUTPUT_LINKS # _AC_OUTPUT_COMMANDS