diff options
| author | Andrey Borzenkov <bor@users.sourceforge.net> | 2001-06-06 08:37:21 +0000 |
|---|---|---|
| committer | Andrey Borzenkov <bor@users.sourceforge.net> | 2001-06-06 08:37:21 +0000 |
| commit | 4b44bbb3fb61feb33ee275b13e604976f3bb2220 (patch) | |
| tree | 97652ff4bbe1313bded16027d2cfb6aa57e7a123 /Src/mkmakemod.sh | |
| parent | a77a6994e8b9b3b665dd42f1c36dd44cc1c965ac (diff) | |
| download | zsh-4b44bbb3fb61feb33ee275b13e604976f3bb2220.tar.gz zsh-4b44bbb3fb61feb33ee275b13e604976f3bb2220.tar.xz zsh-4b44bbb3fb61feb33ee275b13e604976f3bb2220.zip | |
unposted; based on 14679 (me) and 14693 (Bart): Allow processing by both
autoconf-2.13 and autoconf-2.50; remove config.status hack for autoconf-2.50
Diffstat (limited to 'Src/mkmakemod.sh')
| -rw-r--r-- | Src/mkmakemod.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Src/mkmakemod.sh b/Src/mkmakemod.sh index a912a307b..7ecd25e26 100644 --- a/Src/mkmakemod.sh +++ b/Src/mkmakemod.sh @@ -111,7 +111,9 @@ if $first_stage; then sed -e '/^#/d' -e 's/ .*/ /' -e 's/^name=/ /'`" module_list="${bin_mods}${dyn_mods}" - if grep '%@D@%D%' config.status >/dev/null; then + # check both 2.13 and 2.50 syntax + if grep '%@D@%D%' config.status >/dev/null || + grep ',@D@,D,' config.status >/dev/null; then is_dynamic=true else is_dynamic=false @@ -463,7 +465,12 @@ if $first_stage; then fi -if $second_stage; then +if $second_stage ; then + if grep 'Hack for autoconf-2.13' ./config.status > /dev/null 2>&1 ; then + bang=\! + else + bang= + fi trap "rm -f $the_subdir/${the_makefile}" 1 2 15 @@ -472,7 +479,7 @@ if $second_stage; then # tree, this is a problem. zsh's configure script edits config.status, # adding the feature that an input filename starting with "!" has the # "!" removed and is not mangled further. - CONFIG_FILES=$the_subdir/${the_makefile}:\!$the_subdir/${the_makefile}.in CONFIG_HEADERS= ${CONFIG_SHELL-/bin/sh} ./config.status + CONFIG_FILES=$the_subdir/${the_makefile}:$bang$the_subdir/${the_makefile}.in CONFIG_HEADERS= ${CONFIG_SHELL-/bin/sh} ./config.status fi |