From 8c1d203595e9ff8c9012d3e9e040ea49ebfd93ae Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 5 Aug 1996 22:04:21 +0000
Subject: [PATCH] Bug fix

---
 ChangeLog             | 3 +++
 m4/AM_PROG_CC_STDC.m4 | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d487cda..632c361d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Mon Aug  5 00:12:45 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+	* m4/AM_PROG_CC_STDC.m4: Require AC_PROG_CC.
+	Don't touch CFLAGS.
+
 	* automake.in (handle_dist_worker): Reverted erroneous "-chmod".
 	(handle_texinfo): Don't generate `.info-[0-9]' as a filename.
 
diff --git a/m4/AM_PROG_CC_STDC.m4 b/m4/AM_PROG_CC_STDC.m4
index 1efc9857..aee617c6 100644
--- a/m4/AM_PROG_CC_STDC.m4
+++ b/m4/AM_PROG_CC_STDC.m4
@@ -20,10 +20,11 @@
 # @end defmac
 
 AC_DEFUN(AM_PROG_CC_STDC,
-[AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
+[AC_REQUIRE([AC_PROG_CC])
+AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
 AC_CACHE_VAL(ac_cv_prog_cc_stdc,
 [ac_cv_prog_cc_stdc=no
-ac_save_CFLAGS="$CFLAGS"
+ac_save_CC="$CC"
 # Don't try gcc -ansi; that turns off useful extensions and
 # breaks some systems' header files.
 # AIX			-qlanglvl=ansi
@@ -32,7 +33,7 @@ ac_save_CFLAGS="$CFLAGS"
 # SVR4			-Xc
 for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xc
 do
-  CFLAGS="$ac_save_CFLAGS $ac_arg"
+  CC="$ac_save_CC $ac_arg"
   AC_TRY_COMPILE(
 [#if !defined(__STDC__) || __STDC__ != 1
 choke me
@@ -45,7 +46,7 @@ struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};],
 [ac_cv_prog_cc_stdc="$ac_arg"; break])
 done
-CFLAGS="$ac_save_CFLAGS"
+CC="$ac_save_CC"
 ])
 AC_MSG_RESULT($ac_cv_prog_cc_stdc)
 case "x$ac_cv_prog_cc_stdc" in
-- 
2.43.5