Mercurial > hg > octave-kai > gnulib-hg
changeset 13421:5dc27513d127
relocatable: Make it easier to test whether to install wrappers.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 14 Jun 2010 01:53:49 +0200 |
parents | 2291a2f3d56c |
children | e81addc3d284 |
files | ChangeLog m4/relocatable.m4 |
diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-06-13 Bruno Haible <bruno@clisp.org> + + relocatable: Make it easier to test whether to install wrappers. + * m4/relocatable.m4 (gl_RELOCATABLE_BODY): New automake conditional + RELOCATABLE_VIA_WRAPPER. + 2010-06-13 Bruno Haible <bruno@clisp.org> gnulib-tool: Display specified modules and dependencies differently.
--- a/m4/relocatable.m4 +++ b/m4/relocatable.m4 @@ -1,4 +1,4 @@ -# relocatable.m4 serial 15 +# relocatable.m4 serial 16 dnl Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -36,6 +36,7 @@ AC_REQUIRE([gl_RELOCATABLE_LIBRARY_BODY]) is_noop=no use_elf_origin_trick=no + use_wrapper=no if test $RELOCATABLE = yes; then # --enable-relocatable implies --disable-rpath enable_rpath=no @@ -58,6 +59,7 @@ RELOCATABLE_LDFLAGS="\"$reloc_ldflags\" \"\$(host)\" \"\$(RELOCATABLE_LIBRARY_PATH)\"" AC_SUBST([RELOCATABLE_LDFLAGS]) else + use_wrapper=yes dnl Unfortunately we cannot define INSTALL_PROGRAM to a command dnl consisting of more than one word - libtool doesn't support this. dnl So we abuse the INSTALL_PROGRAM_ENV hook, originally meant for the @@ -73,6 +75,7 @@ fi AM_CONDITIONAL([RELOCATABLE_VIA_LD], [test $is_noop = yes || test $use_elf_origin_trick = yes]) + AM_CONDITIONAL([RELOCATABLE_VIA_WRAPPER], [test $use_wrapper = yes]) dnl RELOCATABLE_LIBRARY_PATH can be set in configure.ac. Default is empty. AC_SUBST([RELOCATABLE_LIBRARY_PATH])