BIND 10 trac1442, updated. 7f5229256540479ef63d707a14d194c80099fab3 [1442] updated some comments in configure.ac

[BIND 10 source code commits]

The branch, trac1442 has been updated
       via  7f5229256540479ef63d707a14d194c80099fab3 (commit)
      from  7715c727d25d6430cbdbd82e40bdb7b3fa2ea843 (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 7f5229256540479ef63d707a14d194c80099fab3
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Dec 8 17:53:03 2011 +0100

    [1442] updated some comments in configure.ac

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

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

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index b4c4e41..7330665 100644
--- a/configure.ac
+++ b/configure.ac
@@ -485,8 +485,8 @@ BOTAN_INCLUDES=`${BOTAN_CONFIG} --cflags`
 
 # 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.
+# -L`botan-config --prefix/lib` in this case (if not present already).
+# Same for BOTAN_INCLUDES (but using include instead of lib) below.
 if [ $BOTAN_CONFIG --prefix >/dev/null 2>&1 ] ; then
     echo ${BOTAN_LIBS} | grep -- -L > /dev/null || \
         BOTAN_LIBS="-L`${BOTAN_CONFIG} --prefix`/lib ${BOTAN_LIBS}"
@@ -728,11 +728,11 @@ then
 				GTEST_LDFLAGS="-L$dir/lib"
 				GTEST_LDADD="-lgtest"
 				GTEST_FOUND="true"
-				# There is no gtest-config script, which
-				# is supposed to inform us whether we need
-				# pthreads as well (a gtest compile-time 
-				# option). So we still need to test that
-				# manually.
+				# There is no gtest-config script on this
+				# system, which is supposed to inform us
+				# whether we need pthreads as well (a 
+				# gtest compile-time option). So we still
+				# need to test that manually.
 				CPPFLAGS_SAVED="$CPPFLAGS"
 				CPPFLAGS="$CPPFLAGS $GTEST_INCLUDES"
 				LDFLAGS_SAVED="$LDFLAGS"
@@ -1135,6 +1135,7 @@ dnl includes too
                  ${PYTHON_LIB}
   Boost:         ${BOOST_INCLUDES}
   Botan:         ${BOTAN_INCLUDES}
+                 ${BOTAN_LDFLAGS}
                  ${BOTAN_LIBS}
   Log4cplus:     ${LOG4CPLUS_INCLUDES}
                  ${LOG4CPLUS_LIBS}