diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-08-09 02:00:05 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-08-09 02:00:05 +0000 |
| commit | 349ca6c7af2eead307aeaf1b9d3595d1d2032b74 (patch) | |
| tree | 245a52c13b87de665ec52f8e8c3f4a946a28daa8 /Makefile.nmake | |
| parent | b0bdbfdbfa58d0d443c90d21f5da35821d57a0cf (diff) | |
Point to the newest (1.5.0-1) GnuTLS package. Since it contains
libgcrypt, enable it in the Windows build.
In packet-ipsec.c:
- Remove non-constants from variable declaration initializations.
- Use ep_alloc() in a couple of places.
- Fix an off-by-one error.
- Reduce the number of SAs in the preferences from 4 to 2. 4 made the
preferences window absolutely enormous. This is probably the wrong
way to fix this.
- Fix up whitespace.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18856 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 4f9254e46f..6a95e7d626 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -233,6 +233,7 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_LIBWIRESHARKDLL@/$(LIBWIRESHARK_CONFIG)/" \ -e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \ -e "s/@HAVE_GNUTLS@/$(GNUTLS_CONFIG)/" \ + -e "s/@HAVE_LIBGCRYPT@/$(LIBGCRYPT_CONFIG)/" \ -e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \ -e "s/@HAVE_LUA_5_1@/$(LUA_VERSION)/" \ < config.h.win32 > $@ @@ -525,7 +526,7 @@ setup: verify_tools !ENDIF !IFDEF GNUTLS_DIR @$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \ - . gnutls-1.5.0.zip + . gnutls-1.5.0-1.zip !ENDIF !IFDEF GTK2_DIR !IF "$(GTK2_INST_VERSION)" == "2.8" |