From a69d61aa98550ae2b2bcac88eeb94ed49da3b916 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Fri, 3 Jul 2015 18:01:13 +0200
Subject: Make ./configure.py --no-autoload --enable-modules='adler32,dlies'
 compile

---
 src/cmd/speed_pk.cpp     | 6 +++---
 src/tests/test_dlies.cpp | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/cmd/speed_pk.cpp b/src/cmd/speed_pk.cpp
index dc0ee79da..035b9a3af 100644
--- a/src/cmd/speed_pk.cpp
+++ b/src/cmd/speed_pk.cpp
@@ -47,7 +47,7 @@
   #include <botan/elgamal.h>
 #endif
 
-#if defined(BOTAN_HAS_DLIES)
+#if defined(BOTAN_HAS_DLIES) && defined(BOTAN_HAS_KDF2)
   #include <botan/dlies.h>
   #include <botan/kdf2.h>
   #include <botan/hmac.h>
@@ -614,7 +614,7 @@ void benchmark_dh(RandomNumberGenerator& rng,
    }
 #endif
 
-#if defined(BOTAN_HAS_DIFFIE_HELLMAN) && defined(BOTAN_HAS_DLIES)
+#if defined(BOTAN_HAS_DIFFIE_HELLMAN) && defined(BOTAN_HAS_DLIES) && defined(BOTAN_HAS_KDF2)
 void benchmark_dlies(RandomNumberGenerator& rng,
                      double seconds,
                      Benchmark_Report& report)
@@ -850,7 +850,7 @@ void bench_pk(RandomNumberGenerator& rng,
       benchmark_dh(rng, seconds, report);
 #endif
 
-#if defined(BOTAN_HAS_DIFFIE_HELLMAN) && defined(BOTAN_HAS_DLIES)
+#if defined(BOTAN_HAS_DIFFIE_HELLMAN) && defined(BOTAN_HAS_DLIES) && defined(BOTAN_HAS_KDF2)
    if(algo == "All" || algo == "DLIES")
       benchmark_dlies(rng, seconds, report);
 #endif
diff --git a/src/tests/test_dlies.cpp b/src/tests/test_dlies.cpp
index 8fc1f31a0..40b48c61f 100644
--- a/src/tests/test_dlies.cpp
+++ b/src/tests/test_dlies.cpp
@@ -8,6 +8,8 @@
 
 #if defined(BOTAN_HAS_DLIES)
 
+#if defined(BOTAN_HAS_DIFFIE_HELLMAN)
+
 #include "test_pubkey.h"
 
 #include <iostream>
@@ -86,6 +88,12 @@ size_t test_dlies()
 
 #else
 
+UNTESTED_WARNING(dlies);
+
+#endif // BOTAN_HAS_DIFFIE_HELLMAN
+
+#else
+
 SKIP_TEST(dlies);
 
 #endif // BOTAN_HAS_DLIES
-- 
cgit v1.2.3