From b48c3cd47ee278ecbbdc72a8ed1d5f8ae870852a Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Mon, 20 Sep 1999 08:15:42 +0000
Subject: [PATCH] 1999-09-20  Akim Demaille  <akim@epita.fr>

	* acgeneral.m4 (AC_OUTPUT): Don't remove the CONFIG_HEADERS
 	unconditionaly: it breaks the `config.h has not changed' trick.

1999-09-20  Pavel Roskin  <pavel_roskin@geocities.com>

	* autoheader.sh: Fix the tr invocation.
---
 ChangeLog               | 9 +++++++++
 acgeneral.m4            | 7 +++----
 autoheader.sh           | 8 +++++---
 configure               | 1 -
 lib/autoconf/general.m4 | 7 +++----
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a6941e0..27f64a41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-09-20  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4 (AC_OUTPUT): Don't remove the CONFIG_HEADERS
+ 	unconditionaly: it breaks the `config.h has not changed' trick.
+
+1999-09-20  Pavel Roskin  <pavel_roskin@geocities.com>
+
+	* autoheader.sh: Fix the tr invocation.
+
 1999-09-17  Akim Demaille  <akim@epita.fr>
 
 	* acgeneral.m4 (AC_INIT_PARSE_ARGS): Improve configure's --help.
diff --git a/acgeneral.m4 b/acgeneral.m4
index 38917602..e70bd5b8 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2673,10 +2673,9 @@ confstat=cft\$\$
 EOF
 
 cat >> $CONFIG_STATUS <<EOF
-dnl Remove all of CONFIG_FILES and CONFIG_HEADERS, and trap to remove
-dnl the temp files.  There is no need to trap for the config files
-dnl since they are built from `mv tmp-file config-file', hence their
-dnl update is atomic.
+dnl Remove all the CONFIG_FILES, and trap to remove the temp files.  There
+dnl is no need to trap for the config files since they are built from `mv
+dnl tmp-file config-file', hence their update is atomic.
 : \${CONFIG_FILES="$1"}
 ifdef([AC_LIST_HEADER], [: \${CONFIG_HEADERS=AC_LIST_HEADER}
 ])dnl
diff --git a/autoheader.sh b/autoheader.sh
index 8b0521b8..66033d2e 100644
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -56,6 +56,8 @@ case "${M4}" in
     test -f "${M4}" || M4=m4 ;;
 esac
 
+ac_LF_and_DOT="`echo; echo .`"
+
 localdir=.
 show_version=no
 
@@ -180,7 +182,7 @@ if test -n "$syms"; then
   # Make sure the boundary of template files is also the boundary
   # of the paragraph.  Extra newlines don't hurt since they will
   # be removed.
-  # Undocumented useless feature: stuff outside of @TOP@ and @BOTTOM@ 
+  # Undocumented useless feature: stuff outside of @TOP@ and @BOTTOM@
   # is ignored in the systemwide acconfig.h too.
   for t in $TEMPLATES; do
     sedscript=""
@@ -213,7 +215,7 @@ $syms
 EOF
    fgrep -f $fgrep_tmp
    rm -f $fgrep_tmp) |
-  tr @. "`echo`."
+  tr @. "$ac_LF_and_DOT"
 # We use echo to avoid assuming a particular line-breaking character.
 # The extra dot is to prevent the shell from consuming trailing
 # line-breaks from the sub-command output.  A line-break within
@@ -222,7 +224,7 @@ EOF
 # would break.
 fi
 
-echo "$types" | tr ,. "`echo`." | sort | uniq | while read ctype; do
+echo "$types" | tr ,. "$ac_LF_and_DOT" | sort | uniq | while read ctype; do
   test -z "$ctype" && continue
   sym="`echo "${ctype}" | tr 'abcdefghijklmnopqrstuvwxyz *' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_P'`"
   echo "
diff --git a/configure b/configure
index 30d8c15a..d482c54f 100755
--- a/configure
+++ b/configure
@@ -983,7 +983,6 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%;t t
 s%@INSTALL_DATA@%$INSTALL_DATA%;t t
 s%@standards_info@%$standards_info%;t t
 s%@standards_dvi@%$standards_dvi%;t t
-
 CEOF
 EOF
 
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 38917602..e70bd5b8 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2673,10 +2673,9 @@ confstat=cft\$\$
 EOF
 
 cat >> $CONFIG_STATUS <<EOF
-dnl Remove all of CONFIG_FILES and CONFIG_HEADERS, and trap to remove
-dnl the temp files.  There is no need to trap for the config files
-dnl since they are built from `mv tmp-file config-file', hence their
-dnl update is atomic.
+dnl Remove all the CONFIG_FILES, and trap to remove the temp files.  There
+dnl is no need to trap for the config files since they are built from `mv
+dnl tmp-file config-file', hence their update is atomic.
 : \${CONFIG_FILES="$1"}
 ifdef([AC_LIST_HEADER], [: \${CONFIG_HEADERS=AC_LIST_HEADER}
 ])dnl
-- 
2.47.2