[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-15-gb405914

[Nikos Mavrogiannopoulos]

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=b405914df9cb2a0831db9baaa5d8ed502e33af4f

The branch, master has been updated
       via  b405914df9cb2a0831db9baaa5d8ed502e33af4f (commit)
      from  2ae95bfe200b6a39bd3908bf5b74f84c643bd5e3 (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 b405914df9cb2a0831db9baaa5d8ed502e33af4f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Nov 30 22:20:46 2009 +0200

    Moved cryptodev check to lib/m4/hooks.m4 and now --enable-cryptodev 
actually works.

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

Summary of changes:
 configure.ac    |   15 ---------------
 lib/m4/hooks.m4 |   14 ++++++++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 60668e9..c0a4453 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,21 +187,6 @@ LIBS=$SAVED_LIBS
 AC_MSG_CHECKING([whether to use the included libcfg])
 AC_MSG_RESULT($libcfg_enabled)
 
-# For cryptodev
-enable_cryptodev=no
-AC_MSG_CHECKING([whether to add cryptodev support])
-AC_ARG_ENABLE(cryptodev,
-       AS_HELP_STRING([--enable-cryptodev], [enable cryptodev support]),
-enable_cryptodev=yes)
-AC_MSG_RESULT($enable_cryptodev)
-
-if test "$enable_cryptodev" = "yes"; then
-AC_CHECK_MEMBER(struct crypt_opv.iovec, 
-[AC_DEFINE([ENABLE_CRYPTODEV_IOVEC], 1, [Enable cryptodev iovec 
support])],,[[#include <crypto/cryptodev.h>]])
-AC_DEFINE([ENABLE_CRYPTODEV], 1, [Enable cryptodev support])
-fi
-
-
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index 624bd92..e51d2db 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -228,6 +228,20 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   fi
   AM_CONDITIONAL(ENABLE_SESSION_TICKET, test "$ac_enable_session_ticket" != 
"no")
 
+  # For cryptodev
+  enable_cryptodev=no
+  AC_MSG_CHECKING([whether to add cryptodev support])
+  AC_ARG_ENABLE(cryptodev,
+       AS_HELP_STRING([--enable-cryptodev], [enable cryptodev support]),
+  enable_cryptodev=yes)
+  AC_MSG_RESULT($enable_cryptodev)
+
+  if test "$enable_cryptodev" = "yes"; then
+    AC_CHECK_MEMBER(struct crypt_opv.iovec, 
+    [AC_DEFINE([ENABLE_CRYPTODEV_IOVEC], 1, [Enable cryptodev iovec 
support])],,[[#include <crypto/cryptodev.h>]])
+    AC_DEFINE([ENABLE_CRYPTODEV], 1, [Enable cryptodev support])
+  fi
+
   # For storing integers in pointers without warnings
   # 
http://developer.gnome.org/doc/API/2.0/glib/glib-Type-Conversion-Macros.html#desc
   AC_CHECK_SIZEOF(void *)


hooks/post-receive
-- 
GNU gnutls