From a43426bb51ec18d942bf986a298116545a739a0e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 16:33:49 +0200 Subject: [PATCH] obstack-printf*: Move AC_LIBOBJ invocations to module description. * m4/obstack-printf.m4 (gl_REPLACE_OBSTACK_PRINTF): Move AC_LIBOBJ invocation from here... * modules/obstack-printf (configure.ac): ... to here. * modules/obstack-printf-posix (configure.ac): ... and here. --- ChangeLog | 8 ++++++++ m4/obstack-printf.m4 | 3 +-- modules/obstack-printf | 3 +++ modules/obstack-printf-posix | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bda197a3..77ea926f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-05-21 Bruno Haible + obstack-printf*: Move AC_LIBOBJ invocations to module description. + * m4/obstack-printf.m4 (gl_REPLACE_OBSTACK_PRINTF): Move AC_LIBOBJ + invocation from here... + * modules/obstack-printf (configure.ac): ... to here. + * modules/obstack-printf-posix (configure.ac): ... and here. + +2011-05-21 Bruno Haible + nl_langinfo: Move AC_LIBOBJ invocations to module description. * m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): Move AC_LIBOBJ invocations from here... diff --git a/m4/obstack-printf.m4 b/m4/obstack-printf.m4 index d07af216c..20880af60 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, @@ -25,7 +25,6 @@ AC_DEFUN([gl_FUNC_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 diff --git a/modules/obstack-printf b/modules/obstack-printf index 3604ce29b..324dde688 100644 --- a/modules/obstack-printf +++ b/modules/obstack-printf @@ -13,6 +13,9 @@ extensions configure.ac: gl_FUNC_OBSTACK_PRINTF +if test $ac_cv_func_obstack_printf = no || test $REPLACE_OBSTACK_PRINTF = 1; then + AC_LIBOBJ([obstack_printf]) +fi gl_STDIO_MODULE_INDICATOR([obstack-printf]) Makefile.am: diff --git a/modules/obstack-printf-posix b/modules/obstack-printf-posix index 306a3df30..df5608777 100644 --- a/modules/obstack-printf-posix +++ b/modules/obstack-printf-posix @@ -20,6 +20,9 @@ extensions configure.ac: gl_FUNC_OBSTACK_PRINTF_POSIX +if test $ac_cv_func_obstack_printf = no || test $REPLACE_OBSTACK_PRINTF = 1; then + AC_LIBOBJ([obstack_printf]) +fi gl_STDIO_MODULE_INDICATOR([obstack-printf-posix]) Makefile.am: -- 2.11.0