Improved nettle check for registration of accelerated ciphers.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2a93e41c873fa6f873ef571abbfbc4a1ef07caed..612ec4b26636b28f9c332acab17393bf205d4a13 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,16 +22,12 @@ ACLOCAL_AMFLAGS = -I ../m4 -I ../gl/m4
 
 BUILT_SOURCES = pkix_asn1_tab.c gnutls_asn1_tab.c
 
-SUBDIRS = includes x509 auth ext algorithms extras
+SUBDIRS = includes x509 auth ext algorithms extras accelerated
 
 if ENABLE_MINITASN1
 SUBDIRS += minitasn1
 endif
 
-if ENABLE_NETTLE
-SUBDIRS += accelerated 
-endif
-
 localedir = $(datadir)/locale
 
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS)

diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index f1a1982fa05b3074588d09aa203f619229a11123..37958ba3e5c9a164b57a08b0521fdfd51e8d5c22 100644 (file)
--- a/lib/accelerated/Makefile.am
+++ b/lib/accelerated/Makefile.am
@@ -38,11 +38,13 @@ EXTRA_DIST = accelerated.h cryptodev.h
 libaccelerated_la_SOURCES = accelerated.c cryptodev.c cryptodev-gcm.c
 libaccelerated_la_LIBADD =
 
+if ENABLE_NETTLE
 if ASM_X86
 SUBDIRS += x86
 AM_CFLAGS += -DASM_X86
 libaccelerated_la_LIBADD += x86/libx86.la
 endif
+endif
 
 if ASM_X86_32
 AM_CFLAGS += -DASM_X86_32

diff --git a/lib/accelerated/accelerated.c b/lib/accelerated/accelerated.c
index 7ad1cb5b287c3df168e4bae89e01e6ab1da50a21..dc2ba46e1c3e622d0a5d8433d11cbdf98875ba1a 100644 (file)
--- a/lib/accelerated/accelerated.c
+++ b/lib/accelerated/accelerated.c
@@ -29,7 +29,7 @@
 
 void _gnutls_register_accel_crypto(void)
 {
-#if defined(ASM_X86)
+#if defined(ASM_X86) && defined(ENABLE_NETTLE)
        if (gnutls_have_cpuid() != 0) {
                register_x86_crypto();
        }