Fix.

3 files changed, 6 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index 188086d681..b648983918 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,10 +22,11 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-SUBDIRS = lgl gl includes lib libextra src doc tests po
+SUBDIRS = lgl gl includes lib libextra
 if ENABLE_PKCS11_SCUTE
 SUBDIRS += pkcs11
 endif
+SUBDIRS += src doc tests po
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lgl/m4
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 2110341f4c..44a640cdf7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,7 +56,7 @@ gnutls_cli_SOURCES = cli.gaa cli-gaa.h cli-gaa.c cli.c common.h	\
 gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la	\
 	$(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
 if ENABLE_PKCS11_SCUTE
-gnutls_cli_LDADD = ../pkcs11/libgnutls-pkcs11.la
+gnutls_cli_LDADD += ../pkcs11/libgnutls-pkcs11.la
 endif
 
 gnutls_cli_debug_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c	\
diff --git a/src/cli.c b/src/cli.c
index 379630ea76..1cf1c693a4 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -304,7 +304,8 @@ load_keys (void)
 
 #if HAVE_PKCS11_SCUTE
 int
-sign_func (gnutls_session_t session,
+sign_func (void *userdata,
+	   gnutls_session_t session,
 	   gnutls_datum_t * cert,
 	   const gnutls_datum_t * hash,
 	   gnutls_datum_t * signature)
@@ -409,7 +410,7 @@ cert_callback (gnutls_session session,
 	    }
 	  else
 	    {
-	      gnutls_set_sign_function (session, sign_func);
+	      gnutls_x509_sign_callback_set (session, sign_func, NULL);
 
 	      st->key.x509 = NULL;