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.

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

diff --git a/m4/relocatable.m4 b/m4/relocatable.m4
index 5d2c471918b56f1b37f9a85131880b5ff7887265..32d177fd1b3912dbc9598ab7ab79fe1ef38574ad 100644 (file)
--- 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 129947f2b85b11660ebac00772ffc9048cc020d1..a7f50ac6b9edac2bf064b355c073acf1594986e8 100644 (file)
--- 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@\"