Index: aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/gcc/aclocal.m4,v
retrieving revision 1.40.4.1
diff -u -r1.40.4.1 aclocal.m4
--- aclocal.m4	2001/02/18 05:41:46	1.40.4.1
+++ aclocal.m4	2001/05/11 15:49:26
@@ -40,8 +40,10 @@
   ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 changequote([, ])dnl
 gcc_AC_CHECK_DECL($ac_func,
-  [AC_DEFINE_UNQUOTED($ac_tr_decl, 1) $2],
-  [AC_DEFINE_UNQUOTED($ac_tr_decl, 0) $3],
+  [AC_DEFINE_UNQUOTED($ac_tr_decl, 1,
+    [Define to 1 if we found this declaration otherwise define to 0.]) $2],
+  [AC_DEFINE_UNQUOTED($ac_tr_decl, 0,
+    [Define to 1 if we found this declaration otherwise define to 0.]) $3],
 dnl It is possible that the include files passed in here are local headers
 dnl which supply a backup declaration for the relevant prototype based on
 dnl the definition of (or lack of) the HAVE_DECL_ macro.  If so, this test
@@ -53,14 +55,7 @@
 #define $ac_tr_decl 1
   $4
 )
-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
-fi
-])
+done])
 
 dnl Check if we have vprintf and possibly _doprnt.
 dnl Note autoconf checks for vprintf even though we care about vfprintf.
@@ -193,7 +188,8 @@
 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
 ])
 
@@ -1103,22 +1099,20 @@
 dnl Locate a program and check that its version is acceptable.
 dnl AC_PROG_CHECK_VER(var, name, version-switch,
 dnl                  version-extract-regexp, version-glob)
-AC_DEFUN(gcc_AC_CHECK_PROG_VER,
+AC_DEFUN([gcc_AC_CHECK_PROG_VER],
 [AC_CHECK_PROG([$1], [$2], [$2])
 if test -n "[$]$1"; then
   # Found it, now check the version.
   AC_CACHE_CHECK(for modern $2, gcc_cv_prog_$2_modern,
-[changequote(<<,>>)dnl
-  ac_prog_version=`<<$>>$1 $3 2>&1 |
-                   sed -n 's/^.*patsubst(<<$4>>,/,\/).*$/\1/p'`
+[  ac_prog_version=`[$]$1 $3 2>&1 |
+                   sed -n 's/^.*patsubst([$4],/,\/).*$/\1/p'`
   echo "configure:__oline__: version of $2 is $ac_prog_version" >&AC_FD_CC
   case $ac_prog_version in
     '')     gcc_cv_prog_$2_modern=no;;
-    <<$5>>)
+    [$5])
             gcc_cv_prog_$2_modern=yes;;
     *)      gcc_cv_prog_$2_modern=no;;
   esac
-changequote([,])dnl
 ])
 else
   gcc_cv_prog_$2_modern=no