Finally corrected a compilation issue when opencdk was installed in a non-base direct...

diff --git a/NEWS b/NEWS
index 66cdc83feead08d6135666ab7a512de3bf592da0..ffce46c193b5fc9c2088d00758fbbb5d86707d85 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Version 1.1.7
   parameters using a callback.
 - Added functions gnutls_rsa_params_cpy(), gnutls_dh_params_cpy()
   and gnutls_x509_privkey_cpy().
+- Corrected a compilation issue when opencdk was installed in a
+  non standard directory.
 
 Version 1.1.6 (24/02/2004)
 - Several bug fixes, by Arne Thomassen.

diff --git a/configure.in b/configure.in
index ac7c0ce1659b409c35c910f27035ab5cdf182b97..7877bdf6afb89d1b44a25a562f05831a3dd6007d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ GNUTLS_VERSION=$GNUTLS_MAJOR_VERSION.$GNUTLS_MINOR_VERSION.$GNUTLS_MICRO_VERSION
 
 AC_DEFINE_UNQUOTED(GNUTLS_VERSION, "$GNUTLS_VERSION", [version of gnutls])
 
-GNUTLS_GCRYPT_VERSION=1.1.90
+GNUTLS_GCRYPT_VERSION=1:1.1.90
 GNUTLS_LIBTASN1_VERSION=0.2.5
 AC_DEFINE_UNQUOTED(GNUTLS_GCRYPT_VERSION, "$GNUTLS_GCRYPT_VERSION", [version of gcrypt])
 AC_DEFINE_UNQUOTED(GNUTLS_LIBTASN1_VERSION, "$GNUTLS_LIBTASN1_VERSION", [version of libtasn1])

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d1142c5afcbadef2f4f481b64b993b260e0d7935..b6d2f9808a177dfcb7188090f65d0e79955b6f2f 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../libextra -Iminitasn1/ -I../includes $(LIBGCRYPT_CFLAGS)
+INCLUDES = -I../libextra -Iminitasn1/ -I../includes $(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS)
 bin_SCRIPTS = libgnutls-config
 
 m4datadir = $(datadir)/aclocal

diff --git a/libextra/openpgp/openpgp.c b/libextra/openpgp/openpgp.c
index 5ebdab76252a835f3883be79b56a603c105c2c6c..3aac1bd6cf4dc81263f4455208e649abe5da5d32 100644 (file)
--- a/libextra/openpgp/openpgp.c
+++ b/libextra/openpgp/openpgp.c
@@ -449,7 +449,7 @@ gnutls_openpgp_key_get_id( gnutls_openpgp_key key,
 {
     cdk_packet_t pkt;
     cdk_pkt_pubkey_t pk = NULL;
-    unsigned long kid[2];
+    unsigned int kid[2];
   
     if( !key || !keyid ) {
         gnutls_assert( );

diff --git a/libextra/openpgp/xml.c b/libextra/openpgp/xml.c
index d95e10e85a15a9fa678c3178dcb3c74842f5c449..251bd25b6d20555b5f714d46d2049b9dab4ccd1f 100644 (file)
--- a/libextra/openpgp/xml.c
+++ b/libextra/openpgp/xml.c
@@ -140,7 +140,7 @@ xml_add_key( gnutls_string *xmlkey, int ext, cdk_pkt_pubkey_t pk, int sub )
     const char *algo, *s;
     char keyid[16], fpr[41], tmp[32];
     uint8 fingerpr[20];
-    unsigned long kid[2];
+    unsigned int kid[2];
     int i = 0, rc = 0;
 
     if( !xmlkey || !pk ) {
@@ -254,7 +254,7 @@ xml_add_sig( gnutls_string *xmlkey, int ext, cdk_pkt_signature_t sig )
 {
     const char *algo, *s;
     char tmp[32], keyid[16];
-    unsigned long kid[2];
+    unsigned int kid[2];
     int rc = 0;
 
     if( !xmlkey || !sig ) {