2005-12-22 Roland McGrath <roland@redhat.com>

	* configure.ac: Pass LDFLAGS to elfutils configure to force DT_RUNPATH.
	* configure: Regeneraed.

diff --git a/configure b/configure
index 8501479ae5f3fa697b227076155647d87e117c00..74b176898332de1f3721601a98f425b602ccb192 100755 (executable)
--- a/configure
+++ b/configure
@@ -6661,10 +6661,14 @@ if test $build_elfutils = yes; then
   esac
   { echo "$as_me:$LINENO: running ${elfutils_srcdir}/configure" >&5
 echo "$as_me: running ${elfutils_srcdir}/configure" >&6;}
+  # Our libdw.so's libebl will look in $ORIGIN/../lib/... but that
+  # $ORIGIN is where libdw.so resides, which is not where there is a ../lib.
+  elfutils_rpath="-Wl,--enable-new-dtags,-rpath,${libdir}/${PACKAGE_NAME}"
   here=`pwd`
   (mkdir -p build-elfutils && cd build-elfutils &&
    ${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \
                                --includedir="${here}/include-elfutils" \
-                               --libdir="${here}/lib-elfutils"
+                               --libdir="${here}/lib-elfutils" \
+                               LDFLAGS="$LDFLAGS $elfutils_rpath"
   )
 fi

diff --git a/configure.ac b/configure.ac
index bf455795eaab6ed0cfef355811bcdd009e99b11e..cfad5c57c72df5d791f75acc1e4f2e8773767cc5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -62,10 +62,14 @@ if test $build_elfutils = yes; then
   *) elfutils_srcdir="../$with_elfutils" ;;
   esac
   AC_MSG_NOTICE([running ${elfutils_srcdir}/configure])
+  # Our libdw.so's libebl will look in $ORIGIN/../lib/... but that
+  # $ORIGIN is where libdw.so resides, which is not where there is a ../lib.
+  elfutils_rpath="-Wl,--enable-new-dtags,-rpath,${libdir}/${PACKAGE_NAME}"
   here=`pwd`
   (mkdir -p build-elfutils && cd build-elfutils &&
    ${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \
                                --includedir="${here}/include-elfutils" \
-                               --libdir="${here}/lib-elfutils"
+                               --libdir="${here}/lib-elfutils" \
+                               LDFLAGS="$LDFLAGS $elfutils_rpath"
   )
 fi