diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-10-20 21:41:59 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-10-20 21:44:45 +0200 |
| commit | e733486d19f60cb2e7b579cc9f8e7b01625c79a7 (patch) | |
| tree | 69b99375d08e501187890f016043ea7a0521d358 /tests | |
| parent | 8aad72ed69dbf8150c253de257e3633f1b0070ed (diff) | |
| download | gnutls-e733486d19f60cb2e7b579cc9f8e7b01625c79a7.tar.gz | |
libgnutls-extra is no more.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/openpgp-keyring.c | 5 | ||||
| -rw-r--r-- | tests/suite/Makefile.am | 4 |
3 files changed, 5 insertions, 11 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 08104a70bf..606f5ed738 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -38,8 +38,8 @@ AM_CPPFLAGS = \ -I$(top_builddir)/gl \ -I$(top_srcdir)/lib/includes \ -I$(top_builddir)/lib/includes \ - -I$(top_srcdir)/libextra/includes \ - -I$(top_builddir)/libextra/includes \ + -I$(top_srcdir)/extra/includes \ + -I$(top_builddir)/extra/includes \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/doc/examples @@ -69,12 +69,11 @@ ctests = mini-deflate simple gc set_pkcs12_cred certder certuniqueid mpi \ if ENABLE_OPENSSL ctests += openssl -openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la +openssl_LDADD = $(LDADD) ../extra/libgnutls-openssl.la endif if ENABLE_OPENPGP ctests += openpgp-auth openpgp-auth2 openpgp-keyring pgps2kgnu -openpgp_keyring_LDADD = $(LDADD) ../libextra/libgnutls-extra.la endif if HAVE_FORK diff --git a/tests/openpgp-keyring.c b/tests/openpgp-keyring.c index 9095ed8ea1..f3cf1f285a 100644 --- a/tests/openpgp-keyring.c +++ b/tests/openpgp-keyring.c @@ -26,7 +26,6 @@ #include <stdio.h> #include <gnutls/gnutls.h> -#include <gnutls/extra.h> #include <gnutls/openpgp.h> #include "utils.h" @@ -202,10 +201,6 @@ doit (void) if (debug) gnutls_global_set_log_level (2); - ret = gnutls_global_init_extra (); - if (ret < 0) - fail ("extra-init %d\n", ret); - ret = gnutls_openpgp_keyring_init (&keyring); if (ret < 0) fail ("keyring-init %d\n", ret); diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am index 6113a70593..8cfd73f8a0 100644 --- a/tests/suite/Makefile.am +++ b/tests/suite/Makefile.am @@ -26,8 +26,8 @@ AM_CPPFLAGS = \ -I$(top_builddir)/gl \ -I$(top_srcdir)/lib/includes \ -I$(top_builddir)/lib/includes \ - -I$(top_srcdir)/libextra/includes \ - -I$(top_builddir)/libextra/includes \ + -I$(top_srcdir)/extra/includes \ + -I$(top_builddir)/extra/includes \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/doc/examples \ -I$(top_srcdir)/tests/suite/ecore/src/include \ |