X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frelocatable.m4;h=5d2c471918b56f1b37f9a85131880b5ff7887265;hb=b9bb8b95df6833738f8e5b22cc57246f71fe4b2e;hp=d52858161e0b614db1b368b712cef9e1839dacba;hpb=8d8eda4eab3d2801251daf4eb31756c3595e2fc6;p=gnulib.git

diff --git a/m4/relocatable.m4 b/m4/relocatable.m4
index d52858161..5d2c47191 100644
--- a/m4/relocatable.m4
+++ b/m4/relocatable.m4
@@ -1,5 +1,5 @@
-# relocatable.m4 serial 14
-dnl Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
+# relocatable.m4 serial 16
+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 with or without modifications, as long as this notice is preserved.
@@ -36,6 +36,7 @@ AC_DEFUN([gl_RELOCATABLE_BODY],
   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 @@ AC_DEFUN([gl_RELOCATABLE_BODY],
         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,12 +75,19 @@ AC_DEFUN([gl_RELOCATABLE_BODY],
   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])
+
   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: