From: Pavel Roskin <proski@gnu.org>
Date: Wed, 13 Dec 2000 14:53:51 +0000 (+0000)
Subject: * m4sugar.m4 (m4_file_append): Add a newline after _m4eof,
X-Git-Tag: autoconf-2.50~322
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27853939be4b90050a3ea3c5be02fdd5d4de0763;p=thirdparty%2Fautoconf.git

* m4sugar.m4 (m4_file_append): Add a newline after _m4eof,
otherwise _m4eof is appended to the output on FreeBSD 4.0.
* tests/atgeneral.m4 (AT_INIT): Avoid using unbalanced "y"
in sed, use "s" instead.
* tests/mktests.sh: Don't use ? in sed - it's a GNU extension.
Use separate patterns for A[CU]_DEFUN and AC_DEFUN_ONCE.
---

diff --git a/ChangeLog b/ChangeLog
index 1d5bd5594..77d0d8207 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-12-13  Pavel Roskin  <proski@gnu.org>
+
+	* m4sugar.m4 (m4_file_append): Add a newline after _m4eof,
+	otherwise _m4eof is appended to the output on FreeBSD 4.0.
+	* tests/atgeneral.m4 (AT_INIT): Avoid using unbalanced "y"
+	in sed, use "s" instead.
+	* tests/mktests.sh: Don't use \? in sed - it's a GNU extension.
+	Use separate patterns for A[CU]_DEFUN and AC_DEFUN_ONCE.
+
 2000-12-13  Akim Demaille  <akim@epita.fr>
 
 	EXEEXT and OBJEXT don't need to know $CYGWIN etc.
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 3ea8381dc..1dc8b644e 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -168,7 +168,7 @@ Options:
 Tests:
 EOF
   # "  1 42  45 " => " (1|42|45): "
-  at_tests_pattern=`echo "$at_tests" | sed 's/^  *//;s/  *$//;y/  */|/'`
+  at_tests_pattern=`echo "$at_tests" | sed 's/^  *//;s/  *$//;s/  */|/g'`
   egrep -e " (${at_tests_pattern}): " <<EOF
 m4_divert([HELP])dnl Help message inserted here.
 m4_divert([SETUP])dnl
diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index 4c65460ad..b863b5678 100644
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -1615,7 +1615,8 @@ m4_define([m4_version_compare],
 m4_define([m4_file_append],
 [m4_syscmd([cat >>$1 <<_m4eof
 $2
-_m4eof])
+_m4eof
+])
 m4_if(m4_sysval, [0], [],
       [m4_fatal([$0: cannot write: $1])])])
 
diff --git a/m4sugar.m4 b/m4sugar.m4
index 4c65460ad..b863b5678 100644
--- a/m4sugar.m4
+++ b/m4sugar.m4
@@ -1615,7 +1615,8 @@ m4_define([m4_version_compare],
 m4_define([m4_file_append],
 [m4_syscmd([cat >>$1 <<_m4eof
 $2
-_m4eof])
+_m4eof
+])
 m4_if(m4_sysval, [0], [],
       [m4_fatal([$0: cannot write: $1])])])
 
diff --git a/tests/atgeneral.m4 b/tests/atgeneral.m4
index 3ea8381dc..1dc8b644e 100644
--- a/tests/atgeneral.m4
+++ b/tests/atgeneral.m4
@@ -168,7 +168,7 @@ Options:
 Tests:
 EOF
   # "  1 42  45 " => " (1|42|45): "
-  at_tests_pattern=`echo "$at_tests" | sed 's/^  *//;s/  *$//;y/  */|/'`
+  at_tests_pattern=`echo "$at_tests" | sed 's/^  *//;s/  *$//;s/  */|/g'`
   egrep -e " (${at_tests_pattern}): " <<EOF
 m4_divert([HELP])dnl Help message inserted here.
 m4_divert([SETUP])dnl
diff --git a/tests/mktests.sh b/tests/mktests.sh
index 73f194087..ede185d05 100755
--- a/tests/mktests.sh
+++ b/tests/mktests.sh
@@ -135,7 +135,8 @@ MK_EOF
 # Get the list of macros which are defined in Autoconf level.
 # Get rid of the macros we are not interested in.
 cat $src |
-  sed -ne 's/^A[CU]_DEFUN\(_ONCE\)\?(\[*\([a-zA-Z0-9_]*\).*$/\2/p' |
+  sed -n -e 's/^A[CU]_DEFUN(\[*\([a-zA-Z0-9_]*\).*$/\1/p' \
+         -e 's/^AC_DEFUN_ONCE(\[*\([a-zA-Z0-9_]*\).*$/\1/p' |
   sort |
   uniq |
   egrep -v "$syntax_exclude_egrep" >acdefuns