X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fvsnprintf-posix.m4;h=c8e1d7241cfd77cc248c492db6301485536ef564;hb=533101a268dc5015a140ff4695d8eeb04fbe57b6;hp=17b8d433e1272827b57c8d8a3fb5d56a1525ce43;hpb=5fc2139cf34af9a059c76496c5b02eaf1ec3e3e8;p=gnulib.git

diff --git a/m4/vsnprintf-posix.m4 b/m4/vsnprintf-posix.m4
index 17b8d433e..c8e1d7241 100644
--- a/m4/vsnprintf-posix.m4
+++ b/m4/vsnprintf-posix.m4
@@ -1,5 +1,5 @@
-# vsnprintf-posix.m4 serial 13
-dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
+# vsnprintf-posix.m4 serial 15
+dnl Copyright (C) 2007-2013 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.
@@ -13,6 +13,7 @@ AC_DEFUN([gl_FUNC_VSNPRINTF_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])
@@ -22,7 +23,7 @@ AC_DEFUN([gl_FUNC_VSNPRINTF_POSIX],
   gl_cv_func_vsnprintf_posix=no
   AC_CHECK_FUNCS([vsnprintf])
   if test $ac_cv_func_vsnprintf = yes; then
-    dnl Assume that if vsnprintf() exists, snprintf() also exists.
+    dnl These tests use vsnprintf() if snprintf() does not exist.
     gl_SNPRINTF_TRUNCATION_C99
     gl_SNPRINTF_RETVAL_C99
     gl_SNPRINTF_DIRECTIVE_N
@@ -42,31 +43,35 @@ AC_DEFUN([gl_FUNC_VSNPRINTF_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_leftadjust" in
+                                        case "$gl_cv_func_printf_flag_grouping" in
                                           *yes)
-                                            case "$gl_cv_func_printf_flag_zero" in
+                                            case "$gl_cv_func_printf_flag_leftadjust" in
                                               *yes)
-                                                case "$gl_cv_func_printf_precision" in
+                                                case "$gl_cv_func_printf_flag_zero" in
                                                   *yes)
-                                                    case "$gl_cv_func_printf_enomem" in
+                                                    case "$gl_cv_func_printf_precision" in
                                                       *yes)
-                                                        case "$gl_cv_func_snprintf_truncation_c99" in
+                                                        case "$gl_cv_func_printf_enomem" in
                                                           *yes)
-                                                            case "$gl_cv_func_snprintf_retval_c99" in
+                                                            case "$gl_cv_func_snprintf_truncation_c99" in
                                                               *yes)
-                                                                case "$gl_cv_func_snprintf_directive_n" in
+                                                                case "$gl_cv_func_snprintf_retval_c99" in
                                                                   *yes)
-                                                                    case "$gl_cv_func_snprintf_size1" in
+                                                                    case "$gl_cv_func_snprintf_directive_n" in
                                                                       *yes)
-                                                                        case "$gl_cv_func_vsnprintf_zerosize_c99" in
+                                                                        case "$gl_cv_func_snprintf_size1" in
                                                                           *yes)
-                                                                            # vsnprintf exists and is
-                                                                            # already POSIX compliant.
-                                                                            gl_cv_func_vsnprintf_posix=yes
+                                                                            case "$gl_cv_func_vsnprintf_zerosize_c99" in
+                                                                              *yes)
+                                                                                # vsnprintf exists and is
+                                                                                # already POSIX compliant.
+                                                                                gl_cv_func_vsnprintf_posix=yes
+                                                                                ;;
+                                                                            esac
                                                                             ;;
                                                                         esac
                                                                         ;;
@@ -110,6 +115,7 @@ AC_DEFUN([gl_FUNC_VSNPRINTF_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