X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frelocatable.m4;h=16db7ee871189745fea101b8f4eacfe5003e819d;hb=db2ebe9d04c394f51b2b0f4306c9f9a79959b1da;hp=27f5724a542dbc4cfc7e2b0b48c521e82d0967d4;hpb=5477344afc7509ae13c14245f4c29c3eb3388236;p=gnulib.git

diff --git a/m4/relocatable.m4 b/m4/relocatable.m4
index 27f5724a5..16db7ee87 100644
--- a/m4/relocatable.m4
+++ b/m4/relocatable.m4
@@ -1,5 +1,5 @@
-# relocatable.m4 serial 11
-dnl Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
+# 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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -62,7 +62,7 @@ AC_DEFUN([gl_RELOCATABLE_BODY],
         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
         dnl 'install-strip' target.
-        INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\""
+        INSTALL_PROGRAM_ENV="RELOC_LIBRARY_PATH_VAR=\"$shlibpath_var\" RELOC_LIBRARY_PATH_VALUE=\"\$(RELOCATABLE_LIBRARY_PATH)\" RELOC_PREFIX=\"\$(prefix)\" RELOC_DESTDIR=\"\$(DESTDIR)\" RELOC_COMPILE_COMMAND=\"\$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(LDFLAGS)\" RELOC_SRCDIR=\"\$(RELOCATABLE_SRC_DIR)\" RELOC_BUILDDIR=\"\$(RELOCATABLE_BUILD_DIR)\" RELOC_CONFIG_H_DIR=\"\$(RELOCATABLE_CONFIG_H_DIR)\" RELOC_EXEEXT=\"\$(EXEEXT)\" RELOC_STRIP_PROG=\"\$(RELOCATABLE_STRIP)\" RELOC_INSTALL_PROG=\"$INSTALL_PROGRAM\""
         AC_SUBST([INSTALL_PROGRAM_ENV])
         case "$ac_aux_dir" in
           /*) INSTALL_PROGRAM="$ac_aux_dir/install-reloc" ;;
@@ -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:
@@ -88,7 +94,7 @@ AC_DEFUN([AC_LIB_LIBPATH],
   AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD
   AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
   AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library path variable], acl_cv_libpath, [
+  AC_CACHE_CHECK([for shared library path variable], [acl_cv_libpath], [
     LD="$LD" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.libpath" "$host" > conftest.sh
     . ./conftest.sh