Bug fixes

diff --git a/ChangeLog b/ChangeLog
index 9ca1b878ff81ec51d68529a6a44e64fc6f01f949..64743d9070baa53e387c8a5c32f5d27d67353e98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Aug 19 15:37:32 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (initialize_global_constants): [common_files]
+       Include acinclude.m4.
+
+       * m4/AM_PROG_CC_STDC.m4: Patch from Jim Meyering/Kaveh Ghazi.
+
 Sat Aug 17 11:27:14 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (handle_dependencies): Push `depend'-clean targets

diff --git a/automake.in b/automake.in
index 47ecf02488c3b5aebfbc0f3741a3e7d4fc1364c9..6cf193c05b3f67f5f473e9d72f54e6d0c657fb01 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2960,7 +2960,7 @@ sub initialize_global_constants
         "config.guess", "config.sub", "AUTHORS", "BACKLOG", "ABOUT-GNU",
         "libversion.in", "mdate-sh", "mkinstalldirs", "install-sh",
         'texinfo.tex', "ansi2knr.c", "ansi2knr.1", 'elisp-comp',
-        'interlock', 'ylwrap'
+        'interlock', 'ylwrap', 'acinclude.m4'
         );
 
     # Commonly used files we auto-include, but only sometimes.

diff --git a/m4/AM_PROG_CC_STDC.m4 b/m4/AM_PROG_CC_STDC.m4
index aee617c6e40f7330092cb8e7b2e7b09ad7c19fcc..7ef64025c5497e10596cb9e306f2b69d7c75fd29 100644 (file)
--- a/m4/AM_PROG_CC_STDC.m4
+++ b/m4/AM_PROG_CC_STDC.m4
@@ -30,8 +30,8 @@ ac_save_CC="$CC"
 # AIX                  -qlanglvl=ansi
 # Ultrix and OSF/1     -std1
 # HP-UX                        -Aa -D_HPUX_SOURCE
-# SVR4                 -Xc
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xc
+# SVR4                 -Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   AC_TRY_COMPILE(