* 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-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.
2011-05-21 Bruno Haible <bruno@clisp.org>
relocatable-prog: Move AC_LIBOBJ invocations to module description.
-# 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,
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,
AC_DEFUN([gl_RELOCATABLE_LIBRARY],
[
AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY])
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],
[
])
AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY],
[
-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],
[
dnl Support for relocatable packages for which it is a nop.
AC_DEFUN([gl_RELOCATABLE_NOP],
[
configure.ac:
gl_RELOCATABLE_LIBRARY
configure.ac:
gl_RELOCATABLE_LIBRARY
+if test $RELOCATABLE = yes; then
+ AC_LIBOBJ([relocatable])
+fi
gl_FUNC_READLINK_SEPARATE
gl_CANONICALIZE_LGPL_SEPARATE
gl_MALLOCA
gl_FUNC_READLINK_SEPARATE
gl_CANONICALIZE_LGPL_SEPARATE
gl_MALLOCA
-gl_RELOCATABLE_LIBRARY_SEPARATE
gl_FUNC_SETENV_SEPARATE
Makefile.am:
gl_FUNC_SETENV_SEPARATE
Makefile.am: