From 710c8d3ccb0d07d62d89ae90aa7b7711bf4a42ab Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 20 Apr 2010 00:24:35 +0200 Subject: [PATCH] relocatable: Drop the need to define RELOCATABLE_STRIP in Makefile.am. --- ChangeLog | 6 ++++++ m4/relocatable.m4 | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ed85f8f7b8..24f2a3692c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-04-19 Bruno Haible + + relocatable: Drop the need to define RELOCATABLE_STRIP in Makefile.am. + * m4/relocatable.m4 (gl_RELOCATABLE_BODY): Set RELOCATABLE_STRIP. + Reported by Sylvain Beucler . + 2010-04-19 Bruno Haible * lib/diffseq.h: Fix typo in comment. diff --git a/m4/relocatable.m4 b/m4/relocatable.m4 index d52858161e..16db7ee871 100644 --- a/m4/relocatable.m4 +++ b/m4/relocatable.m4 @@ -1,4 +1,4 @@ -# relocatable.m4 serial 14 +# relocatable.m4 serial 15 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, @@ -76,9 +76,15 @@ AC_DEFUN([gl_RELOCATABLE_BODY], dnl RELOCATABLE_LIBRARY_PATH can be set in configure.ac. Default is empty. AC_SUBST([RELOCATABLE_LIBRARY_PATH]) + AC_SUBST([RELOCATABLE_CONFIG_H_DIR]) AC_SUBST([RELOCATABLE_SRC_DIR]) AC_SUBST([RELOCATABLE_BUILD_DIR]) + + dnl Ensure RELOCATABLE_STRIP is defined in Makefiles (at least those + dnl generated by automake), with value ':'. + RELOCATABLE_STRIP=':' + AC_SUBST([RELOCATABLE_STRIP]) ]) dnl Determine the platform dependent parameters needed to use relocatability: -- 2.30.2