X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frelocatable.m4;h=93eba603dcca668a367cbfc5ba66b7aada13341b;hb=46f5f314f34a08c9305758482d7d2fdb0e999d09;hp=16db7ee871189745fea101b8f4eacfe5003e819d;hpb=8cf9b2c7699cf7721ac32bee747484d59f265ebc;p=gnulib.git

diff --git a/m4/relocatable.m4 b/m4/relocatable.m4
index 16db7ee87..93eba603d 100644
--- a/m4/relocatable.m4
+++ b/m4/relocatable.m4
@@ -1,5 +1,5 @@
-# relocatable.m4 serial 15
-dnl Copyright (C) 2003, 2005-2007, 2009-2010 Free Software Foundation, Inc.
+# relocatable.m4 serial 18
+dnl Copyright (C) 2003, 2005-2007, 2009-2014 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.
@@ -14,9 +14,6 @@ AC_DEFUN([gl_RELOCATABLE],
 [
   AC_REQUIRE([gl_RELOCATABLE_BODY])
   gl_RELOCATABLE_LIBRARY
-  if test $RELOCATABLE = yes; then
-    AC_LIBOBJ([progreloc])
-  fi
   : ${RELOCATABLE_CONFIG_H_DIR='$(top_builddir)'}
   RELOCATABLE_SRC_DIR="\$(top_srcdir)/$gl_source_base"
   RELOCATABLE_BUILD_DIR="\$(top_builddir)/$gl_source_base"
@@ -36,6 +33,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
@@ -43,7 +41,7 @@ AC_DEFUN([gl_RELOCATABLE_BODY],
     AC_CHECK_FUNCS([_NSGetExecutablePath])
     case "$host_os" in
       mingw*) is_noop=yes ;;
-      linux*) use_elf_origin_trick=yes ;;
+      linux* | kfreebsd*) use_elf_origin_trick=yes ;;
     esac
     if test $is_noop = yes; then
       RELOCATABLE_LDFLAGS=:
@@ -58,6 +56,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,6 +72,7 @@ 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])