diff --git a/ChangeLog b/ChangeLog
index b963e8993..747193351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-05  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* configure.ac: minor tweak to avoid possible inconsistency in
+	environment used to check LLOGN_MAX and LONG_LONG_MAX presence.
+	* configure: regenerate
+
 2007-02-04  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/Foundation/NSCompoundPredicate.h:
diff --git a/configure b/configure
index 42ec4a487..495c523d4 100755
--- a/configure
+++ b/configure
@@ -13510,13 +13510,21 @@ fi
 #
 { echo "$as_me:$LINENO: checking whether we have LLONG_MAX" >&5
 echo $ECHO_N "checking whether we have LLONG_MAX... $ECHO_C" >&6; }
+# We need to use the same header environment as the test above because we
+# will be using one or the other set of constants.
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <limits.h>
+#ifndef _GNU_SOURCE
+	#define _GNU_SOURCE
+	#endif
+        #ifdef HAVE_STDINT_H
+	#include <stdint.h>
+	#endif
+	#include <limits.h>
 	#if defined(LLONG_MAX)
 	#if LONG_MAX == LLONG_MAX
 	#error long max equals long long max
@@ -15367,7 +15375,7 @@ echo "${ECHO_T}none" >&6; }
     echo "If you really want to build -base without DO support, add --disable-do"
     echo "to the configure arguments."
     echo "For more information, read the GNUstep build guide, ffcall section:"
-    echo "http://documents.made-it.com/GNUstep/buildguide.html#FOREIGN.FUNCTION.INTERFACES"
+    echo "http://gnustep.made-it.com/BuildGuide/index.html"
     { { echo "$as_me:$LINENO: error: Incomplete support for ffi functionality." >&5
 echo "$as_me: error: Incomplete support for ffi functionality." >&2;}
    { (exit 1); exit 1; }; }
diff --git a/configure.ac b/configure.ac
index 37cb151b7..14a3811a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1041,7 +1041,15 @@ fi
 # Solaris and *BSD use LLONG_MAX instead
 #
 AC_MSG_CHECKING([whether we have LLONG_MAX])
-AC_TRY_CPP([#include <limits.h>
+# We need to use the same header environment as the test above because we
+# will be using one or the other set of constants.
+AC_TRY_CPP([#ifndef _GNU_SOURCE
+	#define _GNU_SOURCE
+	#endif
+        #ifdef HAVE_STDINT_H
+	#include <stdint.h>
+	#endif
+	#include <limits.h>
 	#if defined(LLONG_MAX)
 	#if LONG_MAX == LLONG_MAX
 	#error long max equals long long max