BIND 10 master, updated. 6eb7a93e81027bcf67435188c1ff7788965253cb [master] use botan-config

[BIND 10 source code commits]

The branch, master has been updated
       via  6eb7a93e81027bcf67435188c1ff7788965253cb (commit)
      from  cacab413e886e8c90691428e1e3f78b77814945e (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 6eb7a93e81027bcf67435188c1ff7788965253cb
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Apr 28 21:34:55 2011 +0000

    [master] use botan-config
    
    if nothing (or --with-botan) is specified it will be taken from $PATH, if --with-botan=dir is specified it will be taken from $withval/bin
    If --without-botan is specified configure will print an error

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

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

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index ad362c2..1e014ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -375,25 +375,37 @@ fi
 AC_SUBST(USE_LCOV)
 
 # Check for Botan
-botan_path=""
+botan_path="yes"
 AC_ARG_WITH([botan],
   AC_HELP_STRING([--with-botan=PATH],
     [specify exact directory of Botan library]),
     [botan_path="$withval"])
-# If not specificed, try some common paths
-if test -z "$with_botan"; then
-    botandirs="/usr/local /usr/pkg /opt /opt/local /usr"
-    for d in $botandirs
-    do
-        if test -f $d/include/botan/botan.h; then
-            botan_path=$d
-            break
-        fi
-    done
+if test "${botan_path}" == "no" ; then
+    AC_MSG_ERROR([Need botan for libcryptolink])
 fi
-if test "${botan_path}" ; then
-    BOTAN_LDFLAGS="-L${botan_path}/lib -lbotan"
-    BOTAN_INCLUDES="-I${botan_path}/include"
+if test "${botan_path}" != "yes" ; then
+    if test -x "${botan_path}/bin/botan-config" ; then
+        BOTAN_CONFIG="${botan_path}/bin/botan-config"
+    else
+        AC_MSG_ERROR([${botan_path}/bin/botan-config not found])
+    fi
+else
+        AC_PATH_PROG([BOTAN_CONFIG], [botan-config])
+fi
+
+if test -x "${BOTAN_CONFIG}" ; then
+    BOTAN_LDFLAGS=`${BOTAN_CONFIG} --libs`
+    BOTAN_INCLUDES=`${BOTAN_CONFIG} --cflags`
+    # See python_rpath for some info on why we do this
+    if test $rpath_available = yes; then
+        BOTAN_RPATH=
+        for flag in ${BOTAN_LDFLAGS}; do
+                BOTAN_RPATH="${BOTAN_RPATH} `echo $flag | sed -ne 's/^\(\-L\)/-R/p'`"
+        done
+        BOTAN_RPATH="${PYTHON_LDFLAGS} ${python_rpath}"
+        AC_SUBST(BOTAN_RPATH)
+    fi
+
     AC_SUBST(BOTAN_LDFLAGS)
     AC_SUBST(BOTAN_INCLUDES)
 fi
@@ -871,6 +883,8 @@ dnl includes too
                  ${PYTHON_LDFLAGS}
                  ${PYTHON_LIB}
   Boost:         ${BOOST_INCLUDES}
+  Botan:         ${BOTAN_INCLUDES}
+                 ${BOTAN_LDFLAGS}
   SQLite:        $SQLITE_CFLAGS
                  $SQLITE_LIBS
 
diff --git a/src/lib/cryptolink/tests/Makefile.am b/src/lib/cryptolink/tests/Makefile.am
index c3add23..1fe4878 100644
--- a/src/lib/cryptolink/tests/Makefile.am
+++ b/src/lib/cryptolink/tests/Makefile.am
@@ -16,7 +16,7 @@ TESTS += run_unittests
 run_unittests_SOURCES = run_unittests.cc
 run_unittests_SOURCES += crypto_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDFLAGS = $(BOTAN_LDFLAGS) $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+run_unittests_LDFLAGS = ${BOTAN_LDFLAGS} ${BOTAN_RPATH} $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = $(GTEST_LDADD)
 run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la