From c2d8c01692f8df54c0a960879dc3de441184db88 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 18:17:10 +0200 Subject: [PATCH] relocatable-prog: Move AC_LIBOBJ invocations to module description. * m4/relocatable.m4 (gl_RELOCATABLE): Move AC_LIBOBJ invocation from here... * modules/relocatable-prog (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/relocatable.m4 | 5 +---- modules/relocatable-prog | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd7367af0..37a8fbda4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-21 Bruno Haible + relocatable-prog: Move AC_LIBOBJ invocations to module description. + * m4/relocatable.m4 (gl_RELOCATABLE): Move AC_LIBOBJ invocation from + here... + * modules/relocatable-prog (configure.ac): ... to here. + +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... diff --git a/m4/relocatable.m4 b/m4/relocatable.m4 index 5d2c47191..32d177fd1 100644 --- a/m4/relocatable.m4 +++ b/m4/relocatable.m4 @@ -1,4 +1,4 @@ -# relocatable.m4 serial 16 +# relocatable.m4 serial 17 dnl Copyright (C) 2003, 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, @@ -14,9 +14,6 @@ AC_DEFUN([gl_RELOCATABLE], [ AC_REQUIRE([gl_RELOCATABLE_BODY]) gl_RELOCATABLE_LIBRARY - if test $RELOCATABLE = yes; then - AC_LIBOBJ([progreloc]) - fi : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'} RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base" RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base" diff --git a/modules/relocatable-prog b/modules/relocatable-prog index 129947f2b..a7f50ac6b 100644 --- a/modules/relocatable-prog +++ b/modules/relocatable-prog @@ -26,6 +26,9 @@ strdup configure.ac: gl_RELOCATABLE([$gl_source_base]) +if test $RELOCATABLE = yes; then + AC_LIBOBJ([progreloc]) +fi Makefile.am: DEFS += -DEXEEXT=\"@EXEEXT@\" -- 2.11.0