From Mike Duigou updates to JXTA

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

diff --git a/config.nmake b/config.nmake
index 27244b6940d6de77216286a472db67ed1648414e..1421f7d0bd4f4e192a1f075bf57d924bf3767d0f 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -4,7 +4,7 @@
 # in the file README.win32.
 
 # The current Ethereal version
-VERSION=0.10.6
+VERSION=0.10.9
 
 #
 # The RC_VERSION should be comma-separated, not dot-separated, 
@@ -17,7 +17,7 @@ VERSION=0.10.6
 # number to be correctly displayed in the explorer properties dialog
 # for the executables, and XP's tooltip, rather than 0.0.0.0."
 #
-RC_VERSION=0,10,6
+RC_VERSION=0,10,9
 
 # The version of the wiretap library
 WTAP_VERSION=0.1
@@ -89,7 +89,7 @@ GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp
 # If you don't have Zlib, comment this line out, so that Zlib isn't
 # defined.
 #
-ZLIB_DIR=$(ETHEREAL_LIBS)\zlib121-dll
+ZLIB_DIR=$(ETHEREAL_LIBS)\zlib122-dll
 
 #
 # Set PCAP_DIR to the pathname of the directory in which the WinPcap
@@ -101,7 +101,7 @@ PCAP_DIR=$(ETHEREAL_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=$(ETHEREAL_LIBS)\net-snmp-5.1
+NET_SNMP_DIR=$(ETHEREAL_LIBS)\net-snmp-5.1.2
 
 #
 # If you have GNU ADNS, set this to the pathname of the directory in
@@ -110,7 +110,7 @@ NET_SNMP_DIR=$(ETHEREAL_LIBS)\net-snmp-5.1
 # If you don't have GNU ADNS, comment this line out, so that ADNS_DIR
 # isn't defined.
 #
-ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-03
+ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-04
 
 #
 # If you have the PCRE (Perl Compatible Regular Expressions) library,
@@ -122,6 +122,15 @@ ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-03
 #
 PCRE_DIR=$(ETHEREAL_LIBS)\pcre-4.4
 
+#
+# If you have the Nettle encryption library, set this to the pathname
+# of the directory in which the nettle package has been extracted.
+#
+# If you don't have Nettle, comment this line out, so that NETTLE_DIR
+# isn't defined.
+#
+# NETTLE_DIR=$(ETHEREAL_LIBS)\nettle-1.10
+
 #
 # Set ICONV_DIR to the pathname of the directory in which the
 # ICONV include files and library resides.
@@ -147,7 +156,7 @@ LOCAL_LDFLAGS=/DEBUG
 PDB_FILE=vc*.pdb
 
 # add cygwin binaries to the path
-PATH=c:\cygwin\bin;$(PATH)
+PATH=$(PATH);c:\cygwin\bin
 
 # add some required DLLs to the path 
 PATH=$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(PATH)
@@ -222,6 +231,11 @@ MAKENSIS_MODERN_UI=USE
 # following line
 ENABLE_LIBETHEREAL=USE
 
+!IFDEF ENABLE_LIBETHEREAL
+# Uncomment next line to link plugins with the import library of libethereal.dll 
+LINK_PLUGINS_WITH_LIBETHEREAL=USE
+!ENDIF
+
 #
 # You should not have to change anything below this comment.
 # If you do, it's a deficiency in the Makefile.nmake files;
@@ -262,14 +276,19 @@ GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
 WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1
 !IF "$(WINPCAP_VERSION)" == "3.0" || "$(WINPCAP_VERSION)" == "3.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
 WPCAP_CONSTIFIED_CONFIG=^#define WPCAP_CONSTIFIED 1
 !ELSE
 PCAP_FINDALLDEVS_CONFIG=
+PCAP_DATALINK_VAL_TO_NAME_CONFIG=
 WPCAP_CONSTIFIED=
 !ENDIF
 !ELSE
 WINPCAP_CONFIG=
 PCAP_FINDALLDEVS_CONFIG=
+PCAP_DATALINK_NAME_TO_VAL_CONFIG=
+PCAP_DATALINK_VAL_TO_NAME_CONFIG=
 WPCAP_CONSTIFIED=
 !ENDIF
 
@@ -309,6 +328,17 @@ PCRE_LIBS=
 PCRE_CONFIG=
 !ENDIF
 
+!IFDEF NETTLE_DIR
+NETTLE_CFLAGS=/I$(NETTLE_DIR)
+NETTLE_LIBS=$(NETTLE_DIR)\libnettle.lib
+# Nmake uses carets to escape special characters
+NETTLE_CONFIG=^#define HAVE_LIBNETTLE 1
+!else
+NETTLE_CFLAGS=
+NETTLE_LIBS=
+NETTLE_CONFIG=
+!ENDIF
+
 !IFDEF ENABLE_LIBETHEREAL
 LIBETHEREAL_CONFIG=^#define HAVE_LIBETHEREALDLL 1
 !ELSE