X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fobstack-printf.m4;h=20880af60f5685763476739b09b7794db66bdc7d;hb=d16d5a56e1c99790c2452c66906760ac1109d013;hp=969d62027c5413b80103f2571bd2ae5efe4ab673;hpb=b6ee20a97a58f1f4cadd3a292532cf2673f6b26a;p=gnulib.git

diff --git a/m4/obstack-printf.m4 b/m4/obstack-printf.m4
index 969d62027..20880af60 100644
--- a/m4/obstack-printf.m4
+++ b/m4/obstack-printf.m4
@@ -1,5 +1,5 @@
-# obstack-printf.m4 serial 2
-dnl Copyright (C) 2008 Free Software Foundation, Inc.
+# 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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -19,17 +19,23 @@ AC_DEFUN([gl_FUNC_OBSTACK_PRINTF],
     gl_REPLACE_OBSTACK_PRINTF
   fi
 
-  AC_CHECK_DECLS_ONCE([obstack_printf])
-  if test $ac_cv_have_decl_obstack_printf = no; then
-    HAVE_DECL_OBSTACK_PRINTF=0
-  fi
+  gl_DECL_OBSTACK_PRINTF
 ])
 
 AC_DEFUN([gl_REPLACE_OBSTACK_PRINTF],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AC_LIBOBJ([obstack_printf])
   if test $ac_cv_func_obstack_printf = yes; then
     REPLACE_OBSTACK_PRINTF=1
   fi
 ])
+
+dnl Ensure obstack_printf() and obstack_vprintf() are declared
+dnl (whether or not they are being replaced).
+AC_DEFUN([gl_DECL_OBSTACK_PRINTF],
+[
+  AC_CHECK_DECLS_ONCE([obstack_printf])
+  if test $ac_cv_have_decl_obstack_printf = no; then
+    HAVE_DECL_OBSTACK_PRINTF=0
+  fi
+])