--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-16  Bruno Haible  <bruno@clisp.org>
+
+	* stdint_.h: On Linux libc4 and libc5, include <sys/bitypes.h> and
+	don't define _STDINT_H_NEED_SIGNED_INT_TYPES.
+
 2006-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* strftime.c (tzname): Don't declare if it is already #defined.

--- a/lib/stdint_.h
+++ b/lib/stdint_.h
@@ -33,6 +33,12 @@
 #if defined(__FreeBSD__)
 # include <sys/inttypes.h>
 #endif
+#if defined(__linux__) && HAVE_SYS_BITYPES_H
+  /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
+     int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
+     included by <sys/types.h>.  */
+# include <sys/bitypes.h>
+#endif
 #if defined(__sun) && HAVE_SYS_INTTYPES_H
 # include <sys/inttypes.h>
   /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
@@ -48,7 +54,7 @@
      UINTPTR_MAX, PTRDIFF_MIN, PTRDIFF_MAX.  */
 # define _STDINT_H_HAVE_SYSTEM_INTTYPES
 #endif
-#if !(defined(UNIX_CYGWIN32) && defined(__BIT_TYPES_DEFINED__))
+#if !((defined(UNIX_CYGWIN32) || defined(__linux__)) && defined(__BIT_TYPES_DEFINED__))
 # define _STDINT_H_NEED_SIGNED_INT_TYPES
 #endif
 

--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-16  Bruno Haible  <bruno@clisp.org>
+
+	* stdint.m4 (gl_STDINT_H): Also test for <sys/bitypes.h>.
+
 2005-12-16  Jim Meyering  <jim@meyering.net>
 
 	* fprintftime.m4: New file.

--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 4
+# stdint.m4 serial 5
 dnl Copyright (C) 2001-2002, 2004-2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -12,6 +12,8 @@
 AC_REQUIRE([gt_HEADER_INTTYPES_H])
 dnl Check for <sys/inttypes.h>.
 AC_CHECK_HEADERS([sys/inttypes.h])
+dnl Check for <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
+AC_CHECK_HEADERS([sys/bitypes.h])
 
 AC_MSG_CHECKING([for stdint.h])
 AC_CACHE_VAL(gl_cv_header_stdint_h, [