From d83af1a97e652d4a5cd14cd49251f626d74c7a57 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Sat, 14 Feb 2004 18:50:15 +0000
Subject: 19420: Update configure.ac for better Autconf 2.50 support.

---
 Src/Modules/system.mdd |  4 ++++
 Src/mkmakemod.sh       | 16 +++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'Src')

diff --git a/Src/Modules/system.mdd b/Src/Modules/system.mdd
index 61950994a..51e96a46f 100644
--- a/Src/Modules/system.mdd
+++ b/Src/Modules/system.mdd
@@ -23,5 +23,9 @@ errnames.c: errnames1.awk errnames2.awk $(dir_top)/config.h @ERRNO_H@
 
 errcount.h: errnames.c
 	grep 'define.*ERRCOUNT' errnames.c > $@
+
+clean-here: clean.system
+clean.system:
+	rm -f errcount.h errnames.c
 Make
 
diff --git a/Src/mkmakemod.sh b/Src/mkmakemod.sh
index 7ecd25e26..38c5e72e1 100644
--- a/Src/mkmakemod.sh
+++ b/Src/mkmakemod.sh
@@ -466,21 +466,11 @@ if $first_stage; then
 fi
 
 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
 
-    # The standard config.status requires the pathname for the .in file to
-    # be relative to the top of the source tree.  As we have it in the build
-    # 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}:$bang$the_subdir/${the_makefile}.in CONFIG_HEADERS= ${CONFIG_SHELL-/bin/sh} ./config.status
-
+    ${CONFIG_SHELL-/bin/sh} ./config.status \
+	--file=$the_subdir/${the_makefile}:$the_subdir/${the_makefile}.in ||
+    return 1
 fi
 
 exit 0
-- 
cgit 1.4.1