BIND 10 master, updated. ac7ff7f2226bdba60809b70caa82659b77c6e2e6 [trac890] added some more detailed comments about the addition of rpath to LDFLAGS.

[BIND 10 source code commits]

The branch, master has been updated
       via  ac7ff7f2226bdba60809b70caa82659b77c6e2e6 (commit)
       via  677cebce1708ba85e46a0712d939176dc7ab7a94 (commit)
       via  f0fe344b15c3e1be2604201000e6c9fbe6a910bc (commit)
      from  9e183cb0529aeb9f0674b5727affa223d8fc9db5 (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 ac7ff7f2226bdba60809b70caa82659b77c6e2e6
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon May 2 11:34:14 2011 -0700

    [trac890] added some more detailed comments about the addition of rpath
    to LDFLAGS.

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.

commit f0fe344b15c3e1be2604201000e6c9fbe6a910bc
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon May 2 10:54:44 2011 -0700

    [trac890] proposed workaround fix to the botan rpath problem: specify the
    rpath in the global LDFLAGS.
    also remove BOTAN_RPATH from libcryptolink/Makefile.am (which is not part
    of fix, but is simply unnecessary)

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

Summary of changes:
 configure.ac |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index d3faebf..acd8c93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,7 +410,16 @@ 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)
+	AC_SUBST(BOTAN_RPATH)
+
+	# According to the libtool manual, it should be sufficient if we
+	# specify the "-R libdir" in our wrapper library of botan (no other
+	# programs will need libbotan directly); "libdir" should be added to
+	# the program's binary image.  But we've seen in our build environments
+	# that (some versions of?) libtool doesn't propagate -R as documented,
+	# and it caused a linker error at run time.  To work around this, we
+	# also add the rpath to the global LDFLAGS.
+        LDFLAGS="$BOTAN_RPATH $LDFLAGS"
     fi
 
     AC_SUBST(BOTAN_LDFLAGS)
@@ -419,7 +428,7 @@ fi
 
 CPPFLAGS_SAVED=$CPPFLAGS
 CPPFLAGS="$BOTAN_INCLUDES $CPPFLAGS"
-LDFLAGS_SAVED=$LDFLAGS
+LDFLAGS_SAVED="$LDFLAGS"
 LDFLAGS="$BOTAN_LDFLAGS $LDFLAGS"
 
 AC_CHECK_HEADERS([botan/botan.h],,AC_MSG_ERROR([Missing required header files.]))
@@ -884,6 +893,7 @@ Flags:
   DEFS:          $DEFS
   CPPFLAGS:      $CPPFLAGS
   CXXFLAGS:      $CXXFLAGS
+  LDFLAGS:       $LDFLAGS
   B10_CXXFLAGS:  $B10_CXXFLAGS
 dnl includes too
   Python:        ${PYTHON_INCLUDES}