Update.

4 files changed, 17 insertions, 6 deletions

diff --git a/gl/m4/lib-link.m4 b/gl/m4/lib-link.m4
index b422218dc2..aae42acfb2 100644
--- a/gl/m4/lib-link.m4
+++ b/gl/m4/lib-link.m4
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 10 (gettext-0.16.1)
+# lib-link.m4 serial 10 (gettext-0.16.2)
 dnl Copyright (C) 2001-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,
diff --git a/gl/strdup.h b/gl/strdup.h
index a0d5fb929c..73e66e3d7a 100644
--- a/gl/strdup.h
+++ b/gl/strdup.h
@@ -1,5 +1,5 @@
 /* strdup.h -- duplicate a string
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,9 +21,19 @@
 /* Get strdup declaration, if available.  */
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #if defined HAVE_DECL_STRDUP && !HAVE_DECL_STRDUP && !defined strdup
 /* Duplicate S, returning an identical malloc'd string.  */
 extern char *strdup (const char *s);
 #endif
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* STRDUP_H_ */
diff --git a/lgl/m4/lib-link.m4 b/lgl/m4/lib-link.m4
index b422218dc2..aae42acfb2 100644
--- a/lgl/m4/lib-link.m4
+++ b/lgl/m4/lib-link.m4
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 10 (gettext-0.16.1)
+# lib-link.m4 serial 10 (gettext-0.16.2)
 dnl Copyright (C) 2001-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,
diff --git a/lgl/m4/stdint.m4 b/lgl/m4/stdint.m4
index 6fa651845b..92cb832b1b 100644
--- a/lgl/m4/stdint.m4
+++ b/lgl/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])