Build with zlib.

Pre-compiled zlib provided at
	http://www.ethereal.com/distribution/win32/zlib-1.1.3-fixed.zip
"fixed" because the pre-compiled version in the "extralibs" package
from the Gimp/Win32 page has a fault zlib.lib in it.

Add note about zlib in README.win32; more work needs to be done to
this file to mention new packaging method.

svn path=/trunk/; revision=3263

README.win32

@@ -1,4 +1,4 @@
-$Id: README.win32,v 1.20 2001/03/23 02:05:22 gram Exp $
+$Id: README.win32,v 1.21 2001/04/06 03:52:44 gram Exp $
 
 Running Ethereal, Tethereal, and Editcap on Win32
 =================================================
@@ -82,17 +82,8 @@ Those versions are available from the respctive home pages for
 each project (the same URLs as listed above). The development
 packages contain header files and stub libaries to link against.
 
-SNMP and ZLIB are not working yet in Ethereal/Win32, but the
-libraries can be had from these locations if you want to hack:
-
-The UCD SNMP library for win32 can be had from
-
-	ftp://ftp.revelstone.com/pub/snmp/
-
-
-Zlib (or 'libz') is available for Win32 from
-
-	http://www.winimage.com/zLibDll/
+The use of an SNMP library has not been made to work
+yet in Ethereal/Win32, but an SNMP library can be had from:
 
 
 
@@ -102,6 +93,15 @@ Modify the config.nmake file in the top directory of the Ethereal
 source tree to work for your local configuration. You should not
 have to modify any other Makefile.
 
+In order to compile, at least with the default settings, you
+also need zlib, which is provided as an archive library, not
+a DLL. The pre-compiled zlib which comes with the "extralibs"
+package from Gimp/Win32 is faulty; a working version can be
+downloaded from:
+
+http://www.ethereal.com/distribution/win32/zlib-1.1.3-fixed.zip
+
+
 Be sure that your command-line environment is set up to compile
 and link with MSVC. When installing MSVC, you can have your
 system's environment set up to always allow compiling from the
@@ -118,12 +118,13 @@ to generate C source. The "special" files and their requisite tools are:
 
 Source				Output			Tool
 ------				------			----
+config.h.in			config.h		sed
 dfilter-scanner.l		*.c			Flex
 wiretap/ascend-scanner.l	*.c			Flex
 wiretap/ascend-grammar.y	*.c,*.h			Bison/Yacc
 ncp2222.py			packet-ncp2222.c	Python
 
-make-reg-dotc, packet*.c	register.c		Bash
+make-reg-dotc, packet*.c	register.c		Bash + grep + sed
 or
 make-reg-dotc.py, packet*.c	register.c		Python
 

config.nmake

@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.11 2001/04/05 04:39:23 gram Exp $
+# $Id: config.nmake,v 1.12 2001/04/06 03:52:44 gram Exp $
 
 VERSION=0.8.16
 RC_VERSION=0,8,16
@@ -9,7 +9,7 @@ GLIB_VERSION=1.3
 
 GLIB_DIR=F:\gram\win32tools\src\glib
 GTK_DIR=F:\gram\win32tools\src\gtk+
-
+ZLIB_DIR=F:\gram\win32tools\src\zlib-1.1.3
 PCAP_DIR=F:\gram\win32tools\WPdpack
 
 LOCAL_CFLAGS=-Zi

wiretap/Makefile.nmake

@@ -1,19 +1,16 @@
 #
-# $Id: Makefile.nmake,v 1.18 2001/04/05 04:39:29 gram Exp $
+# $Id: Makefile.nmake,v 1.19 2001/04/06 03:52:45 gram Exp $
 #
 
 include ..\config.nmake
 include <win32.mak>
 
 ############### no need to modify below this line #########
 
-CFLAGS=-DHAVE_CONFIG_H /I$(GLIB_DIR) $(LOCAL_CFLAGS)
-
-CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
-
+CFLAGS=-DHAVE_CONFIG_H /I$(GLIB_DIR) /I$(ZLIB_DIR) $(LOCAL_CFLAGS)
 
 {$S}.c{$O}.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd$O\ -c $<
+   $(CC) $(cvarsdll) $(CFLAGS) -Fd$O\ -c $<
 
 OBJECTS=ascend-grammar.obj \
 	ascend-scanner.obj \
@@ -39,7 +36,8 @@ OBJECTS=ascend-grammar.obj \
 
 
 wiretap_LIBS = \
-	$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
+	$(GLIB_DIR)\glib-$(GLIB_VERSION).lib	\
+	$(ZLIB_DIR)\zlib.lib
 
 all: wiretap-$(WTAP_VERSION).dll
 

wiretap/config.h.win32

@@ -1,4 +1,4 @@
-/* $Id: config.h.win32,v 1.7 2001/04/05 04:39:29 gram Exp $ */
+/* $Id: config.h.win32,v 1.8 2001/04/06 03:52:45 gram Exp $ */
 /* config.h.win32 Generated manually. :-) */
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -27,7 +27,7 @@
 /* #define HAVE_UNISTD_H */
 
 /* Define if you have the z library (-lz).  */
-/*#define HAVE_LIBZ 1*/
+#define HAVE_LIBZ
 
 /* Define if you have the <sys/stat.h> header file.  */
 #define HAVE_SYS_STAT_H 1