BIND 10 master, updated. 177b356c926307e94a95e6e2de7a3f0ee7124021 [master] Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  177b356c926307e94a95e6e2de7a3f0ee7124021 (commit)
       via  1867180c5e2263baf319514b5b765b8eb4049c08 (commit)
      from  6c554c8b4e37daeaa4182d05af69a40a0b78cea2 (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 177b356c926307e94a95e6e2de7a3f0ee7124021
Merge: 1867180 6c554c8
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Apr 28 16:36:36 2011 -0700

    [master] Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

commit 1867180c5e2263baf319514b5b765b8eb4049c08
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Apr 28 16:36:00 2011 -0700

    [master] [master] added workaround for freebsd about ldflags and cppflags for botan:
    use -L`botan-config --prefix`/lib and -I`botan-config --prefix`/include.

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

Summary of changes:
 configure.ac |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 6bd8bea..d3faebf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,7 +395,15 @@ fi
 
 if test -x "${BOTAN_CONFIG}" ; then
     BOTAN_LDFLAGS=`${BOTAN_CONFIG} --libs`
+    # We expect botan-config --libs to contain -L<path_to_libbotan>, but
+    # this is not always the case.  As a heuristics workaround we add
+    # -L`botan-config --prefix/lib` in this case.  Same for BOTAN_INCLUDES
+    # (but using include instead of lib) below.
+    echo ${BOTAN_LDFLAGS} | grep -- -L > /dev/null || \
+	    BOTAN_LDFLAGS="-L`${BOTAN_CONFIG} --prefix`/lib ${BOTAN_LDFLAGS}"
     BOTAN_INCLUDES=`${BOTAN_CONFIG} --cflags`
+    echo ${BOTAN_INCLUDES} | grep -- -I > /dev/null || \
+	    BOTAN_INCLUDES="-I`${BOTAN_CONFIG} --prefix`/include ${BOTAN_INCLUDES}"
     # See python_rpath for some info on why we do this
     if test $rpath_available = yes; then
         BOTAN_RPATH=