From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 30 Nov 2009 20:20:46 +0000 (+0200)
Subject: Moved cryptodev check to lib/m4/hooks.m4 and now --enable-cryptodev actually works.
X-Git-Tag: gnutls_2_9_10~195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b405914df9cb2a0831db9baaa5d8ed502e33af4f;p=thirdparty%2Fgnutls.git

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

diff --git a/configure.ac b/configure.ac
index 60668e955c..c0a4453f28 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 624bd924c2..e51d2dba13 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 *)