|
 |
357a0bb |
commit fe1456e2431a3b8bd27aadc5bbc6998ebc8cd00c
|
|
|
d3d32cf |
Author: Nils Philippsen <nils@redhat.com>
|
|
|
5c8da12 |
Date: Mon Aug 31 16:38:23 2009 +0200
|
|
|
d3d32cf |
|
|
|
357a0bb |
patch: rpath
|
|
|
d3d32cf |
|
|
|
d3d32cf |
Squashed commit of the following:
|
|
|
d3d32cf |
|
|
|
5c8da12 |
commit c37206c9fa724e19f6929d8a77e5399ca6b87f1f
|
|
|
5c8da12 |
Author: Nils Philippsen <nils@redhat.com>
|
|
|
5c8da12 |
Date: Mon Aug 31 16:34:42 2009 +0200
|
|
|
5c8da12 |
|
|
|
5c8da12 |
fix --enable-rpath
|
|
|
5c8da12 |
|
|
|
d3d32cf |
commit be2982b2d1ae4d889b4cecec289336b4b03579aa
|
|
|
d3d32cf |
Author: Nils Philippsen <nils@redhat.com>
|
|
|
d3d32cf |
Date: Tue Jun 2 16:12:23 2009 +0200
|
|
|
d3d32cf |
|
|
|
d3d32cf |
add --enable-rpath to configure.in
|
|
|
d3d32cf |
|
|
|
d3d32cf |
make using runtime library search path configurable
|
|
|
d3d32cf |
|
|
|
d3d32cf |
diff --git a/acinclude.m4 b/acinclude.m4
|
|
|
5c8da12 |
index 6413b60..b2bb065 100644
|
|
|
d3d32cf |
--- a/acinclude.m4
|
|
|
d3d32cf |
+++ b/acinclude.m4
|
|
|
5c8da12 |
@@ -383,19 +383,29 @@ dnl
|
|
|
d3d32cf |
|
|
|
d3d32cf |
AC_DEFUN([SANE_LINKER_RPATH],
|
|
|
d3d32cf |
[dnl AC_REQUIRE([AC_SUBST])dnl This line resulted in an empty AC_SUBST() !!
|
|
|
d3d32cf |
- AC_CACHE_CHECK([linker parameter to set runtime link path], my_cv_LINKER_RPATH,
|
|
|
d3d32cf |
- [my_cv_LINKER_RPATH=
|
|
|
d3d32cf |
- case "$host_os" in
|
|
|
d3d32cf |
- linux* | freebsd* | netbsd* | openbsd* | irix*)
|
|
|
d3d32cf |
- # I believe this only works with GNU ld [pere 2001-04-16]
|
|
|
d3d32cf |
- my_cv_LINKER_RPATH="-Wl,-rpath,"
|
|
|
d3d32cf |
- ;;
|
|
|
d3d32cf |
- solaris*)
|
|
|
d3d32cf |
- my_cv_LINKER_RPATH="-R "
|
|
|
d3d32cf |
- ;;
|
|
|
d3d32cf |
- esac
|
|
|
d3d32cf |
- ])
|
|
|
d3d32cf |
- LINKER_RPATH="$my_cv_LINKER_RPATH"
|
|
|
d3d32cf |
+ AC_MSG_CHECKING([whether runtime link path should be used])
|
|
|
d3d32cf |
+ AC_ARG_ENABLE([rpath],
|
|
|
d3d32cf |
+ [AS_HELP_STRING([--enable-rpath],
|
|
|
5c8da12 |
+ [use runtime library search path @<:@default=yes@:>@])])
|
|
|
d3d32cf |
+
|
|
|
d3d32cf |
+ LINKER_RPATH=
|
|
|
d3d32cf |
+ AS_IF([test "x$enable_rpath" != xno],
|
|
|
d3d32cf |
+ AC_MSG_RESULT([yes])
|
|
|
d3d32cf |
+ [AC_CACHE_CHECK([linker parameter to set runtime link path], my_cv_LINKER_RPATH,
|
|
|
d3d32cf |
+ [my_cv_LINKER_RPATH=
|
|
|
d3d32cf |
+ case "$host_os" in
|
|
|
d3d32cf |
+ linux* | freebsd* | netbsd* | openbsd* | irix*)
|
|
|
d3d32cf |
+ # I believe this only works with GNU ld [pere 2001-04-16]
|
|
|
d3d32cf |
+ my_cv_LINKER_RPATH="-Wl,-rpath,"
|
|
|
d3d32cf |
+ ;;
|
|
|
d3d32cf |
+ solaris*)
|
|
|
d3d32cf |
+ my_cv_LINKER_RPATH="-R "
|
|
|
d3d32cf |
+ ;;
|
|
|
d3d32cf |
+ esac
|
|
|
d3d32cf |
+ ])
|
|
|
d3d32cf |
+ LINKER_RPATH="$my_cv_LINKER_RPATH"],
|
|
|
d3d32cf |
+ [AC_MSG_RESULT([no])
|
|
|
d3d32cf |
+ LINKER_RPATH=])
|
|
|
d3d32cf |
AC_SUBST(LINKER_RPATH)dnl
|
|
|
d3d32cf |
])
|
|
|
d3d32cf |
|