Add default development package locations to README.win32. Use zlib 1.1.4

by default in config.nmake.

svn path=/trunk/; revision=8246

diff --git a/README.win32 b/README.win32
index 04110771507ab0cf39a35479d12741e8158939e3..29fccc4ff78e52748994ae2a4bd9fc4119455268 100644 (file)
--- a/README.win32
+++ b/README.win32
@@ -1,4 +1,4 @@
-$Id: README.win32,v 1.47 2003/08/04 14:34:17 gerald Exp $
+$Id: README.win32,v 1.48 2003/08/24 23:25:40 gerald Exp $
 
 Installing Ethereal, Tethereal, and Editcap on Win32
 ====================================================
@@ -160,6 +160,23 @@ The ADNS package is also available at its homepage:
 
        http://adns.jgaa.com/
 
+By default, the build process looks for these packages in
+C:\ethereal-win32-libs.  You can place them in a different directory, but
+you must update config.nmake accordingly.  The default location for each
+package is as follows:
+
+    Package                             Default Location
+    -------                             ----------------
+    adns-1.0-win32-01.zip               C:\ethereal-win32-libs
+    glib-2.2.1.zip                      C:\ethereal-win32-libs\glib
+    glib-dev-2.2.1.zip                  C:\ethereal-win32-libs\glib
+    gtk+-1.3.0-20030216.zip             C:\ethereal-win32-libs\gtk+
+    gtk+-dev-1.3.0-20030115.zip         C:\ethereal-win32-libs\gtk+
+    libiconv-1.9.1.bin.woe32.zip        C:\ethereal-win32-libs\gtk+
+    libintl-0.10.40-tml-20020904.zip    C:\ethereal-win32-libs\gtk+
+    net-snmp-5.0.6.zip                  C:\ethereal-win32-libs
+    zlib-114-dev.zip                    C:\ethereal-win32-libs
+
 
 Instructions for MS Visual C++
 ----------------------------

diff --git a/config.nmake b/config.nmake
index 0876980be76bf32e38c938c34c04aca72dee95fd..454b2a61beb8410fc88cac0bcc1ef0f777565f5e 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.57 2003/08/19 02:16:25 guy Exp $
+# $Id: config.nmake,v 1.58 2003/08/24 23:25:40 gerald Exp $
 
 VERSION=0.9.14
 #
@@ -34,7 +34,7 @@ GLIB_VERSION=2.0
 GLIB_DIR=C:\ethereal-win32-libs\glib
 GTK_DIR=C:\ethereal-win32-libs\gtk+
 
-ZLIB_DIR=C:\ethereal-win32-libs\zlib
+ZLIB_DIR=C:\ethereal-win32-libs\zlib-114
 PCAP_DIR=C:\ethereal-win32-libs\WPdpack
 NET_SNMP_DIR=C:\ethereal-win32-libs\net-snmp-5.0.6