From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 10 Sep 2009 19:53:00 +0000 (+0200)
Subject: Enable Camellia by default.
X-Git-Tag: gnutls_2_9_6~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7f6ade4f4047de72ed5ddf831ea0ec5a5077936;p=thirdparty%2Fgnutls.git

Enable Camellia by default.
---

diff --git a/NEWS b/NEWS
index dccd04a9ba..54bc726bbf 100644
--- 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 abe94fc2ef..68be1d6821 100644
--- 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])