From: Bruno Haible <bruno@clisp.org>
Date: Mon, 14 May 2007 00:39:57 +0000 (+0000)
Subject: Update from gnulib.
X-Git-Tag: v0.17~402
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad7ca9cb230a54950d9cc5c0bdd8d6d91d6aa742;p=thirdparty%2Fgettext.git

Update from gnulib.
---

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index dcb047b65..b9041c065 100644
--- 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 687581a19..80ad721b1 100644
--- 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])
 ])