build: fix build with --with-included-libtasn1

As libminitasn1.la is always built a static library, linking it twice
makes linking fail because of duplicated symbols. This also stops
including <nettle/bignum.h> as it is unused and causing compile error
on macOS homebrew:

  In file included from p11_pk.c:32:
  /opt/homebrew/Cellar/nettle/3.10.2/include/nettle/bignum.h:50:11: fatal error: 'gmp.h' file not found
  # include <gmp.h>
            ^~~~~~~
  1 error generated.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/lib/pkcs11/Makefile.am b/lib/pkcs11/Makefile.am
index 66a939af68fe1d9417cd945febc36edd9a4f1cc5..2513db005adc1d6e4b57659a4164e800d21fa187 100644 (file)
--- a/lib/pkcs11/Makefile.am
+++ b/lib/pkcs11/Makefile.am
@@ -41,9 +41,3 @@ libgnutls_pkcs11_la_SOURCES = \
        p11_pk.c p11_mac.c p11_mac.h
 
 libgnutls_pkcs11_la_LIBADD = $(P11_KIT_LIBS) $(LIBPMULTITHREAD)
-
-if ENABLE_MINITASN1
-libgnutls_pkcs11_la_LIBADD += ../minitasn1/libminitasn1.la
-else
-libgnutls_pkcs11_la_LIBADD += $(LIBTASN1_LIBS)
-endif

diff --git a/lib/pkcs11/p11_mac.c b/lib/pkcs11/p11_mac.c
index 22cfb0835ddcad8290fd87a8bd3fb1578703cf7c..0a86fec9618b995a89c32b0d350d4bd4c3e4ef3b 100644 (file)
--- a/lib/pkcs11/p11_mac.c
+++ b/lib/pkcs11/p11_mac.c
@@ -28,7 +28,6 @@
 #include "p11_provider.h"
 #include "x509/x509_int.h"
 
-#include <nettle/bignum.h>
 #include <p11-kit/pkcs11.h>
 
 struct p11_mac_ctx;

diff --git a/lib/pkcs11/p11_pk.c b/lib/pkcs11/p11_pk.c
index 84bc0c02fe6e47d0eaa72292275fa2904cfdaac9..34a9cd24bcb1e5cfd321bebc0e8233e8c096c81d 100644 (file)
--- a/lib/pkcs11/p11_pk.c
+++ b/lib/pkcs11/p11_pk.c
@@ -29,7 +29,6 @@
 
 #include <libtasn1.h>
 #include <minmax.h>
-#include <nettle/bignum.h>
 #include <p11-kit/pkcs11.h>
 
 static bool mechanism_exists(CK_MECHANISM_TYPE mech)