Implement the %F directive if the system doesn't implement it correctly.

[pspp] / m4 / vasprintf-posix.m4

diff --git a/m4/vasprintf-posix.m4 b/m4/vasprintf-posix.m4
index ac024f2d8a0c633b611f35877decd2cfb7ba7c6f..46ffc34f455395ef5acf4226ed3f0af6409ad43f 100644 (file)
--- a/m4/vasprintf-posix.m4
+++ b/m4/vasprintf-posix.m4
@@ -1,4 +1,4 @@
-# vasprintf-posix.m4 serial 1
+# vasprintf-posix.m4 serial 4
 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,22 +9,38 @@ AC_DEFUN([gl_FUNC_VASPRINTF_POSIX],
   AC_REQUIRE([gl_EOVERFLOW])
   AC_REQUIRE([gl_PRINTF_SIZES_C99])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_A])
+  AC_REQUIRE([gl_PRINTF_DIRECTIVE_F])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_N])
   AC_REQUIRE([gl_PRINTF_POSITIONS])
+  gl_cv_func_vasprintf_posix=no
   AC_CHECK_FUNCS([vasprintf])
-  if expr "$gl_cv_func_printf_sizes_c99" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_directive_n" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_positions" : ".*yes" > /dev/null \
-     && test $ac_cv_func_vasprintf = yes; then
-    : # vasprintf exists and is already POSIX compliant.
-  else
-    AC_CHECK_FUNCS([vasnprintf])
-    if ! expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null; then
-      AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], 1,
-        [Define if the vasnprintf implementation needs special code for
-         the 'a' and 'A' directives.])
-    fi
+  case "$gl_cv_func_printf_sizes_c99" in
+    *yes)
+      case "$gl_cv_func_printf_directive_a" in
+        *yes)
+          case "$gl_cv_func_printf_directive_f" in
+            *yes)
+              case "$gl_cv_func_printf_directive_n" in
+                *yes)
+                  case "$gl_cv_func_printf_positions" 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
+      ;;
+  esac
+  if test $gl_cv_func_vasprintf_posix = no; then
+    gl_PREREQ_VASNPRINTF_DIRECTIVE_A
+    gl_PREREQ_VASNPRINTF_DIRECTIVE_F
     gl_REPLACE_VASNPRINTF
     gl_REPLACE_VASPRINTF
   fi