From a851d08b8a4acb3fedf2e698fb4a8e157aed6113 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 18:13:27 +0200 Subject: [PATCH] regex: Move AC_LIBOBJ invocations to module description. * m4/regex.m4 (gl_REGEX): Move AC_LIBOBJ and gl_PREREQ_REGEX invocations from here... * modules/regex (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/regex.m4 | 4 +--- modules/regex | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9d2715fb..cd7367af0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-21 Bruno Haible + regex: Move AC_LIBOBJ invocations to module description. + * m4/regex.m4 (gl_REGEX): Move AC_LIBOBJ and gl_PREREQ_REGEX + invocations from here... + * modules/regex (configure.ac): ... to here. + +2011-05-21 Bruno Haible + realloc-*: Move AC_LIBOBJ invocations to module description. * m4/realloc.m4 (gl_REPLACE_REALLOC): Remove macro. (gl_FUNC_REALLOC_GNU, gl_FUNC_REALLOC_POSIX): Inline it here. Move diff --git a/m4/regex.m4 b/m4/regex.m4 index 24198b557..e48fab0e5 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -# serial 58 +# serial 59 # Copyright (C) 1996-2001, 2003-2011 Free Software Foundation, Inc. # @@ -207,8 +207,6 @@ AC_DEFUN([gl_REGEX], [Define to rpl_regerror if the replacement should be used.]) AC_DEFINE([regfree], [rpl_regfree], [Define to rpl_regfree if the replacement should be used.]) - AC_LIBOBJ([regex]) - gl_PREREQ_REGEX fi ]) diff --git a/modules/regex b/modules/regex index 730076c2b..4c268a211 100644 --- a/modules/regex +++ b/modules/regex @@ -32,6 +32,10 @@ wctype-h [test $ac_use_included_regex = yes] configure.ac: gl_REGEX +if test $ac_use_included_regex = yes; then + AC_LIBOBJ([regex]) + gl_PREREQ_REGEX +fi Makefile.am: -- 2.11.0