BIND 10 trac1640, updated. ec46569c91883d85a961cd235650e00dae2ccceb [trac1640] try different versioned botan-config files

[BIND 10 source code commits]

The branch, trac1640 has been updated
       via  ec46569c91883d85a961cd235650e00dae2ccceb (commit)
      from  789a59358ffa4f403bf84016f703f5cedafa22ab (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 ec46569c91883d85a961cd235650e00dae2ccceb
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Fri Jan 27 15:22:34 2012 -0600

    [trac1640] try different versioned botan-config files
    
    This repeats same functionality twice. This should be cleaned up.

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

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

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 8889ddc..bf1f80a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -490,7 +490,16 @@ 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])
+        BOTAN_VERSIONS="1.10 1.9 1.8"
+        for version in $BOTAN_VERSIONS; do
+             if test -x "${botan_path}/bin/botan-config-${version}" ; then
+                 BOTAN_CONFIG="${botan_path}/bin/botan-config-${version}"
+                 break
+             fi
+       done
+    fi
+    if ! test "${BOTAN_CONFIG}" ; then
+        AC_MSG_ERROR([botan-config not found])
     fi
 else
     # First see if pkg-config knows of it.
@@ -514,7 +523,20 @@ else
     fi
     # If we had no pkg-config, or it didn't know about botan, use botan-config
     if test "$BOTAN_CONFIG" = "" ; then
-        AC_PATH_PROG([BOTAN_CONFIG], [botan-config])
+        if test -x "${botan_path}/bin/botan-config" ; then
+            BOTAN_CONFIG="${botan_path}/bin/botan-config"
+        else
+            BOTAN_VERSIONS="1.10 1.9 1.8"
+            for version in $BOTAN_VERSIONS; do
+                if test -x "${botan_path}/bin/botan-config-${version}" ; then
+                    BOTAN_CONFIG="${botan_path}/bin/botan-config-${version}"
+                    break
+                fi
+            done
+        fi
+        if ! test "${BOTAN_CONFIG}" ; then
+            AC_MSG_ERROR([botan-config not found])
+        fi
     fi
 fi