From: Neil Brown Date: Thu, 6 Jul 2006 03:05:11 +0000 (+1000) Subject: Only use -rpath for Kerberos libs when actually needed. X-Git-Tag: nfs-utils-1-0-9~5 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=26fff911b21943f20e3937ae3f2d29a1572d2309;p=nfs-utils.git Only use -rpath for Kerberos libs when actually needed. Avoid usage of -rpath is generally safer, and is required by Debian policy. --- diff --git a/aclocal/kerberos5.m4 b/aclocal/kerberos5.m4 index 45e220f..1dac9f0 100644 --- a/aclocal/kerberos5.m4 +++ b/aclocal/kerberos5.m4 @@ -72,6 +72,17 @@ AC_DEFUN([AC_KERBEROS_V5],[ fi AC_MSG_RESULT($KRBDIR) + dnl Check if -rpath=$(KRBDIR)/lib is needed + echo "The current KRBDIR is $KRBDIR" + if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \ + -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then + KRBLDFLAGS=""; + elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then + KRBLDFLAGS=""; + else + KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib" + fi + dnl Now check for functions within gssapi library AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) @@ -88,6 +99,7 @@ AC_DEFUN([AC_KERBEROS_V5],[ AC_SUBST([KRBDIR]) AC_SUBST([KRBLIBS]) AC_SUBST([KRBCFLAGS]) + AC_SUBST([KRBLDFLAGS]) AC_SUBST([K5VERS]) ]) diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am index d1dfe51..8d9fe84 100644 --- a/utils/gssd/Makefile.am +++ b/utils/gssd/Makefile.am @@ -38,7 +38,7 @@ gssd_SOURCES = \ write_bytes.h gssd_LDADD = $(RPCSECGSS_LIBS) $(KRBLIBS) -gssd_LDFLAGS = -Wl,-rpath=$(KRBDIR)/lib +gssd_LDFLAGS = $(KRBLDFLAGS) gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \ $(RPCSECGSS_CFLAGS) $(KRBCFLAGS)