configure: with-libssl

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index f1d631ad70129a195499d21ff761ac667ecd9726..5877aedfa474bd41ad2430a39f338071b1c5ddd9 100644 (file)
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -52,7 +52,7 @@ PDNS_CHECK_LUA_HPP
 
 DNSDIST_ENABLE_DNS_OVER_TLS
 DNSDIST_WITH_GNUTLS
-DNSDIST_CHECK_LIBSSL
+DNSDIST_WITH_LIBSSL
 AS_IF([test "x$enable_dns_over_tls" != "xno"], [
   AS_IF([test "$HAVE_LIBSSL" = "1"], [
     # we need libcrypto if libssl is enabled

diff --git a/pdns/dnsdistdist/m4/dnsdist_check_libssl.m4 b/pdns/dnsdistdist/m4/dnsdist_with_libssl.m4
similarity index 53%
rename from pdns/dnsdistdist/m4/dnsdist_check_libssl.m4
rename to pdns/dnsdistdist/m4/dnsdist_with_libssl.m4
index dbf1961bdeff63d9daea3de225d38efd05ea796c..79489448d68f13752a05f74dedbbcf6c2c1e0160 100644 (file)
--- a/pdns/dnsdistdist/m4/dnsdist_check_libssl.m4
+++ b/pdns/dnsdistdist/m4/dnsdist_with_libssl.m4
@@ -1,15 +1,15 @@
-AC_DEFUN([DNSDIST_CHECK_LIBSSL], [
+AC_DEFUN([DNSDIST_WITH_LIBSSL], [
   AC_MSG_CHECKING([whether we will be linking in OpenSSL libssl])
   HAVE_LIBSSL=0
-  AC_ARG_ENABLE([libssl],
-    AS_HELP_STRING([--enable-libssl],[use OpenSSL libssl @<:@default=auto@:>@]),
-    [enable_libssl=$enableval],
-    [enable_libssl=auto],
+  AC_ARG_WITH([libssl],
+    AS_HELP_STRING([--with-libssl],[use OpenSSL libssl @<:@default=auto@:>@]),
+    [with_libssl=$withval],
+    [with_libssl=auto],
   )
-  AC_MSG_RESULT([$enable_libssl])
+  AC_MSG_RESULT([$with_libssl])
 
-  AS_IF([test "x$enable_libssl" != "xno"], [
-    AS_IF([test "x$enable_libssl" = "xyes" -o "x$enable_libssl" = "xauto"], [
+  AS_IF([test "x$with_libssl" != "xno"], [
+    AS_IF([test "x$with_libssl" = "xyes" -o "x$with_libssl" = "xauto"], [
       PKG_CHECK_MODULES([LIBSSL], [libssl], [
         [HAVE_LIBSSL=1]
         AC_DEFINE([HAVE_LIBSSL], [1], [Define to 1 if you have OpenSSL libssl])
@@ -17,7 +17,7 @@ AC_DEFUN([DNSDIST_CHECK_LIBSSL], [
     ])
   ])
   AM_CONDITIONAL([HAVE_LIBSSL], [test "x$LIBSSL_LIBS" != "x"])
-  AS_IF([test "x$enable_libssl" = "xyes"], [
+  AS_IF([test "x$with_libssl" = "xyes"], [
     AS_IF([test x"$LIBSSL_LIBS" = "x"], [
       AC_MSG_ERROR([OpenSSL libssl requested but libraries were not found])
     ])