Move HAVE__GL_CLOSE_FD_MAYBE_SOCKET macro.

[pspp] / m4 / vfprintf-posix.m4

diff --git a/m4/vfprintf-posix.m4 b/m4/vfprintf-posix.m4
index aefa6fdf3e303da605bdcf963edd4b72fbab2587..9a815128ddad072329f89b3776ff9ee941a46a41 100644 (file)
--- a/m4/vfprintf-posix.m4
+++ b/m4/vfprintf-posix.m4
@@ -1,12 +1,11 @@
-# vfprintf-posix.m4 serial 7
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# vfprintf-posix.m4 serial 12
+dnl Copyright (C) 2007-2008 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_VFPRINTF_POSIX],
 [
-  AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_INFINITE])
@@ -16,7 +15,10 @@ AC_DEFUN([gl_FUNC_VFPRINTF_POSIX],
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_N])
   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_vfprintf_posix=no
   case "$gl_cv_func_printf_sizes_c99" in
     *yes)
@@ -36,11 +38,23 @@ AC_DEFUN([gl_FUNC_VFPRINTF_POSIX],
                                 *yes)
                                   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)
-                                          # vfprintf exists and is already
-                                          # POSIX compliant.
-                                          gl_cv_func_vfprintf_posix=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)
+                                                      # vfprintf exists and is
+                                                      # already POSIX compliant.
+                                                      gl_cv_func_vfprintf_posix=yes
+                                                      ;;
+                                                  esac
+                                                  ;;
+                                              esac
+                                              ;;
+                                          esac
                                           ;;
                                       esac
                                       ;;
@@ -68,7 +82,10 @@ AC_DEFUN([gl_FUNC_VFPRINTF_POSIX],
     gl_PREREQ_VASNPRINTF_DIRECTIVE_A
     gl_PREREQ_VASNPRINTF_DIRECTIVE_F
     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
     gl_REPLACE_VFPRINTF
   fi
@@ -79,6 +96,8 @@ AC_DEFUN([gl_REPLACE_VFPRINTF],
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_LIBOBJ([vfprintf])
   REPLACE_VFPRINTF=1
+  AC_DEFINE([REPLACE_VFPRINTF_POSIX], 1,
+    [Define if vfprintf is overridden by a POSIX compliant gnulib implementation.])
   gl_PREREQ_VFPRINTF
 ])