Properly handle ipcipher support when libcrypto is not available

diff --git a/m4/pdns_enable_ipcipher.m4 b/m4/pdns_enable_ipcipher.m4
index 9b0343c3c22c75ed0b14de9e779e05bb7a03249e..daa92c32a116eabb403fa2418dfd8d31fbccf94f 100644 (file)
--- a/m4/pdns_enable_ipcipher.m4
+++ b/m4/pdns_enable_ipcipher.m4
@@ -1,17 +1,25 @@
 AC_DEFUN([PDNS_ENABLE_IPCIPHER], [
   AC_MSG_CHECKING([whether to enable ipcipher support])
+  HAVE_IPCIPHER=0
   AC_ARG_ENABLE([ipcipher],
-    AS_HELP_STRING([--enable-ipcipher], [enable ipcipher support (requires libcrypto) @<:@default=yes@:>@]),
+    AS_HELP_STRING([--enable-ipcipher], [enable ipcipher support (requires libcrypto) @<:@default=auto@:>@]),
     [enable_ipcipher=$enableval],
-    [enable_ipcipher=yes]
+    [enable_ipcipher=auto]
   )
   AC_MSG_RESULT([$enable_ipcipher])
-  AM_CONDITIONAL([IPCIPHER], [test "x$enable_ipcipher" != "xno"])
 
-  AM_COND_IF([IPCIPHER], [
-    AM_COND_IF([HAVE_LIBCRYPTO], [
-      AC_DEFINE([HAVE_IPCIPHER], [1], [Define to 1 if you enable ipcipher support])
-    ],[
+  AS_IF([test "x$enable_ipcipher" != "xno"], [
+    AS_IF([test "x$enable_ipcipher" = "xyes" -o "x$enable_ipcipher" = "xauto"], [
+      AM_COND_IF([HAVE_LIBCRYPTO], [
+        AC_DEFINE([HAVE_IPCIPHER], [1], [Define to 1 if you enable ipcipher support])
+        [HAVE_IPCIPHER=1]
+      ])
+    ])
+  ])
+  AM_CONDITIONAL([IPCIPHER], [test "x$HAVE_IPCIPHER" != "x0"])
+
+  AS_IF([test "x$enable_ipcipher" = "xyes"], [
+    AS_IF([test x"$HAVE_IPCIPHER" = "x0"], [
       AC_MSG_ERROR([ipcipher support requested but libcrypto is not available])
     ])
   ])

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 9df49229cd2c9ee9ddef8d77bd1076b9e7fd3e47..1846f17580e2a5aa3bd3768205e59fb70586d783 100644 (file)
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -183,7 +183,7 @@ AS_IF([test "x$systemd" != "xn"],
   [AC_MSG_NOTICE([systemd: yes])],
   [AC_MSG_NOTICE([systemd: no])]
 )
-AS_IF([test "x$enable_ipcipher" != "xno"],
+AS_IF([test "x$HAVE_IPCIPHER" = "x1"],
   [AC_MSG_NOTICE([ipcipher: yes])],
   [AC_MSG_NOTICE([ipcipher: no])]
 )