lib/gnulib
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-10 04:43:00 +03:00
Code Activity

relocatable-lib: Move AC_LIBOBJ invocations to module description.

Browse Source 
* 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.
This commit is contained in:
Bruno Haible
2011-05-21 18:23:54 +02:00
parent c2d8c01692
commit 357d319ff8
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -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> 2011-05-21 Bruno Haible <bruno@clisp.org>
relocatable-prog: Move AC_LIBOBJ invocations to module description. relocatable-prog: Move AC_LIBOBJ invocations to module description.

12
m4/relocatable-lib.m4
View File

@@ -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 Copyright (C) 2003, 2005-2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, 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_DEFUN([gl_RELOCATABLE_LIBRARY],
[ [
AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY]) AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
if test $RELOCATABLE = yes; then
AC_LIBOBJ([relocatable])
fi
]) ])
AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY],
[ [
@@ -32,13 +29,6 @@ AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY],
fi 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. dnl Support for relocatable packages for which it is a nop.
AC_DEFUN([gl_RELOCATABLE_NOP], AC_DEFUN([gl_RELOCATABLE_NOP],
[ [

3
modules/relocatable-lib
View File

@@ -14,6 +14,9 @@ strdup
configure.ac: configure.ac:
gl_RELOCATABLE_LIBRARY gl_RELOCATABLE_LIBRARY
if test $RELOCATABLE = yes; then
AC_LIBOBJ([relocatable])
fi
Makefile.am: Makefile.am:

2
modules/relocatable-prog-wrapper
View File

@@ -50,7 +50,7 @@ configure.ac:
gl_FUNC_READLINK_SEPARATE gl_FUNC_READLINK_SEPARATE
gl_CANONICALIZE_LGPL_SEPARATE gl_CANONICALIZE_LGPL_SEPARATE
gl_MALLOCA gl_MALLOCA
gl_RELOCATABLE_LIBRARY_SEPARATE gl_RELOCATABLE_LIBRARY
gl_FUNC_SETENV_SEPARATE gl_FUNC_SETENV_SEPARATE
Makefile.am: Makefile.am: