X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fvasprintf.m4;h=c76c99c3b14cd93e874da0024d1b5a32440ac712;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=0f4c12374f05ec4f8cb432ed5291327738d20dec;hpb=c68c756f05b4d51ffa5a12b391ff996990deee14;p=gnulib.git

diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4
index 0f4c12374..c76c99c3b 100644
--- a/m4/vasprintf.m4
+++ b/m4/vasprintf.m4
@@ -1,5 +1,6 @@
-# vasprintf.m4 serial 3
-dnl Copyright (C) 2002-2003, 2006-2007 Free Software Foundation, Inc.
+# vasprintf.m4 serial 6
+dnl Copyright (C) 2002-2003, 2006-2007, 2009-2014 Free Software Foundation,
+dnl 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.
@@ -16,20 +17,22 @@ AC_DEFUN([gl_REPLACE_VASPRINTF],
 [
   AC_LIBOBJ([vasprintf])
   AC_LIBOBJ([asprintf])
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   if test $ac_cv_func_vasprintf = yes; then
-    AC_DEFINE([REPLACE_VASPRINTF], 1,
-      [Define if vasprintf exists but is overridden by gnulib.])
+    REPLACE_VASPRINTF=1
+  else
+    HAVE_VASPRINTF=0
   fi
   gl_PREREQ_VASPRINTF_H
   gl_PREREQ_VASPRINTF
   gl_PREREQ_ASPRINTF
 ])
 
-# Prerequisites of lib/vasprintf.h.
+# Prerequisites of the vasprintf portion of lib/stdio.h.
 AC_DEFUN([gl_PREREQ_VASPRINTF_H],
 [
   dnl Persuade glibc <stdio.h> to declare asprintf() and vasprintf().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 ])
 
 # Prerequisites of lib/vasprintf.c.