BIND 10 trac890, updated. 677cebce1708ba85e46a0712d939176dc7ab7a94 [trac890] re-added BOTAN_RPATH to cryptolink/Makefile.am. according to the libtool manual, http://www.gnu.org/software/libtool/manual/html_node/Link-mode.html the intent seems to propagate -R from a library's dependency_libs to the program that uses the library. On our systems libtool doesn't do this propagation and we needed the global rpath, but if the documentation is correct, there may be a version of libtool that works.

[BIND 10 source code commits]

The branch, trac890 has been updated
       via  677cebce1708ba85e46a0712d939176dc7ab7a94 (commit)
      from  f0fe344b15c3e1be2604201000e6c9fbe6a910bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 677cebce1708ba85e46a0712d939176dc7ab7a94
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon May 2 11:21:12 2011 -0700

    [trac890] re-added BOTAN_RPATH to cryptolink/Makefile.am.
    according to the libtool manual,
    http://www.gnu.org/software/libtool/manual/html_node/Link-mode.html
    the intent seems to propagate -R from a library's dependency_libs to
    the program that uses the library.  On our systems libtool doesn't do
    this propagation and we needed the global rpath, but if the documentation
    is correct, there may be a version of libtool that works.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                   |    1 +
 src/lib/cryptolink/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 66e62e3..dcd472c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,6 +410,7 @@ if test -x "${BOTAN_CONFIG}" ; then
         for flag in ${BOTAN_LDFLAGS}; do
                 BOTAN_RPATH="${BOTAN_RPATH} `echo $flag | sed -ne 's/^\(\-L\)/-R/p'`"
         done
+	AC_SUBST(BOTAN_RPATH)
         LDFLAGS="$BOTAN_RPATH $LDFLAGS"
     fi
 
diff --git a/src/lib/cryptolink/Makefile.am b/src/lib/cryptolink/Makefile.am
index c02adde..93f3443 100644
--- a/src/lib/cryptolink/Makefile.am
+++ b/src/lib/cryptolink/Makefile.am
@@ -11,4 +11,4 @@ lib_LTLIBRARIES = libcryptolink.la
 libcryptolink_la_SOURCES = cryptolink.h cryptolink.cc
 libcryptolink_la_SOURCES += crypto_hmac.h crypto_hmac.cc
 
-libcryptolink_la_LIBADD = ${BOTAN_LDFLAGS}
+libcryptolink_la_LIBADD = ${BOTAN_LDFLAGS} ${BOTAN_RPATH}