diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-05-21 18:17:10 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-06-16 00:06:42 +0200 |
| commit | c2d8c01692f8df54c0a960879dc3de441184db88 (patch) | |
| tree | 1bdb613cf4f3e059f17fd3edb0532d394cbc8255 | |
| parent | a851d08b8a4acb3fedf2e698fb4a8e157aed6113 (diff) | |
| download | gnulib-c2d8c01692f8df54c0a960879dc3de441184db88.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | m4/relocatable.m4 | 5 | ||||
| -rw-r--r-- | modules/relocatable-prog | 3 |
3 files changed, 11 insertions, 4 deletions
@@ -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... diff --git a/m4/relocatable.m4 b/m4/relocatable.m4 index 5d2c471918..32d177fd1b 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 129947f2b8..a7f50ac6b9 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@\" |