Mercurial > hg > octave-lyh > gnulib-hg

changeset 15079:4f21126cd802

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 18:17:10 +0200
parents c6c18bdb8fc9
children 979d46218c86
files ChangeLog m4/relocatable.m4 modules/relocatable-prog
diffstat 3 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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.
 	* m4/regex.m4 (gl_REGEX): Move AC_LIBOBJ and gl_PREREQ_REGEX
 	invocations from here...
--- 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_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"
--- a/modules/relocatable-prog
+++ b/modules/relocatable-prog
@@ -26,6 +26,9 @@
 
 configure.ac:
 gl_RELOCATABLE([$gl_source_base])
+if test $RELOCATABLE = yes; then
+  AC_LIBOBJ([progreloc])
+fi
 
 Makefile.am:
 DEFS += -DEXEEXT=\"@EXEEXT@\"