From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 18 Dec 2006 22:26:35 +0000 (+0000)
Subject: * m4/stdint.m4 (gl_STDINT_H): Set STDINT_H to empty if stdint.h
X-Git-Tag: cvs-readonly~1490
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=69d25acfd85067031a54285fb933d2e3ccfb0055;p=gnulib.git

* m4/stdint.m4 (gl_STDINT_H): Set STDINT_H to empty if stdint.h
conforms to C99, rather than relying on the user's environment
setting of STDINT_H.

2006-12-18  Paul Eggert  <eggert@cs.ucla.edu>
---

diff --git a/ChangeLog b/ChangeLog
index fe3b8add8..afaf16823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 2006-12-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* m4/stdint.m4 (gl_STDINT_H): Set STDINT_H to empty if stdint.h
+	conforms to C99, rather than relying on the user's environment
+	setting of STDINT_H.
+
+2006-12-18  Paul Eggert  <eggert@cs.ucla.edu>
 	and Eric Blake  <ebb9@byu.net>
 
 	* lib/dirname.h (DOUBLE_SLASH_IS_DISTINCT_ROOT): Default to 0, not 1.
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index 6fa651845..92cb832b1 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 20
+# stdint.m4 serial 21
 dnl Copyright (C) 2001-2002, 2004-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -192,8 +192,9 @@ struct s {
 	 ]])],
          [gl_cv_header_working_stdint_h=yes])])
   fi
-  if test "$gl_cv_header_working_stdint_h" != yes; then
-
+  if test "$gl_cv_header_working_stdint_h" = yes; then
+    STDINT_H=
+  else
     dnl Check for <sys/inttypes.h>, and for
     dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
     AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h])