From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 4 Oct 2011 18:37:08 +0000 (+0200)
Subject: libextra is not needed for neither gnutls-cli or serv.
X-Git-Tag: gnutls_3_0_4~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=615894e4ceef4c3bdbfbaf7b2278b0d03400122f;p=thirdparty%2Fgnutls.git

libextra is not needed for neither gnutls-cli or serv.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 9e6a0dd81f..4e459d0a69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,7 @@ gnutls_serv_SOURCES =				\
   common.h common.c				\
   certtool-common.h \
   $(PKCS11_SRCS)
-gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
+gnutls_serv_LDADD = ../lib/libgnutls.la
 gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la
 gnutls_serv_LDADD += $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB)
 noinst_LTLIBRARIES += libcmd-serv.la
@@ -79,7 +79,7 @@ libcmd_psk_la_SOURCES = psk.gaa psk-gaa.h psk-gaa.c
 BENCHMARK_SRCS = benchmark-cipher.c benchmark.c benchmark.h benchmark-tls.c
 
 gnutls_cli_SOURCES = cli.c common.h common.c $(PKCS11_SRCS) $(BENCHMARK_SRCS)
-gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la
+gnutls_cli_LDADD = ../lib/libgnutls.la
 gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la
 gnutls_cli_LDADD += $(LTLIBGCRYPT) $(LIBSOCKET) $(GETADDRINFO_LIB) $(LIB_CLOCK_GETTIME)
 noinst_LTLIBRARIES += libcmd-cli.la
diff --git a/src/serv.c b/src/serv.c
index 1fcda5c7cf..6301b1e7a4 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -33,7 +33,6 @@
 #include <sys/types.h>
 #include <string.h>
 #include <gnutls/gnutls.h>
-#include <gnutls/extra.h>
 #include <gnutls/openpgp.h>
 #include <sys/time.h>
 #include <sys/select.h>
@@ -935,12 +934,6 @@ main (int argc, char **argv)
       exit (1);
     }
 
-  if ((ret = gnutls_global_init_extra ()) < 0)
-    {
-      fprintf (stderr, "global_init_extra: %s\n", gnutls_strerror (ret));
-      exit (1);
-    }
-
 #ifdef ENABLE_PKCS11
   pkcs11_common ();
 #endif