X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=m4%2Fvfprintf-posix.m4;h=bf936f14e065a32307e8953f8dae02f4232280a5;hb=118b9d3f012ecb34be9e3a68a25996f30b7868ab;hp=fc8b624052fad67abb3f83d9d4b0cd532b02ad46;hpb=cf8538614458dcf303ea9bb2f03aacdb5ebe34ca;p=pspp

diff --git a/m4/vfprintf-posix.m4 b/m4/vfprintf-posix.m4
index fc8b624052..bf936f14e0 100644
--- a/m4/vfprintf-posix.m4
+++ b/m4/vfprintf-posix.m4
@@ -1,4 +1,4 @@
-# vfprintf-posix.m4 serial 6
+# vfprintf-posix.m4 serial 7
 dnl Copyright (C) 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,6 +8,7 @@ AC_DEFUN([gl_FUNC_VFPRINTF_POSIX],
 [
   AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
+  AC_REQUIRE([gl_PRINTF_INFINITE])
   AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_A])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_F])
@@ -18,23 +19,27 @@ AC_DEFUN([gl_FUNC_VFPRINTF_POSIX],
   gl_cv_func_vfprintf_posix=no
   case "$gl_cv_func_printf_sizes_c99" in
     *yes)
-      case "$gl_cv_func_printf_long_double" in
+      case "$gl_cv_func_printf_infinite" in
         *yes)
-          case "$gl_cv_func_printf_directive_a" in
+          case "$gl_cv_func_printf_long_double" in
             *yes)
-              case "$gl_cv_func_printf_directive_f" in
+              case "$gl_cv_func_printf_directive_a" in
                 *yes)
-                  case "$gl_cv_func_printf_directive_n" in
+                  case "$gl_cv_func_printf_directive_f" in
                     *yes)
-                      case "$gl_cv_func_printf_positions" in
+                      case "$gl_cv_func_printf_directive_n" in
                         *yes)
-                          case "$gl_cv_func_printf_flag_grouping" in
+                          case "$gl_cv_func_printf_positions" in
                             *yes)
-                              case "$gl_cv_func_printf_flag_zero" in
+                              case "$gl_cv_func_printf_flag_grouping" in
                                 *yes)
-                                  # vfprintf exists and is already POSIX
-                                  # compliant.
-                                  gl_cv_func_vfprintf_posix=yes
+                                  case "$gl_cv_func_printf_flag_zero" in
+                                    *yes)
+                                      # vfprintf exists and is already POSIX
+                                      # compliant.
+                                      gl_cv_func_vfprintf_posix=yes
+                                      ;;
+                                  esac
                                   ;;
                               esac
                               ;;
@@ -52,6 +57,7 @@ AC_DEFUN([gl_FUNC_VFPRINTF_POSIX],
       ;;
   esac
   if test $gl_cv_func_vfprintf_posix = no; then
+    gl_PREREQ_VASNPRINTF_INFINITE
     gl_PREREQ_VASNPRINTF_LONG_DOUBLE
     gl_PREREQ_VASNPRINTF_DIRECTIVE_A
     gl_PREREQ_VASNPRINTF_DIRECTIVE_F