From d7666dab114cbbb29128baaf74898d5dd87b6372 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 19 May 2011 09:34:19 -0700
Subject: [PATCH] Added an rpath if using the --with-munge option of configure.
---
auxdir/x_ac_munge.m4 | 4 ++--
configure | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/auxdir/x_ac_munge.m4 b/auxdir/x_ac_munge.m4
index 96e414fa493..656dd3d6133 100644
--- a/auxdir/x_ac_munge.m4
+++ b/auxdir/x_ac_munge.m4
@@ -36,7 +36,7 @@ AC_DEFUN([X_AC_MUNGE], [
test -f "$d/include/munge.h" || continue
for bit in $_x_ac_munge_libs; do
test -d "$d/$bit" || continue
-
+
_x_ac_munge_libs_save="$LIBS"
LIBS="-L$d/$bit -lmunge $LIBS"
AC_LINK_IFELSE(
@@ -54,7 +54,7 @@ AC_DEFUN([X_AC_MUNGE], [
else
MUNGE_LIBS="-lmunge"
MUNGE_CPPFLAGS="-I$x_ac_cv_munge_dir/include"
- MUNGE_LDFLAGS="-L$x_ac_cv_munge_dir/$bit"
+ MUNGE_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_munge_dir/$bit -L$x_ac_cv_munge_dir/$bit"
fi
AC_SUBST(MUNGE_LIBS)
diff --git a/configure b/configure
index dbbda629723..9e9d622de3a 100755
--- a/configure
+++ b/configure
@@ -21072,7 +21072,7 @@ $as_echo "$as_me: WARNING: unable to locate munge installation" >&2;}
else
MUNGE_LIBS="-lmunge"
MUNGE_CPPFLAGS="-I$x_ac_cv_munge_dir/include"
- MUNGE_LDFLAGS="-L$x_ac_cv_munge_dir/$bit"
+ MUNGE_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_munge_dir/$bit -L$x_ac_cv_munge_dir/$bit"
fi
--
GitLab