* aclocal.m4: Quote final argument of patsubst. Use

	3-argument form of AC_DEFINE.  Restore quotes to [] while
	using AC_FD_CC.
	* configure.in: Remove unnecessary changequote calls.
	* configure, config.in: Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42617 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 42 insertions, 33 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 381e456d050..8f000fbf51f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-25  Zack Weinberg  <zackw@stanford.edu>
+
+	* aclocal.m4: Quote final argument of patsubst.  Use
+	3-argument form of AC_DEFINE.  Restore quotes to [] while
+	using AC_FD_CC.
+	* configure.in: Remove unnecessary changequote calls.
+	* configure, config.in: Regenerate.
+
 2001-05-25  Sam TH  <sam@uchicago.edu>
 
 	* basic-block.h: Fix header include guards.
diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index 1e0b59fc4fa..3a2335419b3 100644
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -70,8 +70,8 @@ done
 dnl Automatically generate config.h entries via autoheader.
 if test x = y ; then
   patsubst(translit([$1], [a-z], [A-Z]), [\w+],
-    AC_DEFINE([HAVE_DECL_\&], 1,
-      [Define to 1 if we found this declaration otherwise define to 0.]))dnl
+    [AC_DEFINE([HAVE_DECL_\&], 1,
+      [Define to 1 if we found this declaration otherwise define to 0.])])dnl
 fi
 ])
 
@@ -206,7 +206,8 @@ switch (0) case 0: case (sizeof(long double) >= sizeof(double)):;],
 gcc_cv_c_long_double=yes, gcc_cv_c_long_double=no)
 fi])
 if test $gcc_cv_c_long_double = yes; then
-  AC_DEFINE(HAVE_LONG_DOUBLE)
+  AC_DEFINE(HAVE_LONG_DOUBLE, 1, 
+      [Define if your compiler supports the \`long double' type.])
 fi
 ])
 
@@ -1135,7 +1136,9 @@ if test -n "[$]$1"; then
 [changequote(<<,>>)dnl
   ac_prog_version=`<<$>>$1 $3 2>&1 |
                    sed -n 's/^.*patsubst(<<$4>>,/,\/).*$/\1/p'`
+changequote([,])dnl
   echo "configure:__oline__: version of $2 is $ac_prog_version" >&AC_FD_CC
+changequote(<<,>>)dnl
   case $ac_prog_version in
     '')     gcc_cv_prog_$2_modern=no;;
     <<$5>>)
diff --git a/gcc/config.in b/gcc/config.in
index bfe43be1fcc..53995ba2e4b 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -13,9 +13,6 @@
 /* Define if you don't have vprintf but do have _doprnt.  */
 #undef HAVE_DOPRNT
 
-/* Define if the `long double' type works.  */
-#undef HAVE_LONG_DOUBLE
-
 /* Define if you have the ANSI # stringizing operator in cpp. */
 #undef HAVE_STRINGIZE
 
@@ -296,6 +293,9 @@
 /* Define if your compiler understands volatile. */
 #undef HAVE_VOLATILE
 
+/* Define if your compiler supports the `long double' type. */
+#undef HAVE_LONG_DOUBLE
+
 /* Define if your compiler supports the `long long' type. */
 #undef HAVE_LONG_LONG
 
diff --git a/gcc/configure b/gcc/configure
index 4d926b57b16..8bcb8c9cbd9 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -2052,7 +2052,7 @@ EOF
 fi
 
 # Find some useful tools
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4490,66 +4490,66 @@ fi
 
 done
 if test x = y ; then
-  cat >> confdefs.h <<EOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_DECL_GETENV 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_ATOL 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_SBRK 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_ABORT 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_ATOF 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_GETCWD 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_GETWD 1
 EOF
  \
-	cat >> confdefs.h <<EOF
+	cat >> confdefs.h <<\EOF
 #define HAVE_DECL_STRSIGNAL 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_PUTC_UNLOCKED 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_FPUTS_UNLOCKED 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_STRSTR 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_ENVIRON 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_ERRNO 1
 EOF
  \
-	cat >> confdefs.h <<EOF
+	cat >> confdefs.h <<\EOF
 #define HAVE_DECL_MALLOC 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_REALLOC 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_CALLOC 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_FREE 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_BASENAME 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_GETOPT 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_CLOCK 1
 EOF
 fi
@@ -4608,13 +4608,13 @@ fi
 
 done
 if test x = y ; then
-  cat >> confdefs.h <<EOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_DECL_GETRLIMIT 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_SETRLIMIT 1
 EOF
- cat >> confdefs.h <<EOF
+ cat >> confdefs.h <<\EOF
 #define HAVE_DECL_GETRUSAGE 1
 EOF
 fi
@@ -4673,7 +4673,7 @@ fi
 
 done
 if test x = y ; then
-  cat >> confdefs.h <<EOF
+  cat >> confdefs.h <<\EOF
 #define HAVE_DECL_TIMES 1
 EOF
 fi
diff --git a/gcc/configure.in b/gcc/configure.in
index e8d45030c30..2db8388c8c6 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -743,7 +743,6 @@ echo "Using \`$srcdir/config/$md_file' as machine description file."
 # If any of the xm_file variables contain nonexistent files, warn
 # about them and drop them.
 
-changequote(,)dnl
 bx=
 for x in $build_xm_file; do
   if    test -f $srcdir/config/$x
@@ -770,7 +769,6 @@ for x in $xm_file; do
   fi
 done
 xm_file="$tx"
-changequote([,])dnl
 
 count=a
 for f in $tm_file; do