Index: m4/lock.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/lock.m4,v
retrieving revision 1.6
diff -u -r1.6 lock.m4
--- m4/lock.m4	23 Aug 2006 12:11:02 -0000	1.6
+++ m4/lock.m4	22 Sep 2006 04:13:20 -0000
@@ -1,4 +1,4 @@
-# lock.m4 serial 4 (gettext-0.15.1)
+# lock.m4 serial 5 (gettext-0.15.1)
 dnl Copyright (C) 2005-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,
@@ -147,6 +147,7 @@
 error "No, in FreeBSD 4.0 recursive mutexes actually don't work."
 #else
 int x = (int)PTHREAD_MUTEX_RECURSIVE;
+if (x == 0) return 0;
 #endif],
             [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1,
                [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])])
Index: m4/mbswidth.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/mbswidth.m4,v
retrieving revision 1.15
diff -u -r1.15 mbswidth.m4
--- m4/mbswidth.m4	28 Jun 2006 13:10:13 -0000	1.15
+++ m4/mbswidth.m4	22 Sep 2006 04:13:39 -0000
@@ -1,4 +1,4 @@
-# mbswidth.m4 serial 12
+# mbswidth.m4 serial 13
 dnl Copyright (C) 2000-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,
@@ -24,6 +24,7 @@
 #endif
 ], [
   char *p = (char *) mbswidth;
+  if (p) return 0;
 ], ac_cv_have_decl_mbswidth=yes, ac_cv_have_decl_mbswidth=no)])
   if test $ac_cv_have_decl_mbswidth = yes; then
     ac_val=1
Index: m4/signed.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/signed.m4,v
retrieving revision 1.4
diff -u -r1.4 signed.m4
--- m4/signed.m4	18 Jan 2005 13:07:56 -0000	1.4
+++ m4/signed.m4	22 Sep 2006 03:13:43 -0000
@@ -1,5 +1,5 @@
-# signed.m4 serial 1 (gettext-0.10.40)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# signed.m4 serial 2 (gettext-0.10.40)
+dnl Copyright (C) 2001-2002, 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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -9,7 +9,8 @@
 AC_DEFUN([bh_C_SIGNED],
 [
   AC_CACHE_CHECK([for signed], bh_cv_c_signed,
-   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
+   [AC_TRY_COMPILE(, [signed char x = 1;
+		      if (x) return 0;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
   if test $bh_cv_c_signed = no; then
     AC_DEFINE(signed, ,
               [Define to empty if the C compiler doesn't support this keyword.])
Index: m4/stpncpy.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/stpncpy.m4,v
retrieving revision 1.6
diff -u -r1.6 stpncpy.m4
--- m4/stpncpy.m4	2 Mar 2005 17:19:45 -0000	1.6
+++ m4/stpncpy.m4	22 Sep 2006 03:13:43 -0000
@@ -1,5 +1,5 @@
-# stpncpy.m4 serial 3
-dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
+# stpncpy.m4 serial 4
+dnl Copyright (C) 2002-2003, 2005, 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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -22,6 +22,7 @@
   AC_CACHE_CHECK([for working stpncpy], gl_cv_func_stpncpy, [
     AC_TRY_RUN([
 #include <stdlib.h>
+#include <string.h>
 extern char *stpncpy (char *dest, const char *src, size_t n);
 int main () {
   const char *src = "Hello";
Index: m4/vasprintf.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/vasprintf.m4,v
retrieving revision 1.2
diff -u -r1.2 vasprintf.m4
--- m4/vasprintf.m4	18 Jan 2005 13:07:56 -0000	1.2
+++ m4/vasprintf.m4	22 Sep 2006 03:13:43 -0000
@@ -1,11 +1,14 @@
-# vasprintf.m4 serial 1
-dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+# vasprintf.m4 serial 2
+dnl Copyright (C) 2002-2003, 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,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_VASPRINTF],
 [
+  dnl convince stdlib.h to declare vasprintf
+  AC_REQUIRE([AC_GNU_SOURCE])
+
   AC_REPLACE_FUNCS(vasprintf)
   if test $ac_cv_func_vasprintf = no; then
     AC_LIBOBJ(asprintf)