Support for X.500 strong authentication - used by DAP, DISP, DSP and DOP.

[obnox/wireshark/wip.git] / config.nmake

diff --git a/config.nmake b/config.nmake
index 2da4f1d5333db299828ecdd69ad441a567431902..6063799f2e1e6cef786afc1885e70bacdde6e7a4 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -5,9 +5,9 @@
 
 # The current Wireshark version
 # VERSION_EXTRA can be used for custom builds, e.g. "-SVN-12345"
-VERSION_MAJOR=1
-VERSION_MINOR=1
-VERSION_MICRO=0
+VERSION_MAJOR=0
+VERSION_MINOR=99
+VERSION_MICRO=4
 VERSION_EXTRA=
 VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)$(VERSION_EXTRA)
 
@@ -51,7 +51,7 @@ WINPCAP_VERSION=3.1
 # Base directory, where your libraries reside, which needs to be 
 # compiling the sources. This is only inside this file.
 #
-WIRESHARK_LIBS=C:\ethereal-win32-libs
+WIRESHARK_LIBS=C:\wireshark-win32-libs
 
 #
 # Current versions of GTK+ 1.3 require GLib 2.0.  Earlier versions of
@@ -82,7 +82,7 @@ GTK2_DIR=$(WIRESHARK_LIBS)\gtk2
 # If you have gnutls set this to the pathname where the lib and include files
 # are stored.
 # This enable ssl decryption
-#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-win32-msvc\gnutls
+GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.5.0-1
 
 # Declare the version of your gtk2 and pango. (MAJOR + MINOR Version number
 # but without MICRO version number) 
@@ -131,7 +131,7 @@ PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
 # Set NET_SNMP_DIR to the pathname of the directory in which the
 # Net-SNMP include files and library resides.
 #
-NET_SNMP_DIR=$(WIRESHARK_LIBS)\net-snmp-5.2.2
+NET_SNMP_DIR=$(WIRESHARK_LIBS)\net-snmp-5.3.1
 
 #
 # If you have GNU ADNS, set this to the pathname of the directory in
@@ -152,6 +152,12 @@ ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05
 #
 PCRE_DIR=$(WIRESHARK_LIBS)\pcre-6.4
 
+# If you have kerberos for windows (mit),
+# set this pathname to the directory where the kfw package has been
+# extracted
+# to enable kerberos/sasl/dcerpc decryption support
+KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5
+
 #
 # If you have the Nettle encryption library, set this to the pathname
 # of the directory in which the nettle package has been extracted.
@@ -216,9 +222,9 @@ POD2MAN=$(SH) pod2man
 POD2HTML=$(SH) pod2html
 
 # command for python (native windows version)
-#PYTHON="C:/python23/python.exe"
+#PYTHON="C:/python24/python.exe"
 # add native python to the path (not needed if cygwin's python is used)
-#PATH=c:\python23;$(PATH)
+#PATH=c:\python24;$(PATH)
 
 # command for python (typically cygwin's python package)
 PYTHON=env python
@@ -267,7 +273,7 @@ MAKENSIS_MODERN_UI=USE
 #
 #HHC_DIR="C:/Program Files/HTML Help Workshop/"
 
-# According to http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=403
+# According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403
 # XCOPY under Windows NT doesn't support the "/Y" flag.  This works
 # around that bug.
 # XXX - This apparently doesn't work for some versions of nmake:
@@ -287,7 +293,7 @@ LINK_PLUGINS_WITH_LIBWIRESHARK=USE
 #
 # You should not have to change anything below this comment.
 # If you do, it's a deficiency in the Makefile.nmake files;
-# either tell ethereal-dev@ethereal.com about it, including
+# either tell wireshark-dev@wireshark.org about it, including
 # details of why you had to change it, or fix config.nmake
 # and any Makefile.nmake files that need to be changed, and
 # send us the patches, along with details of why the change
@@ -346,6 +352,10 @@ PANGO_LIB_DIR=1.4.0
 PANGO_LIB_DIR=1.2.0
 !ENDIF
 
+# Enable / disable AirPcap support
+
+# AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1
+AIRPCAP_CONFIG=
 
 !IFDEF WINPCAP_VERSION
 # Nmake uses carets to escape special characters
@@ -354,11 +364,12 @@ WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1
 PCAP_FINDALLDEVS_CONFIG=^#define HAVE_PCAP_FINDALLDEVS 1
 PCAP_DATALINK_NAME_TO_VAL_CONFIG=^#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1
 PCAP_DATALINK_VAL_TO_NAME_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_NAME 1
-!IF "$(WINPCAP_VERSION)" == "3.1"
-PCAP_BREAKLOOP_CONFIG=^#define HAVE_PCAP_BREAKLOOP 1
-!ELSE
+# PCAP_BREAKLOOP won't have any benefit on Win32, but breaks compatibility with 3.0
+#!IF "$(WINPCAP_VERSION)" == "3.1"
+#PCAP_BREAKLOOP_CONFIG=^#define HAVE_PCAP_BREAKLOOP 1
+#!ELSE
 PCAP_BREAKLOOP_CONFIG=
-!ENDIF
+#!ENDIF
 WPCAP_CONSTIFIED_CONFIG=^#define WPCAP_CONSTIFIED 1
 !ELSE
 PCAP_FINDALLDEVS_CONFIG=
@@ -399,6 +410,18 @@ ADNS_LIBS=
 ADNS_CONFIG=
 !ENDIF
 
+!IFDEF KFW_DIR
+KFW_PATH=$(KFW_DIR)\bin
+KFW_CFLAGS=/I$(KFW_DIR)\inc
+KFW_LIBS=$(KFW_DIR)\lib\krb5_32.lib
+# Nmake uses carets to escape special characters
+KFW_CONFIG=^#define HAVE_MIT_KERBEROS 1
+!else
+KFW_CFLAGS=
+KFW_LIBS=
+KFW_CONFIG=
+!ENDIF
+
 !IFDEF PCRE_DIR
 PCRE_PATH=$(PCRE_DIR)\bin
 PCRE_CFLAGS=/I$(PCRE_DIR)\include
@@ -430,14 +453,20 @@ LIBWIRESHARK_CONFIG=
 
 !IFDEF GNUTLS_DIR
 GNUTLS_PATH=$(GNUTLS_DIR)
-GNUTLS_CFLAGS=/I$(GNUTLS_DIR)
-GNUTLS_LIBS=$(GNUTLS_DIR)\gnutls.lib user32.lib
+GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include
+GNUTLS_LIBS=\
+       $(GNUTLS_DIR)\bin\libtasn1-3.lib        \
+       $(GNUTLS_DIR)\bin\libgpg-error-0.lib    \
+       $(GNUTLS_DIR)\bin\libgcrypt-11.lib      \
+       $(GNUTLS_DIR)\bin\libgnutls-14.lib
 # Nmake uses carets to escape special characters
 GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1
+LIBGCRYPT_CONFIG=^#define HAVE_LIBGCRYPT 1
 !else
 GNUTLS_CFLAGS=
 GNUTLS_LIBS=
 GNUTLS_CONFIG=
+LIBGCRYPT_CONFIG=
 !ENDIF
 
 !IFDEF LUA_DIR