From: Josh Soref <jsoref@users.noreply.github.com>
Date: Thu, 4 Oct 2018 15:05:46 +0000 (-0400)
Subject: configure: with-libdecaf
X-Git-Tag: auth-4.2.0-alpha1~18^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee89ca583afaccfebfaeac9b9e4847f0f7477a7e;p=thirdparty%2Fpdns.git

configure: with-libdecaf
---

diff --git a/configure.ac b/configure.ac
index ac70741e01..2dadee1ceb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,7 @@ AC_CHECK_HEADERS(
 )
 
 PDNS_CHECK_LIBSODIUM
-PDNS_CHECK_LIBDECAF
+PDNS_WITH_LIBDECAF
 PDNS_CHECK_LIBCRYPTO([
 ],[
    AC_MSG_ERROR([OpenSSL/libcrypto not found])
diff --git a/docs/appendices/compiling.rst b/docs/appendices/compiling.rst
index 4c11893dce..8972ecf6f2 100644
--- a/docs/appendices/compiling.rst
+++ b/docs/appendices/compiling.rst
@@ -62,13 +62,19 @@ ed25519 support with libsodium
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The PowerDNS Authoritative Server can link with `libsodium <https://download.libsodium.org/doc/>`_ to support ed25519 (DNSSEC algorithm 15).
-To detect libsodium, use the ``--enable-libsodium`` configure option.
+To detect libsodium, use the ``--with-libsodium`` configure option.
+
+.. versionchanged:: 4.2.0
+  This option was previously ``--enable-libsodium``
 
 ed25519 and ed448 support with libdecaf
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 `libdecaf <https://sourceforge.net/projects/ed448goldilocks/>`_ is a library that allows the PowerDNS Authoritative Server to support ed25519 and Ed448 (DNSSEC algorithms 15 and 16).
-To detect libdecaf, use the ``--enable-libdecaf`` configure option.
+To detect libdecaf, use the ``--with-libdecaf`` configure option.
+
+.. versionchanged:: 4.2.0
+  This option was previously ``--enable-libdecaf``
 
 systemd notify support
 ^^^^^^^^^^^^^^^^^^^^^^
@@ -76,4 +82,3 @@ systemd notify support
 During configure, ``configure`` will attempt to detect the availability of `systemd or systemd-daemon <https://freedesktop.org/wiki/Software/systemd/>`_ headers.
 To force the use of systemd (and failing configure if the headers do not exist), use ``--enable-systemd``.
 To set the directory where the unit files should be installed, use ``--with-systemd=/path/to/unit/dir``.
-
diff --git a/m4/pdns_check_libdecaf.m4 b/m4/pdns_with_libdecaf.m4
similarity index 50%
rename from m4/pdns_check_libdecaf.m4
rename to m4/pdns_with_libdecaf.m4
index e810903f6c..9710366021 100644
--- a/m4/pdns_check_libdecaf.m4
+++ b/m4/pdns_with_libdecaf.m4
@@ -1,15 +1,15 @@
-AC_DEFUN([PDNS_CHECK_LIBDECAF],[
+AC_DEFUN([PDNS_WITH_LIBDECAF],[
   AC_MSG_CHECKING([whether we will be linking in libdecaf])
-  AC_ARG_ENABLE([libdecaf],
-    [AS_HELP_STRING([--enable-libdecaf],[use libdecaf  @<:@default=no@:>@])],
-    [enable_libdecaf=$enableval],
-    [enable_libdecaf=no]
+  AC_ARG_WITH([libdecaf],
+    [AS_HELP_STRING([--with-libdecaf],[use libdecaf  @<:@default=no@:>@])],
+    [with_libdecaf=$withval],
+    [with_libdecaf=no]
   )
-  AC_MSG_RESULT([$enable_libdecaf])
+  AC_MSG_RESULT([$with_libdecaf])
 
-  AM_CONDITIONAL([LIBDECAF],[test "x$enable_libdecaf" != "xno"])
+  AM_CONDITIONAL([LIBDECAF],[test "x$with_libdecaf" != "xno"])
 
-  AS_IF([test "x$enable_libdecaf" != "xno"],[
+  AS_IF([test "x$with_libdecaf" != "xno"],[
     save_LIBS=$LIBS
     LIBS=""
     AC_SEARCH_LIBS([decaf_ed25519_sign],[decaf],[
diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index dbf0e73e7b..c6b0b33219 100644
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -120,7 +120,7 @@ PDNS_CHECK_LIBCRYPTO([
 PDNS_CHECK_LIBCRYPTO_ECDSA
 PDNS_CHECK_LIBCRYPTO_EDDSA
 PDNS_CHECK_LIBSODIUM
-PDNS_CHECK_LIBDECAF
+PDNS_WITH_LIBDECAF
 
 PDNS_WITH_NET_SNMP
 
diff --git a/pdns/recursordist/docs/appendices/compiling.rst b/pdns/recursordist/docs/appendices/compiling.rst
index 267cab8178..cf8952a446 100644
--- a/pdns/recursordist/docs/appendices/compiling.rst
+++ b/pdns/recursordist/docs/appendices/compiling.rst
@@ -52,7 +52,10 @@ ed25519 and ed448 support with libdecaf
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 `libdecaf <https://sourceforge.net/projects/ed448goldilocks/>`_ is a library that allows the PowerDNS Recursor to support ed25519 and Ed448 (DNSSEC algorithms 15 and 16).
-To detect libdecaf, use the ``--enable-libdecaf`` configure option.
+To detect libdecaf, use the ``--with-libdecaf`` configure option.
+
+.. versionchanged:: 4.2.0
+  This option was previously ``--enable-libdecaf``
 
 Protobuf to emit DNS logs
 ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/pdns/recursordist/m4/pdns_check_libdecaf.m4 b/pdns/recursordist/m4/pdns_check_libdecaf.m4
deleted file mode 120000
index 01bef52ff5..0000000000
--- a/pdns/recursordist/m4/pdns_check_libdecaf.m4
+++ /dev/null
@@ -1 +0,0 @@
-../../../m4/pdns_check_libdecaf.m4
\ No newline at end of file
diff --git a/pdns/recursordist/m4/pdns_with_libdecaf.m4 b/pdns/recursordist/m4/pdns_with_libdecaf.m4
new file mode 120000
index 0000000000..e932fd10cc
--- /dev/null
+++ b/pdns/recursordist/m4/pdns_with_libdecaf.m4
@@ -0,0 +1 @@
+../../../m4/pdns_with_libdecaf.m4
\ No newline at end of file