diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-05-13 08:27:37 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-05-13 08:27:37 +0000 |
| commit | 0a8b936bd02cd6b04f87c9a179532ac8d22655ff (patch) | |
| tree | 678b7febcb54ab2f80648a05d9a1bd4e48189412 /libextra | |
| parent | 962b647a10e13a2098d81faaccca9e4363477c64 (diff) | |
| download | gnutls-0a8b936bd02cd6b04f87c9a179532ac8d22655ff.tar.gz | |
some fixes in the compilation system.
Diffstat (limited to 'libextra')
| -rw-r--r-- | libextra/Makefile.am | 3 | ||||
| -rw-r--r-- | libextra/gnutls_extra.c | 2 | ||||
| -rw-r--r-- | libextra/gnutls_openpgp.c | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/libextra/Makefile.am b/libextra/Makefile.am index ed10ceee4b..b8a97332f1 100644 --- a/libextra/Makefile.am +++ b/libextra/Makefile.am @@ -31,6 +31,7 @@ lib_LTLIBRARIES = libgnutls-extra.la endif if ENABLE_OPENPGP +PGP_SOURCES = gnutls_openpgp.c if ENABLE_INCLUDED_OPENCDK SUBDIRS = openpgp opencdk PGP_OBJECTS = openpgp/libpgp.la opencdk/libopencdk.la @@ -53,7 +54,7 @@ endif COBJECTS_EXTRA = ext_srp.c \ gnutls_srp.c auth_srp.c auth_srp_passwd.c auth_srp_sb64.c \ - gnutls_extra.c auth_srp_rsa.c gnutls_openpgp.c + gnutls_extra.c auth_srp_rsa.c $(PGP_SOURCES) libgnutls_extra_la_LDFLAGS = $(libgnutls_extra_version_script_cmd) \ diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c index ebf6607421..42283cf41c 100644 --- a/libextra/gnutls_extra.c +++ b/libextra/gnutls_extra.c @@ -168,7 +168,7 @@ extern OPENPGP_KEY_DEINIT _E_gnutls_openpgp_key_deinit; extern OPENPGP_PRIVKEY_DEINIT _E_gnutls_openpgp_privkey_deinit; static void _gnutls_add_openpgp_functions(void) { -#ifdef HAVE_LIBOPENCDK +#ifdef USE_OPENPGP _E_gnutls_openpgp_verify_key = _gnutls_openpgp_verify_key; _E_gnutls_openpgp_get_raw_key_expiration_time = _gnutls_openpgp_get_raw_key_expiration_time; _E_gnutls_openpgp_get_raw_key_creation_time = _gnutls_openpgp_get_raw_key_creation_time; diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c index d3661e37ba..64aa0ccb21 100644 --- a/libextra/gnutls_openpgp.c +++ b/libextra/gnutls_openpgp.c @@ -26,8 +26,6 @@ #include "gnutls_datum.h" #include "gnutls_global.h" #include <openpgp/gnutls_openpgp.h> - -#ifdef HAVE_LIBOPENCDK #include <strfile.h> #include <gnutls_str.h> #include <stdio.h> @@ -1144,5 +1142,3 @@ int gnutls_certificate_set_openpgp_key(gnutls_certificate_credentials res, } -#endif /* HAVE_LIBOPENCDK */ - |