From 6d725687c490d4ba957a1bbc0ba0a2956c09fa69 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 17 Jan 2014 19:17:34 +1100
Subject:  - (dtucker) [configure.ac] Also look in inttypes.h for uintXX_t
 types.

---
 ChangeLog    |  1 +
 configure.ac | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3822b048..d6ed13f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@
    have statfs and fstatfs.  ok djm@
  - (dtucker) [openbsd-compat/bsd-statvfs.h] Only start including headers if we
    need them to cut down on the name collisions.
+ - (dtucker) [configure.ac] Also look in inttypes.h for uintXX_t types.
 
 20140118
  - (djm) OpenBSD CVS Sync
diff --git a/configure.ac b/configure.ac
index c97e12f3..4f40afce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.552 2014/01/17 07:10:58 dtucker Exp $
+# $Id: configure.ac,v 1.553 2014/01/17 08:17:35 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.552 $)
+AC_REVISION($Revision: 1.553 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -340,6 +340,7 @@ AC_CHECK_HEADERS([ \
 	glob.h \
 	ia.h \
 	iaf.h \
+	inttypes.h \
 	limits.h \
 	locale.h \
 	login.h \
@@ -3244,6 +3245,17 @@ if test -z "$have_uintxx_t" ; then
 	])
 fi
 
+if test -z "$have_uintxx_t" ; then
+    AC_MSG_CHECKING([for uintXX_t types in inttypes.h])
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <inttypes.h> ]],
+	[[ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;]])],
+		[
+			AC_DEFINE([HAVE_UINTXX_T])
+			AC_MSG_RESULT([yes])
+		], [ AC_MSG_RESULT([no]) 
+	])
+fi
+
 if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \
 	   test "x$ac_cv_header_sys_bitypes_h" = "xyes")
 then
-- 
cgit v1.2.3