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

.distfiles

@@ -1,7 +1,7 @@
 DISTFILES_SRC='
     .cvsignore .distfiles .preconfig Makefile.in
     ChangeLog ChangeLog-3.1 ChangeLog.3.0 INSTALL LICENCE META-FAQ README
-    acconfig.h aclocal.m4 aczsh.m4 configure.in
+    acconfig.h aclocal.m4 aczsh.m4 configure.in zshconfig.ac configure.ac
     configure config.h.in stamp-h.in
-    config.guess config.sub install-sh mkinstalldirs
+    config.guess config.sub install-sh mkinstalldirs 
 '

ChangeLog

@@ -1,3 +1,11 @@
+001-06-06  Andrej Borsenkow  <bor@zsh.org>
+
+	* unposted; based on 14679 (me) and 14693 (Bart): configure.ac,
+	zshconfig.ac, .distfiles, Makefile.in, configure.in, Src/mkmakemod.sh:
+	Allow processing by both autoconf-2.13 and autoconf-2.50; remove
+	config.status hack for autoconf-2.50
+
+
 2001-06-05  Chmouel Boudjnah  <chmouel@mandrakesoft.com>
 
 	* 14550: Completion/Redhat/Command/_rpm: Add --nobuild and --nogpg to rpm

Makefile.in

@@ -128,7 +128,7 @@ config: config.h
 config.status: $(sdir)/configure
 	$(SHELL) ./config.status --recheck
 
-$(sdir)/configure: $(sdir)/configure.in $(sdir)/aclocal.m4 $(sdir)/aczsh.m4
+$(sdir)/configure: $(sdir)/zshconfig.ac $(sdir)/aclocal.m4 $(sdir)/aczsh.m4 $(sdir)/configure.in $(sdir)/configure.ac
 	cd $(sdir) && autoconf
 
 config.h: stamp-h
@@ -137,7 +137,7 @@ stamp-h: $(sdir)/config.h.in config.status
 	  CONFIG_FILES= CONFIG_HEADERS=$(subdir)/config.h $(SHELL) ./config.status
 
 $(sdir)/config.h.in: $(sdir)/stamp-h.in
-$(sdir)/stamp-h.in: $(sdir)/configure.in $(sdir)/acconfig.h \
+$(sdir)/stamp-h.in: $(sdir)/zshconfig.ac $(sdir)/acconfig.h \
 		$(sdir)/aclocal.m4 $(sdir)/aczsh.m4
 	cd $(sdir) && autoheader
 	echo > $(sdir)/stamp-h.in

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
 

configure.ac

@@ -0,0 +1,7 @@
+
+AC_INIT(zsh, 4.1.0-dev-0, [zsh-workers@sunsite.dk])
+AC_PREREQ(2.50)
+AC_CONFIG_SRCDIR(Src/zsh.h)
+
+m4_include([zshconfig.ac])
+