X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fobstack-printf-posix.m4;h=c9b24e38e8bd131cad6dd4473013c74ddf77aa23;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=8768e674672d6b9b083ee44a5a7be95114ee7950;hpb=da4932e211e64f050a2465ad5c237890b8bdbfe4;p=gnulib.git

diff --git a/m4/obstack-printf-posix.m4 b/m4/obstack-printf-posix.m4
index 8768e6746..c9b24e38e 100644
--- a/m4/obstack-printf-posix.m4
+++ b/m4/obstack-printf-posix.m4
@@ -1,5 +1,5 @@
-# obstack-printf-posix.m4 serial 2
-dnl Copyright (C) 2008 Free Software Foundation, Inc.
+# obstack-printf-posix.m4 serial 4
+dnl Copyright (C) 2008-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.
@@ -16,6 +16,7 @@ AC_DEFUN([gl_FUNC_OBSTACK_PRINTF_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])
@@ -39,21 +40,25 @@ AC_DEFUN([gl_FUNC_OBSTACK_PRINTF_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)
-                                                        # obstack_printf exists and is
-                                                        # already POSIX compliant.
-                                                        gl_cv_func_obstack_printf_posix=yes
+                                                        case "$gl_cv_func_printf_enomem" in
+                                                          *yes)
+                                                            # obstack_printf exists and is
+                                                            # already POSIX compliant.
+                                                            gl_cv_func_obstack_printf_posix=yes
+                                                            ;;
+                                                        esac
                                                         ;;
                                                     esac
                                                     ;;
@@ -87,6 +92,7 @@ AC_DEFUN([gl_FUNC_OBSTACK_PRINTF_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
@@ -95,4 +101,5 @@ AC_DEFUN([gl_FUNC_OBSTACK_PRINTF_POSIX],
     gl_REPLACE_VASNPRINTF
     gl_REPLACE_OBSTACK_PRINTF
   fi
+  gl_DECL_OBSTACK_PRINTF
 ])