Formerly acgeneral.m4.~157~

diff --git a/acgeneral.m4 b/acgeneral.m4
index c9c5cfc863ab3ec4ab9e9a3f1d0cb294dd78cbd0..16dff128d0710a473627522fab4e6a953668f78c 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -62,7 +62,7 @@ dnl when AC_CONFIG_HEADER is used.
 define(AC_NOTICE,
 [# Guess values for system-dependent variables and create Makefiles.
 dnl [#] Generated automatically using autoconf.
-# Generated automatically using autoconf version AC_ACVERSION
+# Generated automatically using autoconf version] AC_ACVERSION [
 dnl [#] by AC_USER@AC_HOST on AC_DATE
 # Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
 
@@ -713,11 +713,15 @@ changequote(,)dnl
 changequote([,])dnl
   if test "$dir" != "$file"; then
     test "$top_srcdir" != . && srcdir=$top_srcdir/$dir
-    test ! -d $dir && mkdir $dir
+    test ! -d "$dir" && mkdir "$dir"
   fi
-  echo creating $file
-  rm -f $file
-  echo "# Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." > $file
+  echo creating "$file"
+  rm -f "$file"
+  comment_str="Generated automatically from `echo $file|sed 's|.*/||'`.in by configure."
+  case "$file" in
+    *.c | *.h )  echo "/* $comment_str */" > "$file" ;;
+    * )          echo "# $comment_str"     > "$file" ;;
+  esac
   sed -e "
 $prsub
 dnl Shell code in configure.in might set extrasub.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index c9c5cfc863ab3ec4ab9e9a3f1d0cb294dd78cbd0..16dff128d0710a473627522fab4e6a953668f78c 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -62,7 +62,7 @@ dnl when AC_CONFIG_HEADER is used.
 define(AC_NOTICE,
 [# Guess values for system-dependent variables and create Makefiles.
 dnl [#] Generated automatically using autoconf.
-# Generated automatically using autoconf version AC_ACVERSION
+# Generated automatically using autoconf version] AC_ACVERSION [
 dnl [#] by AC_USER@AC_HOST on AC_DATE
 # Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
 
@@ -713,11 +713,15 @@ changequote(,)dnl
 changequote([,])dnl
   if test "$dir" != "$file"; then
     test "$top_srcdir" != . && srcdir=$top_srcdir/$dir
-    test ! -d $dir && mkdir $dir
+    test ! -d "$dir" && mkdir "$dir"
   fi
-  echo creating $file
-  rm -f $file
-  echo "# Generated automatically from `echo $file|sed 's|.*/||'`.in by configure." > $file
+  echo creating "$file"
+  rm -f "$file"
+  comment_str="Generated automatically from `echo $file|sed 's|.*/||'`.in by configure."
+  case "$file" in
+    *.c | *.h )  echo "/* $comment_str */" > "$file" ;;
+    * )          echo "# $comment_str"     > "$file" ;;
+  esac
   sed -e "
 $prsub
 dnl Shell code in configure.in might set extrasub.