diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-12-21 21:06:01 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-12-21 21:06:01 +0000 |
| commit | 8fc1491a609b956f7cad5b0625ee8c1dd0895e45 (patch) | |
| tree | c7dd20c72484499198d106b5ba392787651f500a /config.nmake | |
| parent | 2ab6b0f8eb121039da65297129ab495b824b45f2 (diff) | |
| download | wireshark-8fc1491a609b956f7cad5b0625ee8c1dd0895e45.tar.gz | |
Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.
svn path=/trunk/; revision=31341
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/config.nmake b/config.nmake index 46b8c38cbd..9f443cb5a0 100644 --- a/config.nmake +++ b/config.nmake @@ -246,14 +246,13 @@ C_ARES_PKG=1.7.0 # # Optional: the GNUTLS library enables ssl decryption. # -# If you have the GNUTLS library, set this to the directory where -# the lib and include files are stored. +# If you have the GNUTLS library, set this to the package version. # -# If you don't have GNUTLS, comment this line out, so that GNUTLS_DIR +# If you don't have GNUTLS, comment this line out, so that GNUTLS_PKG # isn't defined. # # Platform SDK conflicts with openssl.h header -GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.8.5-1 +GNUTLS_PKG=2.8.5-4.12 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. @@ -455,14 +454,13 @@ C_ARES_PKG=1.7.0 # # Optional: the GNUTLS library enables ssl decryption. # -# If you have the GNUTLS library, set this to the directory where -# the lib and include files are stored. +# If you have the GNUTLS library, set this to the package version. # -# If you don't have GNUTLS, comment this line out, so that GNUTLS_DIR +# If you don't have GNUTLS, comment this line out, so that GNUTLS_PKG # isn't defined. # # Platform SDK conflicts with openssl.h header -#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.8.1-1 +GNUTLS_PKG=2.8.5-3.16 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. @@ -1041,7 +1039,8 @@ NETTLE_LIBS= NETTLE_CONFIG= !ENDIF -!IFDEF GNUTLS_DIR +!IFDEF GNUTLS_PKG +GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws GNUTLS_PATH=$(GNUTLS_DIR) # /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL |