diff --git a/configure b/configure
index 37434ec7a..2055b9022 100755
--- a/configure
+++ b/configure
@@ -11751,17 +11751,16 @@ fi
 done
 
 
+INCLUDE_STDINT=no
 if test $ac_cv_header_stdint_h = yes; then
 INCLUDE_STDINT="#include <stdint.h>"
-DEFINE_INT8_T=""
-DEFINE_UINT8_T=""
-DEFINE_INT16_T=""
-DEFINE_UINT16_T=""
-DEFINE_INT32_T=""
-DEFINE_UINT32_T=""
-DEFINE_INT64_T=""
-DEFINE_UINT64_T=""
 else
+if test $ac_cv_header_sys_inttypes_h = yes; then
+INCLUDE_STDINT="#include <sys/inttypes.h>"
+fi
+fi
+
+if test "$INCLUDE_STDINT"="no"; then
 INCLUDE_STDINT=""
 DEFINE_INT8_T="#define int8_t gss8"
 DEFINE_UINT8_T="#define uint8_t gsu8"
@@ -11771,6 +11770,15 @@ DEFINE_INT32_T="#define int32_t gss32"
 DEFINE_UINT32_T="#define uint32_t gsu32"
 DEFINE_INT64_T="#define int64_t gss64"
 DEFINE_UINT64_T="#define uint64_t gsu64"
+else
+DEFINE_INT8_T=""
+DEFINE_UINT8_T=""
+DEFINE_INT16_T=""
+DEFINE_UINT16_T=""
+DEFINE_INT32_T=""
+DEFINE_UINT32_T=""
+DEFINE_INT64_T=""
+DEFINE_UINT64_T=""
 fi
 
 
@@ -11782,6 +11790,7 @@ fi
 
 
 
+
 #--------------------------------------------------------------------
 # These used by GSFileHandle.m and distributed objects
 #--------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index e0e1502d9..c7a663761 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# configure.in for GNU Objective-C library
+# configure.ac for GNU Objective-C library
 # Process this file with autoconf to produce a configure script.
 #
 #   Copyright (C) 1993,1994, 1995, 1996, 1997 Free Software Foundation, Inc.
@@ -667,10 +667,10 @@ INCLUDE_STDINT="#include <stdint.h>"
 else
 if test $ac_cv_header_sys_inttypes_h = yes; then
 INCLUDE_STDINT="#include <sys/inttypes.h>"
-endif
-endif
+fi
+fi
 
-if test $INCLUDE_STDINT = no; then
+if test "$INCLUDE_STDINT"="no"; then
 INCLUDE_STDINT=""
 DEFINE_INT8_T="#define int8_t gss8"
 DEFINE_UINT8_T="#define uint8_t gsu8"