relocatable-prog: Enable ELF ORIGIN trick also on GNU/kFreeBSD.

* m4/relocatable.m4 (gl_RELOCATABLE_BODY): Treat kFreeBSD like Linux.
* build-aux/reloc-ldflags: Likewise.
Suggested by Steven Chamberlain <steven@pyro.eu.org>.

diff --git a/ChangeLog b/ChangeLog
index 31f6addd8e52104267f74f3a89cf55397962d52e..55dbe1e52f5bbee71b34ffb131149fc16a84400a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-01  Bruno Haible  <bruno@clisp.org>
+
+       relocatable-prog: Enable ELF ORIGIN trick also on GNU/kFreeBSD.
+       * m4/relocatable.m4 (gl_RELOCATABLE_BODY): Treat kFreeBSD like Linux.
+       * build-aux/reloc-ldflags: Likewise.
+       Suggested by Steven Chamberlain <steven@pyro.eu.org>.
+
 2012-05-01  Bruno Haible  <bruno@clisp.org>
 
        gnulib-tool: Remove transitional code.

diff --git a/build-aux/reloc-ldflags b/build-aux/reloc-ldflags
index 462ea61bc43b7802c5e96eaab0801a73296a44d4..873b585680304d685f4749bc3110209f46be79aa 100755 (executable)
--- a/build-aux/reloc-ldflags
+++ b/build-aux/reloc-ldflags
@@ -54,7 +54,7 @@ case "$installdir" in
 esac
 
 case "$host_os" in
-  linux*) # Supported since Linux 2.1 and glibc 2.1.
+  linux* | kfreebsd*)
     rpath=
     save_IFS="$IFS"; IFS=":"
     for dir in $library_path_value; do

diff --git a/m4/relocatable.m4 b/m4/relocatable.m4
index 2a3c9203da47288cd100e477155dc723a3ca7f7b..7901c0c690a05e8443081f310d921e73b4fc5e41 100644 (file)
--- a/m4/relocatable.m4
+++ b/m4/relocatable.m4
@@ -1,4 +1,4 @@
-# relocatable.m4 serial 17
+# relocatable.m4 serial 18
 dnl Copyright (C) 2003, 2005-2007, 2009-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -41,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=: