X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fvfprintf-posix.m4;h=5ec93d10527caf98bc3bb9ee471af3bb6dd44f5c;hb=9723bfe9bb9af8309314ad6230f7661000ba03b1;hp=9a815128ddad072329f89b3776ff9ee941a46a41;hpb=9ff044ec4deb16682a04fb608b2576f205da48e3;p=gnulib.git

diff --git a/m4/vfprintf-posix.m4 b/m4/vfprintf-posix.m4
index 9a815128d..5ec93d105 100644
--- a/m4/vfprintf-posix.m4
+++ b/m4/vfprintf-posix.m4
@@ -1,5 +1,5 @@
-# vfprintf-posix.m4 serial 12
-dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
+# vfprintf-posix.m4 serial 14
+dnl Copyright (C) 2007-2011 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_VFPRINTF_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])
@@ -34,21 +35,25 @@ AC_DEFUN([gl_FUNC_VFPRINTF_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)
-                                                      # vfprintf exists and is
-                                                      # already POSIX compliant.
-                                                      gl_cv_func_vfprintf_posix=yes
+                                                      case "$gl_cv_func_printf_enomem" in
+                                                        *yes)
+                                                          # vfprintf exists and is
+                                                          # already POSIX compliant.
+                                                          gl_cv_func_vfprintf_posix=yes
+                                                          ;;
+                                                      esac
                                                       ;;
                                                   esac
                                                   ;;
@@ -81,6 +86,7 @@ AC_DEFUN([gl_FUNC_VFPRINTF_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
@@ -96,7 +102,7 @@ AC_DEFUN([gl_REPLACE_VFPRINTF],
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_LIBOBJ([vfprintf])
   REPLACE_VFPRINTF=1
-  AC_DEFINE([REPLACE_VFPRINTF_POSIX], 1,
+  AC_DEFINE([REPLACE_VFPRINTF_POSIX], [1],
     [Define if vfprintf is overridden by a POSIX compliant gnulib implementation.])
   gl_PREREQ_VFPRINTF
 ])