From 357d319ff8af64cc9dcce17868a4c40260f6cccc Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 18:23:54 +0200 Subject: [PATCH] relocatable-lib: Move AC_LIBOBJ invocations to module description. * m4/relocatable-lib.m4 (gl_RELOCATABLE_LIBRARY_SEPARATE): Remove macro. (gl_RELOCATABLE_LIBRARY): Move AC_LIBOBJ invocation from here... * modules/relocatable-lib (configure.ac): ... to here. * modules/relocatable-prog-wrapper (configure.ac): Invoke gl_RELOCATABLE_LIBRARY instead of gl_RELOCATABLE_LIBRARY_SEPARATE. --- ChangeLog | 10 ++++++++++ m4/relocatable-lib.m4 | 12 +----------- modules/relocatable-lib | 3 +++ modules/relocatable-prog-wrapper | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37a8fbda4..49a1c9ff3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2011-05-21 Bruno Haible + relocatable-lib: Move AC_LIBOBJ invocations to module description. + * m4/relocatable-lib.m4 (gl_RELOCATABLE_LIBRARY_SEPARATE): Remove + macro. + (gl_RELOCATABLE_LIBRARY): Move AC_LIBOBJ invocation from here... + * modules/relocatable-lib (configure.ac): ... to here. + * modules/relocatable-prog-wrapper (configure.ac): Invoke + gl_RELOCATABLE_LIBRARY instead of gl_RELOCATABLE_LIBRARY_SEPARATE. + +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... diff --git a/m4/relocatable-lib.m4 b/m4/relocatable-lib.m4 index fed2240f3..aa798b9eb 100644 --- a/m4/relocatable-lib.m4 +++ b/m4/relocatable-lib.m4 @@ -1,4 +1,4 @@ -# relocatable-lib.m4 serial 5 +# relocatable-lib.m4 serial 6 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, @@ -10,9 +10,6 @@ dnl Support for relocatable libraries. AC_DEFUN([gl_RELOCATABLE_LIBRARY], [ AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY]) - if test $RELOCATABLE = yes; then - AC_LIBOBJ([relocatable]) - fi ]) AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], [ @@ -32,13 +29,6 @@ AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], fi ]) -dnl Like gl_RELOCATABLE_LIBRARY, except prepare for separate compilation -dnl (no AC_LIBOBJ). -AC_DEFUN([gl_RELOCATABLE_LIBRARY_SEPARATE], -[ - AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY]) -]) - dnl Support for relocatable packages for which it is a nop. AC_DEFUN([gl_RELOCATABLE_NOP], [ diff --git a/modules/relocatable-lib b/modules/relocatable-lib index 5f6f774e8..e86f8c52d 100644 --- a/modules/relocatable-lib +++ b/modules/relocatable-lib @@ -14,6 +14,9 @@ strdup configure.ac: gl_RELOCATABLE_LIBRARY +if test $RELOCATABLE = yes; then + AC_LIBOBJ([relocatable]) +fi Makefile.am: diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper index 80a0f6061..8ff11d4d0 100644 --- a/modules/relocatable-prog-wrapper +++ b/modules/relocatable-prog-wrapper @@ -50,7 +50,7 @@ configure.ac: gl_FUNC_READLINK_SEPARATE gl_CANONICALIZE_LGPL_SEPARATE gl_MALLOCA -gl_RELOCATABLE_LIBRARY_SEPARATE +gl_RELOCATABLE_LIBRARY gl_FUNC_SETENV_SEPARATE Makefile.am: -- 2.11.0