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.

diff --git a/ChangeLog b/ChangeLog
index 37a8fbda45ab97b7a2631d3964dab64b1f16c284..49a1c9ff3e0f968576905d5124d2c064cd9dd138 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        relocatable-prog: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/relocatable-lib.m4 b/m4/relocatable-lib.m4
index fed2240f33cbda0bee8dcaf2fa44bb0e975163be..aa798b9eba96a27e4e36da62a977739b1f868c22 100644 (file)
--- 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 5f6f774e8d46f8aab94f7a321501afaee41c3f42..e86f8c52dd2c85d7d2dcc46dbcdd2d235769457d 100644 (file)
--- 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 80a0f6061f929e49a9b23349e131e610781ff0db..8ff11d4d027dc7446f92d7311ea637ba7fd8ddc0 100644 (file)
--- 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: