diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2009-02-09 09:38:58 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2009-02-09 09:38:58 +0000 |
| commit | fe53605ff9610fa6981051fdb427d32420980065 (patch) | |
| tree | de1cd083daa5cac8b7dc990c6248bb0d113f9af9 /config.nmake | |
| parent | 5cc1c254211759a27597a3c4c63acbe15973d684 (diff) | |
Update GnuTls to gnutls-2.6.4-1
svn path=/trunk/; revision=27398
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config.nmake b/config.nmake index 0f7c28e1a8..bda2183f0f 100644 --- a/config.nmake +++ b/config.nmake @@ -236,8 +236,8 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0 # isn't defined. # # Platform SDK conflicts with openssl.h header -#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.3.8-1 -GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.3-1 +#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.3-1 +GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.4-1 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. @@ -820,7 +820,7 @@ NETTLE_CONFIG= !IFDEF GNUTLS_DIR GNUTLS_PATH=$(GNUTLS_DIR) # /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash -GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT +GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL GNUTLS_LIBS=\ $(GNUTLS_DIR)\bin\libtasn1-3.lib \ $(GNUTLS_DIR)\bin\libgpg-error-0.lib \ |