From: Ben Elliston <bje+keyword+gnu.7caf74@air.net.au>
Date: Sun, 17 Oct 1999 11:38:55 +0000 (+0000)
Subject: 1999-09-21  Akim Demaille  <akim@epita.fr>
X-Git-Tag: post-exp-merge-1999-10-31~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13c2d5fb6599b737616127c580e6395e6ec9d681;p=thirdparty%2Fautoconf.git

1999-09-21  Akim Demaille  <akim@epita.fr>

	* autoconf.sh (Checking for Bugs): Remove the indirection that
	made the `sort -u' useless.

1999-09-21  Akim Demaille  <akim@epita.fr>

	* autoconf.sh (Last sed cmd): Change also @PND@ to `#', since this
	is also a symbol very hard to quote in m4.

1999-09-13  Akim Demaille  <akim@epita.fr>

	* autoconf.sh: Substitute also /@BKL@/[/ /@BKR@/]/ /@DLR@/$/ so
	that these characters are more easily accessible from m4 without
	turning changequote juggling into a nightmare.
---

diff --git a/autoconf.in b/autoconf.in
index c5e63eb8..afea20b2 100644
--- a/autoconf.in
+++ b/autoconf.in
@@ -1,6 +1,6 @@
 #! @SHELL@
 # autoconf -- create `configure' using m4 macros
-# Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1996, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -145,7 +145,7 @@ if grep "^[^#]*${pattern}" $tmpout > /dev/null 2>&1; then
   sed -n "s/^[^#]*\\(${pattern}[_A-Za-z0-9]*\\).*/\\1/p" $tmpout |
     while read macro; do
       grep -n "^[^#]*$macro" $infile /dev/null
-      test $? -eq 1 && echo >&2 "***BUG in Autoconf--please report*** $macro"
+      test $? -eq 1 && echo "***BUG in Autoconf--please report*** $macro"
     done | sort -u >&2
   status=1
 fi
@@ -157,11 +157,17 @@ else
 fi
 
 # Put the real line numbers into configure to make config.log more helpful.
+# Because quoting can sometimes get really painful in m4, there are special
+# tokens to substitute.
 $AWK '
 /__oline__/ { printf "%d:", NR + 1 }
            { print }
 ' $tmpout | sed '
 /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
+s/@BKL@/[/g
+s/@BKR@/]/g
+s/@DLR@/$/g
+s/@PND@/#/g
 ' >&4
 
 rm -f $tmpout
diff --git a/autoconf.sh b/autoconf.sh
index c5e63eb8..afea20b2 100644
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -1,6 +1,6 @@
 #! @SHELL@
 # autoconf -- create `configure' using m4 macros
-# Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1996, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -145,7 +145,7 @@ if grep "^[^#]*${pattern}" $tmpout > /dev/null 2>&1; then
   sed -n "s/^[^#]*\\(${pattern}[_A-Za-z0-9]*\\).*/\\1/p" $tmpout |
     while read macro; do
       grep -n "^[^#]*$macro" $infile /dev/null
-      test $? -eq 1 && echo >&2 "***BUG in Autoconf--please report*** $macro"
+      test $? -eq 1 && echo "***BUG in Autoconf--please report*** $macro"
     done | sort -u >&2
   status=1
 fi
@@ -157,11 +157,17 @@ else
 fi
 
 # Put the real line numbers into configure to make config.log more helpful.
+# Because quoting can sometimes get really painful in m4, there are special
+# tokens to substitute.
 $AWK '
 /__oline__/ { printf "%d:", NR + 1 }
            { print }
 ' $tmpout | sed '
 /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
+s/@BKL@/[/g
+s/@BKR@/]/g
+s/@DLR@/$/g
+s/@PND@/#/g
 ' >&4
 
 rm -f $tmpout
diff --git a/bin/autoconf.in b/bin/autoconf.in
index c5e63eb8..afea20b2 100644
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -1,6 +1,6 @@
 #! @SHELL@
 # autoconf -- create `configure' using m4 macros
-# Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1996, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -145,7 +145,7 @@ if grep "^[^#]*${pattern}" $tmpout > /dev/null 2>&1; then
   sed -n "s/^[^#]*\\(${pattern}[_A-Za-z0-9]*\\).*/\\1/p" $tmpout |
     while read macro; do
       grep -n "^[^#]*$macro" $infile /dev/null
-      test $? -eq 1 && echo >&2 "***BUG in Autoconf--please report*** $macro"
+      test $? -eq 1 && echo "***BUG in Autoconf--please report*** $macro"
     done | sort -u >&2
   status=1
 fi
@@ -157,11 +157,17 @@ else
 fi
 
 # Put the real line numbers into configure to make config.log more helpful.
+# Because quoting can sometimes get really painful in m4, there are special
+# tokens to substitute.
 $AWK '
 /__oline__/ { printf "%d:", NR + 1 }
            { print }
 ' $tmpout | sed '
 /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
+s/@BKL@/[/g
+s/@BKR@/]/g
+s/@DLR@/$/g
+s/@PND@/#/g
 ' >&4
 
 rm -f $tmpout