mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-01-30 11:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of the ICMDS diversion.

Browse Source 
* acgeneral.m4 (AC_DIVERT): Remove ICMDS.
(_AC_OUTPUT_COMMANDS_INIT): New growing string.
(_AC_CONFIG_COMMANDS_INIT, _AC_OUTPUT_CONFIG_STATUS): Adjust.
This commit is contained in:
Akim Demaille 2000-03-14 08:19:53 +00:00
parent bd53adc4fc
commit fca3f1b6f3
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2000-03-14 Akim Demaille <akim@epita.fr>
Get rid of the ICMDS diversion.
* acgeneral.m4 (AC_DIVERT): Remove ICMDS.
(_AC_OUTPUT_COMMANDS_INIT): New growing string.
(_AC_CONFIG_COMMANDS_INIT, _AC_OUTPUT_CONFIG_STATUS): Adjust.
2000-03-14 Akim Demaille <akim@epita.fr>
* autoheader.sh: Use run_m4f, not run_m4.

25
acgeneral.m4
View File

@ -107,10 +107,6 @@ m4_namespace_push(autoconf)
# AC_REQUIRE'd code, 1 level deep
# - NORMAL
# the tests and output code
#
# Finally, this is just a convenience diversions. Undiverted by hand.
# - ICMDS
# extra initialization in config.status
# AC_DIVERT(DIVERSION-NAME)
@ -140,7 +136,6 @@ define([AC_DIVERT],
[NORMAL_1], 23,
[NORMAL], 24,
[ICMDS], 30,
[$1])])
@ -3266,8 +3261,8 @@ AC_DIVERT_POP()dnl
])
# _AC_CONFIG_COMMANDS_INIT(INIT-COMMANDS)
# ---------------------------------------
# _AC_CONFIG_COMMANDS_INIT([INIT-COMMANDS])
# -----------------------------------------
#
# Register INIT-COMMANDS as command pasted *unquoted* in
# `config.status'. This is typically used to pass variables from
@ -3275,9 +3270,11 @@ AC_DIVERT_POP()dnl
# was the case in AC_OUTPUT_COMMANDS.
define(_AC_CONFIG_COMMANDS_INIT,
[ifval([$1],
[AC_DIVERT_PUSH([ICMDS])dnl
$1
AC_DIVERT_POP()])])
[m4_append([_AC_OUTPUT_COMMANDS_INIT], [$1
])])])
# Initialize.
define([_AC_OUTPUT_COMMANDS_INIT])
# AC_CONFIG_COMMANDS(NAME...,[COMMANDS], [INIT-CMDS])
@ -3755,14 +3752,14 @@ EOF
])[]dnl ifval
dnl We output the INIT-CMDS first for obvious reasons :)
cat >>$CONFIG_STATUS <<EOF
ifset([_AC_OUTPUT_COMMANDS_INIT],
[cat >>$CONFIG_STATUS <<EOF
#
# INIT-COMMANDS section.
#
undivert(AC_DIVERT([ICMDS]))dnl
EOF
_AC_OUTPUT_COMMANDS_INIT()
EOF])
dnl The following three sections are in charge of their own here

25
lib/autoconf/general.m4
View File

@ -107,10 +107,6 @@ m4_namespace_push(autoconf)
# AC_REQUIRE'd code, 1 level deep
# - NORMAL
# the tests and output code
#
# Finally, this is just a convenience diversions. Undiverted by hand.
# - ICMDS
# extra initialization in config.status
# AC_DIVERT(DIVERSION-NAME)
@ -140,7 +136,6 @@ define([AC_DIVERT],
[NORMAL_1], 23,
[NORMAL], 24,
[ICMDS], 30,
[$1])])
@ -3266,8 +3261,8 @@ AC_DIVERT_POP()dnl
])
# _AC_CONFIG_COMMANDS_INIT(INIT-COMMANDS)
# ---------------------------------------
# _AC_CONFIG_COMMANDS_INIT([INIT-COMMANDS])
# -----------------------------------------
#
# Register INIT-COMMANDS as command pasted *unquoted* in
# `config.status'. This is typically used to pass variables from
@ -3275,9 +3270,11 @@ AC_DIVERT_POP()dnl
# was the case in AC_OUTPUT_COMMANDS.
define(_AC_CONFIG_COMMANDS_INIT,
[ifval([$1],
[AC_DIVERT_PUSH([ICMDS])dnl
$1
AC_DIVERT_POP()])])
[m4_append([_AC_OUTPUT_COMMANDS_INIT], [$1
])])])
# Initialize.
define([_AC_OUTPUT_COMMANDS_INIT])
# AC_CONFIG_COMMANDS(NAME...,[COMMANDS], [INIT-CMDS])
@ -3755,14 +3752,14 @@ EOF
])[]dnl ifval
dnl We output the INIT-CMDS first for obvious reasons :)
cat >>$CONFIG_STATUS <<EOF
ifset([_AC_OUTPUT_COMMANDS_INIT],
[cat >>$CONFIG_STATUS <<EOF
#
# INIT-COMMANDS section.
#
undivert(AC_DIVERT([ICMDS]))dnl
EOF
_AC_OUTPUT_COMMANDS_INIT()
EOF])
dnl The following three sections are in charge of their own here