Enable Camellia by default.

diff --git a/NEWS b/NEWS
index dccd04a9bab537217e9ef49efe75478d8912a57f..54bc726bbf0db1f7f8ea252131a34115810c11cb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ See the end for copying conditions.
 
 * Version 2.9.6 (unreleased)
 
+** libgnutls: Enable Camellia ciphers by default.
+
 ** API and ABI modifications:
 No changes since last version.
 

diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index abe94fc2eff44cc4acfc00490431445258daf8ec..68be1d6821afd7a031b3c9f54f27d012c42a6b4b 100644 (file)
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -176,7 +176,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Allow disabling Camellia
   AC_ARG_ENABLE(camellia,
     AS_HELP_STRING([--disable-camellia], [disable Camellia cipher]),
-    enable_camellia=$enableval, enable_camellia=no)
+    enable_camellia=$enableval, enable_camellia=yes)
   AC_MSG_CHECKING([whether to disable Camellia cipher])
   if test "$enable_camellia" != "no"; then
    AC_MSG_RESULT([no])