X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffprintf-posix.m4;h=ce48a8a3494cd2e13a72a3353dbaec580441f01f;hb=7422b7ede18016dea87d207cbb7535428afba3ec;hp=6213942a9a8dac8361eb5f63f4ed9c2486407447;hpb=dac3bbf96357f7866a1094c228b4e5bea3fcf853;p=gnulib.git

diff --git a/m4/fprintf-posix.m4 b/m4/fprintf-posix.m4
index 6213942a9..ce48a8a34 100644
--- a/m4/fprintf-posix.m4
+++ b/m4/fprintf-posix.m4
@@ -1,5 +1,5 @@
-# fprintf-posix.m4 serial 11
-dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
+# fprintf-posix.m4 serial 14
+dnl Copyright (C) 2007-2014 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_FPRINTF_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,23 +35,27 @@ AC_DEFUN([gl_FUNC_FPRINTF_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)
-                                                      # fprintf exists and is
-                                                      # already POSIX compliant.
-                                                      gl_cv_func_fprintf_posix=yes
+                                                      case "$gl_cv_func_printf_enomem" in
+                                                        *yes)
+                                                          # fprintf exists and is
+                                                          # already POSIX compliant.
+                                                          gl_cv_func_fprintf_posix=yes
+                                                          ;;
+                                                      esac
                                                       ;;
-                                                   esac
+                                                  esac
                                                   ;;
                                               esac
                                               ;;
@@ -81,6 +86,7 @@ AC_DEFUN([gl_FUNC_FPRINTF_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,6 +102,8 @@ AC_DEFUN([gl_REPLACE_FPRINTF],
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_LIBOBJ([fprintf])
   REPLACE_FPRINTF=1
+  AC_DEFINE([REPLACE_FPRINTF_POSIX], [1],
+    [Define if fprintf is overridden by a POSIX compliant gnulib implementation.])
   gl_PREREQ_FPRINTF
 ])