Put the name, as well as the value, of the family and subfamily fields

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

diff --git a/config.nmake b/config.nmake
index 10d92d1dd8640b36e815c02e3c6d05b69cb55fe5..af7d7837099fb22b94ac141b207ef48f939b344a 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1,6 +1,11 @@
-# $Id: config.nmake,v 1.95 2004/07/07 19:15:46 gerald Exp $
+# $Id$
+
+# Some more informations about the settings in this file, can be found 
+# in the file README.win32.
+
+# The current Ethereal version
+VERSION=0.10.7
 
-VERSION=0.10.5
 #
 # The RC_VERSION should be comma-separated, not dot-separated, 
 # as per Graham Bloice's message in
@@ -12,8 +17,11 @@ VERSION=0.10.5
 # 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,5
+RC_VERSION=0,10,7
+
+# The version of the wiretap library
 WTAP_VERSION=0.1
+RC_WTAP_VERSION=0,1
 
 #
 # If you're building with WinPcap 2.3, set WINPCAP_VERSION to 2.3; if
@@ -93,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
@@ -102,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,
@@ -114,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.
@@ -138,22 +155,39 @@ LOCAL_LDFLAGS=/DEBUG
 # Set PDB_FILE according to your VC++ version 
 PDB_FILE=vc*.pdb
 
-# Set path if you need to find some binary
-PATH=c:\cygwin\bin;c:\python23;$(PATH)
+# add cygwin binaries to the path
+PATH=c:\cygwin\bin;$(PATH)
 
-# Set path to some required DLLs
+# add some required DLLs to the path 
 PATH=$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(PATH)
 
+
+# Set the following commands to find the tools.
+# The easiest way is to use the corresponding packages from cygwin.
+
+# command for a shell (typically cygwin's bash package)
 SH=bash
+
+# command for perl (typically cygwin's perl package)
 PERL=perl
+
+# command for pod2man and pod2html (part of the perl package)
 POD2MAN=$(SH) pod2man
 POD2HTML=$(SH) pod2html
-PYTHON="C:/python23/python.exe"
+
+# command for python (native windows version)
+#PYTHON="C:/python23/python.exe"
+# add native python to the path (not needed if cygwin's python is used)
+#PATH=c:\python23;$(PATH)
+
+# command for python (typically cygwin's python package)
+PYTHON=env python
+
+# command for lex/flexx (typically cygwin's flex package)
 LEX=flex
-YACC=bison
 
-# Set YACC_OPTS if cygnus bison can't find template file.
-#YACC_OPTS=-S t:\w32-ix86\cygnus\cygwin-b20\share\bison.simple 
+# command for yacc/bison (typically cygwin's bison package)
+YACC=bison
 
 # To build the installer
 MAKENSIS="C:/program files/nsis/makensis.exe"
@@ -193,8 +227,14 @@ MAKENSIS_MODERN_UI=USE
 #
 #HHC="C:/Program Files/HTML Help Workshop/hhc.exe"
 
-# If you wan't to build a libethereal.dll, you should comment out the following line
-#ENABLE_LIBETHEREAL=USE
+# If you don't want to build libethereal.dll, you should comment out the
+# 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.
@@ -236,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
 
@@ -283,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