See http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00158.html
for why this is needed. Without it, if two different modules
call gl_REPLACE_*, one from the libs directory and one from the
tests directory, then the tests directory is broken because it tries
to look for the AC_LIBOBJ file that is not present.
* m4/calloc.m4 (gl_REPLACE_CALLOC): Redefine on first use so that
LIBOBJ replacement only happens in one location.
* m4/close.m4 (gl_REPLACE_CLOSE): Likewise.
* m4/dprintf.m4 (gl_REPLACE_DPRINTF): Likewise.
* m4/dup2.m4 (gl_REPLACE_DUP2): Likewise.
* m4/fclose.m4 (gl_REPLACE_FCLOSE): Likewise.
* m4/fcntl.m4 (gl_REPLACE_FCNTL): Likewise.
* m4/fflush.m4 (gl_REPLACE_FFLUSH): Likewise.
* m4/fprintf-posix.m4 (gl_REPLACE_FPRINTF): Likewise.
* m4/fseek.m4 (gl_REPLACE_FSEEK): Likewise.
* m4/fseeko.m4 (gl_REPLACE_FSEEKO): Likewise.
* m4/ftello.m4 (gl_REPLACE_FTELLO): Likewise.
* m4/getopt.m4 (gl_REPLACE_GETOPT): Likewise.
* m4/iconv_open.m4 (gl_REPLACE_ICONV_OPEN): Likewise.
* m4/lseek.m4 (gl_REPLACE_LSEEK): Likewise.
* m4/malloc.m4 (gl_REPLACE_MALLOC): Likewise.
* m4/obstack-printf.m4 (gl_REPLACE_OBSTACK_PRINTF): Likewise.
* m4/open.m4 (gl_REPLACE_OPEN): Likewise.
* m4/printf-posix-rpl.m4 (gl_REPLACE_PRINTF): Likewise.
* m4/realloc.m4 (gl_REPLACE_REALLOC): Likewise.
* m4/snprintf.m4 (gl_REPLACE_SNPRINTF): Likewise.
* m4/sprintf-posix.m4 (gl_REPLACE_SPRINTF): Likewise.
* m4/vasnprintf.m4 (gl_REPLACE_VASNPRINTF): Likewise.
* m4/vasprintf.m4 (gl_REPLACE_VASPRINTF): Likewise.
* m4/vdprintf.m4 (gl_REPLACE_VDPRINTF): Likewise.
* m4/vfprintf-posix.m4 (gl_REPLACE_VFPRINTF): Likewise.
* m4/vprintf-posix.m4 (gl_REPLACE_VPRINTF): Likewise.
* m4/vsnprintf.m4 (gl_REPLACE_VSNPRINTF): Likewise.
* m4/vsprintf-posix.m4 (gl_REPLACE_VSPRINTF): Likewise.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
ChangeLog | 31 +++++++++++++++++++++++++++++++
m4/calloc.m4 | 5 ++++-
m4/close.m4 | 5 ++++-
m4/dprintf.m4 | 5 ++++-
m4/dup2.m4 | 5 ++++-
m4/fclose.m4 | 5 ++++-
m4/fcntl.m4 | 5 ++++-
m4/fflush.m4 | 5 ++++-
m4/fprintf-posix.m4 | 5 ++++-
m4/fseek.m4 | 5 ++++-
m4/fseeko.m4 | 5 ++++-
m4/ftello.m4 | 5 ++++-
m4/getopt.m4 | 5 ++++-
m4/iconv_open.m4 | 5 ++++-
m4/lseek.m4 | 5 ++++-
m4/malloc.m4 | 5 ++++-
m4/obstack-printf.m4 | 5 ++++-
m4/open.m4 | 5 ++++-
m4/printf-posix-rpl.m4 | 5 ++++-
m4/realloc.m4 | 5 ++++-
m4/snprintf.m4 | 5 ++++-
m4/sprintf-posix.m4 | 5 ++++-
m4/vasnprintf.m4 | 5 ++++-
m4/vasprintf.m4 | 5 ++++-
m4/vdprintf.m4 | 5 ++++-
m4/vfprintf-posix.m4 | 5 ++++-
m4/vprintf-posix.m4 | 5 ++++-
m4/vsnprintf.m4 | 5 ++++-
m4/vsprintf-posix.m4 | 5 ++++-
29 files changed, 143 insertions(+), 28 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 197b073..1501282 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,36 @@
2011-05-04 Eric Blake <ebl...@redhat.com>
+ maint: make most gl_REPLACE macros one-shot
+ * m4/calloc.m4 (gl_REPLACE_CALLOC): Redefine on first use so that
+ LIBOBJ replacement only happens in one location.
+ * m4/close.m4 (gl_REPLACE_CLOSE): Likewise.
+ * m4/dprintf.m4 (gl_REPLACE_DPRINTF): Likewise.
+ * m4/dup2.m4 (gl_REPLACE_DUP2): Likewise.
+ * m4/fclose.m4 (gl_REPLACE_FCLOSE): Likewise.
+ * m4/fcntl.m4 (gl_REPLACE_FCNTL): Likewise.
+ * m4/fflush.m4 (gl_REPLACE_FFLUSH): Likewise.
+ * m4/fprintf-posix.m4 (gl_REPLACE_FPRINTF): Likewise.
+ * m4/fseek.m4 (gl_REPLACE_FSEEK): Likewise.
+ * m4/fseeko.m4 (gl_REPLACE_FSEEKO): Likewise.
+ * m4/ftello.m4 (gl_REPLACE_FTELLO): Likewise.
+ * m4/getopt.m4 (gl_REPLACE_GETOPT): Likewise.
+ * m4/iconv_open.m4 (gl_REPLACE_ICONV_OPEN): Likewise.
+ * m4/lseek.m4 (gl_REPLACE_LSEEK): Likewise.
+ * m4/malloc.m4 (gl_REPLACE_MALLOC): Likewise.
+ * m4/obstack-printf.m4 (gl_REPLACE_OBSTACK_PRINTF): Likewise.
+ * m4/open.m4 (gl_REPLACE_OPEN): Likewise.
+ * m4/printf-posix-rpl.m4 (gl_REPLACE_PRINTF): Likewise.
+ * m4/realloc.m4 (gl_REPLACE_REALLOC): Likewise.
+ * m4/snprintf.m4 (gl_REPLACE_SNPRINTF): Likewise.
+ * m4/sprintf-posix.m4 (gl_REPLACE_SPRINTF): Likewise.
+ * m4/vasnprintf.m4 (gl_REPLACE_VASNPRINTF): Likewise.
+ * m4/vasprintf.m4 (gl_REPLACE_VASPRINTF): Likewise.
+ * m4/vdprintf.m4 (gl_REPLACE_VDPRINTF): Likewise.
+ * m4/vfprintf-posix.m4 (gl_REPLACE_VFPRINTF): Likewise.
+ * m4/vprintf-posix.m4 (gl_REPLACE_VPRINTF): Likewise.
+ * m4/vsnprintf.m4 (gl_REPLACE_VSNPRINTF): Likewise.
+ * m4/vsprintf-posix.m4 (gl_REPLACE_VSPRINTF): Likewise.
+
maint: remove useless REPLACE_*_H macros
* m4/arpa_inet_h.m4 (gl_REPLACE_ARPA_INET_H): Delete.
* m4/dirent_h.m4 (gl_REPLACE_DIRENT_H): Likewise.
diff --git a/m4/calloc.m4 b/m4/calloc.m4
index 8f462b3..ed291b7 100644
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -1,4 +1,4 @@
-# calloc.m4 serial 12
+# calloc.m4 serial 13
# Copyright (C) 2004-2011 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -74,4 +74,7 @@ AC_DEFUN([gl_REPLACE_CALLOC],
[
AC_LIBOBJ([calloc])
REPLACE_CALLOC=1
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
diff --git a/m4/close.m4 b/m4/close.m4
index fc13138..2cab116 100644
--- a/m4/close.m4
+++ b/m4/close.m4
@@ -1,4 +1,4 @@
-# close.m4 serial 5
+# close.m4 serial 6
dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -23,4 +23,7 @@ AC_DEFUN([gl_REPLACE_CLOSE],
REPLACE_CLOSE=1
AC_LIBOBJ([close])
gl_REPLACE_FCLOSE
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
diff --git a/m4/dprintf.m4 b/m4/dprintf.m4
index 5b89c31..763039c 100644
--- a/m4/dprintf.m4
+++ b/m4/dprintf.m4
@@ -1,4 +1,4 @@
-# dprintf.m4 serial 1
+# dprintf.m4 serial 2
dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -22,6 +22,9 @@ AC_DEFUN([gl_REPLACE_DPRINTF],
REPLACE_DPRINTF=1
fi
gl_PREREQ_DPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
# Prerequisites of lib/dprintf.c.
diff --git a/m4/dup2.m4 b/m4/dup2.m4
index 62e31a8..e72f10f 100644
--- a/m4/dup2.m4
+++ b/m4/dup2.m4
@@ -1,4 +1,4 @@
-#serial 12
+#serial 13
dnl Copyright (C) 2002, 2005, 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -74,4 +74,7 @@ AC_DEFUN([gl_REPLACE_DUP2],
REPLACE_DUP2=1
fi
AC_LIBOBJ([dup2])
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
diff --git a/m4/fclose.m4 b/m4/fclose.m4
index 278859c..cdffda8 100644
--- a/m4/fclose.m4
+++ b/m4/fclose.m4
@@ -1,4 +1,4 @@
-# fclose.m4 serial 2
+# fclose.m4 serial 3
dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -13,4 +13,7 @@ AC_DEFUN([gl_REPLACE_FCLOSE],
AC_REQUIRE([gl_STDIO_H_DEFAULTS])
REPLACE_FCLOSE=1
AC_LIBOBJ([fclose])
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
diff --git a/m4/fcntl.m4 b/m4/fcntl.m4
index a93ed85..1810c1d 100644
--- a/m4/fcntl.m4
+++ b/m4/fcntl.m4
@@ -1,4 +1,4 @@
-# fcntl.m4 serial 4
+# fcntl.m4 serial 5
dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -85,4 +85,7 @@ AC_DEFUN([gl_REPLACE_FCNTL],
REPLACE_FCNTL=1
fi
AC_LIBOBJ([fcntl])
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
diff --git a/m4/fflush.m4 b/m4/fflush.m4
index 08b9f17..0c0bbd9 100644
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -1,4 +1,4 @@
-# fflush.m4 serial 9
+# fflush.m4 serial 10
# Copyright (C) 2007-2011 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -72,6 +72,9 @@ AC_DEFUN([gl_REPLACE_FFLUSH],
REPLACE_FFLUSH=1
gl_PREREQ_FFLUSH
gl_REPLACE_FSEEKO
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
# Prerequisites of lib/fflush.c.
diff --git a/m4/fprintf-posix.m4 b/m4/fprintf-posix.m4
index 552ad25..fc92b48 100644
--- a/m4/fprintf-posix.m4
+++ b/m4/fprintf-posix.m4
@@ -1,4 +1,4 @@
-# fprintf-posix.m4 serial 14
+# fprintf-posix.m4 serial 15
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -105,6 +105,9 @@ AC_DEFUN([gl_REPLACE_FPRINTF],
AC_DEFINE([REPLACE_FPRINTF_POSIX], [1],
[Define if fprintf is overridden by a POSIX compliant gnulib
implementation.])
gl_PREREQ_FPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
AC_DEFUN([gl_PREREQ_FPRINTF], [:])
diff --git a/m4/fseek.m4 b/m4/fseek.m4
index 23ed7a9..7d9aa18 100644
--- a/m4/fseek.m4
+++ b/m4/fseek.m4
@@ -1,4 +1,4 @@
-# fseek.m4 serial 2
+# fseek.m4 serial 3
dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -17,4 +17,7 @@ AC_DEFUN([gl_REPLACE_FSEEK],
AC_LIBOBJ([fseek])
AC_REQUIRE([gl_STDIO_H_DEFAULTS])
REPLACE_FSEEK=1
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
diff --git a/m4/fseeko.m4 b/m4/fseeko.m4
index 76507d1..c235255 100644
--- a/m4/fseeko.m4
+++ b/m4/fseeko.m4
@@ -1,4 +1,4 @@
-# fseeko.m4 serial 11
+# fseeko.m4 serial 12
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -52,6 +52,9 @@ AC_DEFUN([gl_REPLACE_FSEEKO],
AC_LIBOBJ([fseeko])
dnl If we are also using the fseek module, then fseek needs replacing, too.
m4_ifdef([gl_REPLACE_FSEEK], [gl_REPLACE_FSEEK])
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
dnl Code shared by fseeko and ftello. Determine if large files are supported,
diff --git a/m4/ftello.m4 b/m4/ftello.m4
index 599f8f2..b38789a 100644
--- a/m4/ftello.m4
+++ b/m4/ftello.m4
@@ -1,4 +1,4 @@
-# ftello.m4 serial 9
+# ftello.m4 serial 10
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -132,4 +132,7 @@ main (void)
AC_DEFUN([gl_REPLACE_FTELLO],
[
AC_LIBOBJ([ftello])
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index 035a530..abd534d 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,4 +1,4 @@
-# getopt.m4 serial 34
+# getopt.m4 serial 35
dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -37,6 +37,9 @@ AC_DEFUN([gl_REPLACE_GETOPT],
AC_LIBOBJ([getopt])
AC_LIBOBJ([getopt1])
gl_PREREQ_GETOPT
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
# emacs' configure.in uses this.
diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4
index b062e73..c44e971 100644
--- a/m4/iconv_open.m4
+++ b/m4/iconv_open.m4
@@ -1,4 +1,4 @@
-# iconv_open.m4 serial 12
+# iconv_open.m4 serial 13
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -44,6 +44,9 @@ AC_DEFUN([gl_REPLACE_ICONV_OPEN],
gl_REPLACE_ICONV_H
REPLACE_ICONV_OPEN=1
AC_LIBOBJ([iconv_open])
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
AC_DEFUN([gl_FUNC_ICONV_OPEN_UTF],
diff --git a/m4/lseek.m4 b/m4/lseek.m4
index f6452f6..5a3b9bd 100644
--- a/m4/lseek.m4
+++ b/m4/lseek.m4
@@ -1,4 +1,4 @@
-# lseek.m4 serial 6
+# lseek.m4 serial 7
dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -46,4 +46,7 @@ AC_DEFUN([gl_REPLACE_LSEEK],
REPLACE_LSEEK=1
AC_DEFINE([LSEEK_PIPE_BROKEN], [1],
[Define to 1 if lseek does not detect pipes.])
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
diff --git a/m4/malloc.m4 b/m4/malloc.m4
index 8094444..4dc59b3 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,4 +1,4 @@
-# malloc.m4 serial 12
+# malloc.m4 serial 13
dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -63,4 +63,7 @@ AC_DEFUN([gl_REPLACE_MALLOC],
[
AC_LIBOBJ([malloc])
REPLACE_MALLOC=1
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
diff --git a/m4/obstack-printf.m4 b/m4/obstack-printf.m4
index d07af21..97367cf 100644
--- a/m4/obstack-printf.m4
+++ b/m4/obstack-printf.m4
@@ -1,4 +1,4 @@
-# obstack-printf.m4 serial 3
+# obstack-printf.m4 serial 4
dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -29,6 +29,9 @@ AC_DEFUN([gl_REPLACE_OBSTACK_PRINTF],
if test $ac_cv_func_obstack_printf = yes; then
REPLACE_OBSTACK_PRINTF=1
fi
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
dnl Ensure obstack_printf() and obstack_vprintf() are declared
diff --git a/m4/open.m4 b/m4/open.m4
index 690cc64..a2e268f 100644
--- a/m4/open.m4
+++ b/m4/open.m4
@@ -1,4 +1,4 @@
-# open.m4 serial 12
+# open.m4 serial 13
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -79,6 +79,9 @@ AC_DEFUN([gl_REPLACE_OPEN],
REPLACE_OPEN=1
AC_LIBOBJ([open])
gl_PREREQ_OPEN
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
# Prerequisites of lib/open.c.
diff --git a/m4/printf-posix-rpl.m4 b/m4/printf-posix-rpl.m4
index b9f606d..b05d499 100644
--- a/m4/printf-posix-rpl.m4
+++ b/m4/printf-posix-rpl.m4
@@ -1,4 +1,4 @@
-# printf-posix-rpl.m4 serial 4
+# printf-posix-rpl.m4 serial 5
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -21,6 +21,9 @@ AC_DEFUN([gl_REPLACE_PRINTF],
AC_DEFINE([REPLACE_PRINTF_POSIX], [1],
[Define if printf is overridden by a POSIX compliant gnulib
implementation.])
gl_PREREQ_PRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
AC_DEFUN([gl_PREREQ_PRINTF], [:])
diff --git a/m4/realloc.m4 b/m4/realloc.m4
index a403d9f..f732859 100644
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -1,4 +1,4 @@
-# realloc.m4 serial 11
+# realloc.m4 serial 12
dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -41,4 +41,7 @@ AC_DEFUN([gl_REPLACE_REALLOC],
[
AC_LIBOBJ([realloc])
REPLACE_REALLOC=1
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
diff --git a/m4/snprintf.m4 b/m4/snprintf.m4
index 8aa5dbe..4e68dfb 100644
--- a/m4/snprintf.m4
+++ b/m4/snprintf.m4
@@ -1,4 +1,4 @@
-# snprintf.m4 serial 5
+# snprintf.m4 serial 6
dnl Copyright (C) 2002-2004, 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -39,6 +39,9 @@ AC_DEFUN([gl_REPLACE_SNPRINTF],
REPLACE_SNPRINTF=1
fi
gl_PREREQ_SNPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
# Prerequisites of lib/snprintf.c.
diff --git a/m4/sprintf-posix.m4 b/m4/sprintf-posix.m4
index 5a117ad..dadafee 100644
--- a/m4/sprintf-posix.m4
+++ b/m4/sprintf-posix.m4
@@ -1,4 +1,4 @@
-# sprintf-posix.m4 serial 12
+# sprintf-posix.m4 serial 13
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -103,6 +103,9 @@ AC_DEFUN([gl_REPLACE_SPRINTF],
AC_LIBOBJ([sprintf])
REPLACE_SPRINTF=1
gl_PREREQ_SPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
AC_DEFUN([gl_PREREQ_SPRINTF], [:])
diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4
index 32ea985..c736c34 100644
--- a/m4/vasnprintf.m4
+++ b/m4/vasnprintf.m4
@@ -1,4 +1,4 @@
-# vasnprintf.m4 serial 32
+# vasnprintf.m4 serial 33
dnl Copyright (C) 2002-2004, 2006-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -27,6 +27,9 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
gl_PREREQ_PRINTF_PARSE
gl_PREREQ_VASNPRINTF
gl_PREREQ_ASNPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
# Prequisites of lib/printf-args.h, lib/printf-args.c.
diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4
index 6db52b1..b0f1f4f 100644
--- a/m4/vasprintf.m4
+++ b/m4/vasprintf.m4
@@ -1,4 +1,4 @@
-# vasprintf.m4 serial 6
+# vasprintf.m4 serial 7
dnl Copyright (C) 2002-2003, 2006-2007, 2009-2011 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -26,6 +26,9 @@ AC_DEFUN([gl_REPLACE_VASPRINTF],
gl_PREREQ_VASPRINTF_H
gl_PREREQ_VASPRINTF
gl_PREREQ_ASPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
# Prerequisites of the vasprintf portion of lib/stdio.h.
diff --git a/m4/vdprintf.m4 b/m4/vdprintf.m4
index f788c9b..4b6a028 100644
--- a/m4/vdprintf.m4
+++ b/m4/vdprintf.m4
@@ -1,4 +1,4 @@
-# vdprintf.m4 serial 1
+# vdprintf.m4 serial 2
dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -22,6 +22,9 @@ AC_DEFUN([gl_REPLACE_VDPRINTF],
REPLACE_VDPRINTF=1
fi
gl_PREREQ_VDPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
# Prerequisites of lib/vdprintf.c.
diff --git a/m4/vfprintf-posix.m4 b/m4/vfprintf-posix.m4
index 5ec93d1..9a01c8c 100644
--- a/m4/vfprintf-posix.m4
+++ b/m4/vfprintf-posix.m4
@@ -1,4 +1,4 @@
-# vfprintf-posix.m4 serial 14
+# vfprintf-posix.m4 serial 15
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -105,6 +105,9 @@ AC_DEFUN([gl_REPLACE_VFPRINTF],
AC_DEFINE([REPLACE_VFPRINTF_POSIX], [1],
[Define if vfprintf is overridden by a POSIX compliant gnulib
implementation.])
gl_PREREQ_VFPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
AC_DEFUN([gl_PREREQ_VFPRINTF], [:])
diff --git a/m4/vprintf-posix.m4 b/m4/vprintf-posix.m4
index 299ff7e..1ec0ce3 100644
--- a/m4/vprintf-posix.m4
+++ b/m4/vprintf-posix.m4
@@ -1,4 +1,4 @@
-# vprintf-posix.m4 serial 3
+# vprintf-posix.m4 serial 4
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -20,6 +20,9 @@ AC_DEFUN([gl_REPLACE_VPRINTF],
AC_DEFINE([REPLACE_VPRINTF_POSIX], [1],
[Define if vprintf is overridden by a POSIX compliant gnulib
implementation.])
gl_PREREQ_VPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
AC_DEFUN([gl_PREREQ_VPRINTF], [:])
diff --git a/m4/vsnprintf.m4 b/m4/vsnprintf.m4
index e4725e4..5beeb9d 100644
--- a/m4/vsnprintf.m4
+++ b/m4/vsnprintf.m4
@@ -1,4 +1,4 @@
-# vsnprintf.m4 serial 5
+# vsnprintf.m4 serial 6
dnl Copyright (C) 2002-2004, 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -39,6 +39,9 @@ AC_DEFUN([gl_REPLACE_VSNPRINTF],
REPLACE_VSNPRINTF=1
fi
gl_PREREQ_VSNPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
# Prerequisites of lib/vsnprintf.c.
diff --git a/m4/vsprintf-posix.m4 b/m4/vsprintf-posix.m4
index 31a077f..3b13f51 100644
--- a/m4/vsprintf-posix.m4
+++ b/m4/vsprintf-posix.m4
@@ -1,4 +1,4 @@
-# vsprintf-posix.m4 serial 12
+# vsprintf-posix.m4 serial 13
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -103,6 +103,9 @@ AC_DEFUN([gl_REPLACE_VSPRINTF],
AC_LIBOBJ([vsprintf])
REPLACE_VSPRINTF=1
gl_PREREQ_VSPRINTF
+
+ dnl Ensure that the LIBOBJ is only done once.
+ m4_pushdef([$0], [:])
])
AC_DEFUN([gl_PREREQ_VSPRINTF], [:])
--
1.7.4.4
