X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fvsnprintf.m4;h=ed189c23882b9f4c88adac2073b2441c4d64d6d6;hb=14b6d70139486b63e66257aad1abe2a9615f4d96;hp=9fc38f86feba7a16a707bb02c1bfc2734f0485f3;hpb=42b1663b7d3709215dc638137cd6de091f063647;p=gnulib.git

diff --git a/m4/vsnprintf.m4 b/m4/vsnprintf.m4
index 9fc38f86f..ed189c238 100644
--- a/m4/vsnprintf.m4
+++ b/m4/vsnprintf.m4
@@ -1,5 +1,5 @@
-# vsnprintf.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
+# vsnprintf.m4 serial 5
+dnl Copyright (C) 2002-2004, 2007-2010 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.
@@ -7,8 +7,17 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_VSNPRINTF],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+  gl_cv_func_vsnprintf_usable=no
   AC_CHECK_FUNCS([vsnprintf])
-  if test $ac_cv_func_vsnprintf = no; then
+  if test $ac_cv_func_vsnprintf = yes; then
+    gl_SNPRINTF_SIZE1
+    case "$gl_cv_func_snprintf_size1" in
+      *yes)
+        gl_cv_func_vsnprintf_usable=yes
+        ;;
+    esac
+  fi
+  if test $gl_cv_func_vsnprintf_usable = no; then
     gl_REPLACE_VSNPRINTF
   fi
   AC_CHECK_DECLS_ONCE([vsnprintf])
@@ -19,6 +28,7 @@ AC_DEFUN([gl_FUNC_VSNPRINTF],
 
 AC_DEFUN([gl_REPLACE_VSNPRINTF],
 [
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_LIBOBJ([vsnprintf])
   if test $ac_cv_func_vsnprintf = yes; then
     REPLACE_VSNPRINTF=1