Ensure AC_TYPE_LONG_LONG_INT and AC_TYPE_UNSIGNED_LONG_LONG_INT are consistent.

[gnulib.git] / m4 / vasnprintf-posix.m4

diff --git a/m4/vasnprintf-posix.m4 b/m4/vasnprintf-posix.m4
index 0a9e4a8..ecc075f 100644 (file)
--- a/m4/vasnprintf-posix.m4
+++ b/m4/vasnprintf-posix.m4
@@ -1,4 +1,4 @@
-# vasnprintf-posix.m4 serial 7
+# vasnprintf-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,
@@ -9,6 +9,8 @@ AC_DEFUN([gl_FUNC_VASNPRINTF_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])
@@ -21,23 +23,31 @@ AC_DEFUN([gl_FUNC_VASNPRINTF_POSIX],
     *yes)
       case "$gl_cv_func_printf_long_double" in
         *yes)
-          case "$gl_cv_func_printf_directive_a" in
+          case "$gl_cv_func_printf_infinite" in
             *yes)
-              case "$gl_cv_func_printf_directive_f" in
+              case "$gl_cv_func_printf_infinite_long_double" in
                 *yes)
-                  case "$gl_cv_func_printf_directive_n" in
+                  case "$gl_cv_func_printf_directive_a" in
                     *yes)
-                      case "$gl_cv_func_printf_positions" in
+                      case "$gl_cv_func_printf_directive_f" in
                         *yes)
-                          case "$gl_cv_func_printf_flag_grouping" in
+                          case "$gl_cv_func_printf_directive_n" in
                             *yes)
-                              case "$gl_cv_func_printf_flag_zero" in
+                              case "$gl_cv_func_printf_positions" in
                                 *yes)
-                                  if test $ac_cv_func_vasnprintf = yes; then
-                                    # vasnprintf exists and is already POSIX
-                                    # compliant.
-                                    gl_cv_func_vasnprintf_posix=yes
-                                  fi
+                                  case "$gl_cv_func_printf_flag_grouping" in
+                                    *yes)
+                                      case "$gl_cv_func_printf_flag_zero" in
+                                        *yes)
+                                          if test $ac_cv_func_vasnprintf = yes; then
+                                            # vasnprintf exists and is already
+                                            # POSIX compliant.
+                                            gl_cv_func_vasnprintf_posix=yes
+                                          fi
+                                          ;;
+                                      esac
+                                      ;;
+                                  esac
                                   ;;
                               esac
                               ;;
@@ -56,6 +66,8 @@ AC_DEFUN([gl_FUNC_VASNPRINTF_POSIX],
   esac
   if test $gl_cv_func_vasnprintf_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