X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fvasprintf-posix.m4;h=ab26ef594369d15eced5067fa478e74f32a82407;hb=e52fa80b73cf84d7e5472aeb43ead4e25dbd5989;hp=6cec101a131165faa9d67bb4525722859428c445;hpb=e9bb23084ab2af1b2792808165335e6daebebfa9;p=gnulib.git

diff --git a/m4/vasprintf-posix.m4 b/m4/vasprintf-posix.m4
index 6cec101a1..ab26ef594 100644
--- a/m4/vasprintf-posix.m4
+++ b/m4/vasprintf-posix.m4
@@ -1,4 +1,4 @@
-# vasprintf-posix.m4 serial 6
+# vasprintf-posix.m4 serial 8
 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,9 @@ AC_DEFUN([gl_FUNC_VASPRINTF_POSIX],
 [
   AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
+  AC_REQUIRE([gl_PRINTF_LONG_DOUBLE])
+  AC_REQUIRE([gl_PRINTF_INFINITE])
+  AC_REQUIRE([gl_PRINTF_INFINITE_LONG_DOUBLE])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_A])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_F])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_N])
@@ -18,23 +21,35 @@ AC_DEFUN([gl_FUNC_VASPRINTF_POSIX],
   AC_CHECK_FUNCS([vasprintf])
   case "$gl_cv_func_printf_sizes_c99" 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_infinite" in
             *yes)
-              case "$gl_cv_func_printf_directive_n" in
+              case "$gl_cv_func_printf_infinite_long_double" in
                 *yes)
-                  case "$gl_cv_func_printf_positions" in
+                  case "$gl_cv_func_printf_directive_a" in
                     *yes)
-                      case "$gl_cv_func_printf_flag_grouping" in
+                      case "$gl_cv_func_printf_directive_f" in
                         *yes)
-                          case "$gl_cv_func_printf_flag_zero" in
+                          case "$gl_cv_func_printf_directive_n" in
                             *yes)
-                              if test $ac_cv_func_vasprintf = yes; then
-                                # vasprintf exists and is already POSIX
-                                # compliant.
-                                gl_cv_func_vasprintf_posix=yes
-                              fi
+                              case "$gl_cv_func_printf_positions" in
+                                *yes)
+                                  case "$gl_cv_func_printf_flag_grouping" in
+                                    *yes)
+                                      case "$gl_cv_func_printf_flag_zero" in
+                                        *yes)
+                                          if test $ac_cv_func_vasprintf = yes; then
+                                            # vasprintf exists and is already
+                                            # POSIX compliant.
+                                            gl_cv_func_vasprintf_posix=yes
+                                          fi
+                                          ;;
+                                      esac
+                                      ;;
+                                  esac
+                                  ;;
+                              esac
                               ;;
                           esac
                           ;;
@@ -50,6 +65,9 @@ AC_DEFUN([gl_FUNC_VASPRINTF_POSIX],
       ;;
   esac
   if test $gl_cv_func_vasprintf_posix = no; then
+    gl_PREREQ_VASNPRINTF_LONG_DOUBLE
+    gl_PREREQ_VASNPRINTF_INFINITE_DOUBLE
+    gl_PREREQ_VASNPRINTF_INFINITE_LONG_DOUBLE
     gl_PREREQ_VASNPRINTF_DIRECTIVE_A
     gl_PREREQ_VASNPRINTF_DIRECTIVE_F
     gl_PREREQ_VASNPRINTF_FLAG_GROUPING