X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fvasnprintf-posix.m4;h=3f0b462f709e77f4c85ad8a5e6e0cee762e21fed;hb=9f1f81e4362dd265a2fa54b30b16ceed123cd4e5;hp=ecc075f8cdddd435ba4f0eed83725bbbb466e6c5;hpb=82485375ccac3e5ff6119147e18c7aef62fbf50a;p=gnulib.git

diff --git a/m4/vasnprintf-posix.m4 b/m4/vasnprintf-posix.m4
index ecc075f8c..3f0b462f7 100644
--- a/m4/vasnprintf-posix.m4
+++ b/m4/vasnprintf-posix.m4
@@ -1,12 +1,11 @@
-# vasnprintf-posix.m4 serial 8
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# vasnprintf-posix.m4 serial 13
+dnl Copyright (C) 2007-2012 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_VASNPRINTF_POSIX],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
@@ -14,9 +13,13 @@ AC_DEFUN([gl_FUNC_VASNPRINTF_POSIX],
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_A])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_F])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_N])
+  AC_REQUIRE([gl_PRINTF_DIRECTIVE_LS])
   AC_REQUIRE([gl_PRINTF_POSITIONS])
   AC_REQUIRE([gl_PRINTF_FLAG_GROUPING])
+  AC_REQUIRE([gl_PRINTF_FLAG_LEFTADJUST])
   AC_REQUIRE([gl_PRINTF_FLAG_ZERO])
+  AC_REQUIRE([gl_PRINTF_PRECISION])
+  AC_REQUIRE([gl_PRINTF_ENOMEM])
   gl_cv_func_vasnprintf_posix=no
   AC_CHECK_FUNCS_ONCE([vasnprintf])
   case "$gl_cv_func_printf_sizes_c99" in
@@ -33,17 +36,33 @@ AC_DEFUN([gl_FUNC_VASNPRINTF_POSIX],
                         *yes)
                           case "$gl_cv_func_printf_directive_n" in
                             *yes)
-                              case "$gl_cv_func_printf_positions" in
+                              case "$gl_cv_func_printf_directive_ls" in
                                 *yes)
-                                  case "$gl_cv_func_printf_flag_grouping" in
+                                  case "$gl_cv_func_printf_positions" in
                                     *yes)
-                                      case "$gl_cv_func_printf_flag_zero" in
+                                      case "$gl_cv_func_printf_flag_grouping" in
                                         *yes)
-                                          if test $ac_cv_func_vasnprintf = yes; then
-                                            # vasnprintf exists and is already
-                                            # POSIX compliant.
-                                            gl_cv_func_vasnprintf_posix=yes
-                                          fi
+                                          case "$gl_cv_func_printf_flag_leftadjust" in
+                                            *yes)
+                                              case "$gl_cv_func_printf_flag_zero" in
+                                                *yes)
+                                                  case "$gl_cv_func_printf_precision" in
+                                                    *yes)
+                                                      case "$gl_cv_func_printf_enomem" in
+                                                        *yes)
+                                                          if test $ac_cv_func_vasnprintf = yes; then
+                                                            # vasnprintf exists and is
+                                                            # already POSIX compliant.
+                                                            gl_cv_func_vasnprintf_posix=yes
+                                                          fi
+                                                          ;;
+                                                      esac
+                                                      ;;
+                                                  esac
+                                                  ;;
+                                              esac
+                                              ;;
+                                          esac
                                           ;;
                                       esac
                                       ;;
@@ -70,8 +89,12 @@ AC_DEFUN([gl_FUNC_VASNPRINTF_POSIX],
     gl_PREREQ_VASNPRINTF_INFINITE_LONG_DOUBLE
     gl_PREREQ_VASNPRINTF_DIRECTIVE_A
     gl_PREREQ_VASNPRINTF_DIRECTIVE_F
+    gl_PREREQ_VASNPRINTF_DIRECTIVE_LS
     gl_PREREQ_VASNPRINTF_FLAG_GROUPING
+    gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST
     gl_PREREQ_VASNPRINTF_FLAG_ZERO
+    gl_PREREQ_VASNPRINTF_PRECISION
+    gl_PREREQ_VASNPRINTF_ENOMEM
     gl_REPLACE_VASNPRINTF
   fi
 ])