[SCM] GNU gnutls branch, master, updated. gnutls_2_9_5-2-ge7f6ade

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=e7f6ade4f4047de72ed5ddf831ea0ec5a5077936

The branch, master has been updated
       via  e7f6ade4f4047de72ed5ddf831ea0ec5a5077936 (commit)
      from  64c80b6d08a071c3a2ae223daefd609ce0b25ccb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e7f6ade4f4047de72ed5ddf831ea0ec5a5077936
Author: Simon Josefsson <address@hidden>
Date:   Thu Sep 10 21:53:00 2009 +0200

    Enable Camellia by default.

-----------------------------------------------------------------------

Summary of changes:
 NEWS            |    2 ++
 lib/m4/hooks.m4 |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index dccd04a..54bc726 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 abe94fc..68be1d6 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])


hooks/post-receive
-- 
GNU gnutls