relocatable: Drop the need to define RELOCATABLE_STRIP in Makefile.am.

(cherry picked from commit 710c8d3ccb0d07d62d89ae90aa7b7711bf4a42ab)

diff --git a/ChangeLog b/ChangeLog
index 4882fa2..ebb009d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-04-19  Bruno Haible  <bruno@clisp.org>
 
+       relocatable: Drop the need to define RELOCATABLE_STRIP in Makefile.am.
+       * m4/relocatable.m4 (gl_RELOCATABLE_BODY): Set RELOCATABLE_STRIP.
+       Reported by Sylvain Beucler <beuc@beuc.net>.
+
+2010-04-19  Bruno Haible  <bruno@clisp.org>
+
        ioctl: Move autoconf macro to a .m4 file.
        * m4/ioctl.m4: New file, extracted from modules/ioctl.
        * modules/ioctl (Files): Add it.

diff --git a/m4/relocatable.m4 b/m4/relocatable.m4
index d528581..16db7ee 100644 (file)
--- 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: