From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 24 Jul 2017 10:09:05 +0000 (+0000)
Subject: - Fix DSA configure switch (--disable dsa) for libnettle and libnss.
X-Git-Tag: release-1.6.6rc1~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8abb85e4b2f291c6dfd422c4a6007d7cbd0553b2;p=thirdparty%2Funbound.git

- Fix DSA configure switch (--disable dsa) for libnettle and libnss.


git-svn-id: file:///svn/unbound/trunk@4285 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/configure b/configure
index 9b8496c4b..ce8da0369 100755
--- a/configure
+++ b/configure
@@ -18053,6 +18053,7 @@ case "$enable_dsa" in
       ;;
     *)
       # detect if DSA is supported, and turn it off if not.
+      if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then
       ac_fn_c_check_func "$LINENO" "DSA_SIG_new" "ac_cv_func_DSA_SIG_new"
 if test "x$ac_cv_func_DSA_SIG_new" = xyes; then :
 
@@ -18067,6 +18068,13 @@ else
                fi
 fi
 
+      else
+
+cat >>confdefs.h <<_ACEOF
+#define USE_DSA 1
+_ACEOF
+
+      fi
       ;;
 esac
 
diff --git a/configure.ac b/configure.ac
index ccbb33d49..c98a6938f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -912,10 +912,14 @@ case "$enable_dsa" in
       ;;
     *)
       # detect if DSA is supported, and turn it off if not.
+      if test $USE_NSS = "no" -a $USE_NETTLE = "no"; then
       AC_CHECK_FUNC(DSA_SIG_new, [
       AC_DEFINE_UNQUOTED([USE_DSA], [1], [Define this to enable DSA support.])
       ], [if test "x$enable_dsa" = "xyes"; then AC_MSG_ERROR([OpenSSL does not support DSA and you used --enable-dsa.])
                fi ])
+      else
+      AC_DEFINE_UNQUOTED([USE_DSA], [1], [Define this to enable DSA support.])
+      fi
       ;;
 esac
 
diff --git a/doc/Changelog b/doc/Changelog
index c01e6565b..b7206b763 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -8,6 +8,7 @@
 	  unless verbosity is high.
 	- remove warning from windows compile.
 	- Fix compile with libnettle
+	- Fix DSA configure switch (--disable dsa) for libnettle and libnss.
 
 17 July 2017: Wouter
 	- Fix #1350: make cachedb backend configurable (from JINMEI Tatuya).