Update from gnulib.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index dcb047b6589987a191d4aaba978e6af36d527ed7..b9041c06566a1a334505668d7b8bf14401fbe998 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-13  Bruno Haible  <bruno@clisp.org>
+
+       * m4/vasprintf.m4 (gl_REPLACE_VASPRINTF, gl_PREREQ_VASPRINTF_H): New
+       macros, partially copied from gnulib.
+       (gl_FUNC_VASPRINTF): Copied from gnulib.
+
 2007-05-13  Bruno Haible  <bruno@clisp.org>
 
        * lib/vasprintf.c: Include stdio.h instead of vasprintf.h.

diff --git a/gnulib-local/m4/vasprintf.m4 b/gnulib-local/m4/vasprintf.m4
index 687581a197fce188a9bbba5668f877b57d3ef2d0..80ad721b18691a87d5b025eee7f746d68d2ba672 100644 (file)
--- a/gnulib-local/m4/vasprintf.m4
+++ b/gnulib-local/m4/vasprintf.m4
@@ -1,11 +1,32 @@
-# vasprintf.m4 serial 1
-dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
+# vasprintf.m4 serial 2
+dnl Copyright (C) 2002-2003, 2006-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,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_VASPRINTF],
 [
-  AC_REPLACE_FUNCS(vasprintf)
-  dnl No prerequisites of lib/vasprintf.c.
+  AC_CHECK_FUNCS([vasprintf])
+  if test $ac_cv_func_vasprintf = no; then
+    gl_REPLACE_VASPRINTF
+  fi
+])
+
+AC_DEFUN([gl_REPLACE_VASPRINTF],
+[
+  AC_LIBOBJ([vasprintf])
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+  if test $ac_cv_func_vasprintf = yes; then
+    REPLACE_VASPRINTF=1
+  else
+    HAVE_VASPRINTF=0
+  fi
+  gl_PREREQ_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])
 ])