2 files changed, 22 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index a24199236..e6287c18a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20050603
+ - (dtucker) [configure.ac] Only try gcc -std=gnu99 if LLONG_MAX isn't
+   defined, and check that it helps before keeping it in CFLAGS.  Some old
+   gcc's don't set an error code when encountering an unknown value in -std.
+   Found and tested by tim@.
+
 20050602
  - (tim) [configure.ac] Some platforms need sys/types.h for arpa/nameser.h.
    Take AC_CHECK_HEADERS test out of ultrix section. It caused other platforms
@@ -2673,4 +2679,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3810 2005/06/03 03:28:29 tim Exp $
+$Id: ChangeLog,v 1.3811 2005/06/03 07:58:31 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index bca35a633..cd795caf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.272 2005/06/03 03:28:29 tim Exp $
+# $Id: configure.ac,v 1.273 2005/06/03 07:58:31 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -77,17 +77,23 @@ fi
 AC_SUBST(LD)
 
 AC_C_INLINE
+
+AC_CHECK_DECL(LLONG_MAX, have_llong_max=1, , [#include <limits.h>])
+
 if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
         CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-uninitialized"
 
-        # Check for -std=gnu99 support (needed for LLONG_MIN/MAX on Linux)
-        saved_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS -std=gnu99"
-        AC_MSG_CHECKING(whether cc accepts -std=gnu99 option)
-        AC_TRY_COMPILE([], [return(0);], [AC_MSG_RESULT(yes)],
-                [AC_MSG_RESULT(no)
-                CFLAGS="$saved_CFLAGS"],
-        )
+        if test -z "$have_llong_max"; then
+                # retry LLONG_MAX with -std=gnu99, needed on some Linuxes
+                unset ac_cv_have_decl_LLONG_MAX
+                saved_CFLAGS="$CFLAGS"
+                CFLAGS="$CFLAGS -std=gnu99"
+                AC_CHECK_DECL(LLONG_MAX,
+                    [have_llong_max=1],
+                    [CFLAGS="$saved_CFLAGS"],
+                    [#include <limits.h>]
+                )
+        fi
 fi
 
 AC_ARG_WITH(rpath,