>> Thomas Boehne wrote:
>> I have just realized that my current windows builds are still linked
>> with GTK 2.4.4 -- so I have been carrying around bugs that have been
>> fixed a long time ago... I guess most Linux ethereal developers who
>> also provide Windows builds of their specialized ethereal code do not
>> check that the correct libraries are used.
....
> Ulf Lamping wrote:
> We have the zip files around, so we can simply unpack their content again.
I've just been bitten by this.
(I had a quite old version of WpdPack which wasn't being updated because
the WpdPack library directory wasn't being deleted and because of the
'unzip -nq' in win32-setup.sh).
To *ensure* that the correct library versions are used following a
'setup' I propose that:
1. 'clean_setup' delete all the library directories;
2. 'setup' does a 'clean_setup'
If this is acceptable the following patch can be applied.
Thanks
Bill Meier
--- makefile.nmake.orig 2005-10-02 14:08:49.413492800 -0400
+++ makefile.nmake 2005-10-02 15:07:14.042902400 -0400
@@ -423,8 +423,9 @@
@$(SH) tools\win32-setup.sh --appverify $(REQUIRED_TOOLS)
# Download and install all the required libraries into ETHEREAL_LIBS.
-# If you used this setup target before, consider doing a clean_setup.
-setup: verify_tools
+# XXX: If a new library directory is added below, please also add
+# an entry to clean-setup
+setup: verify_tools clean_setup
!IF "$(GTK2_INST_VERSION)" == "2.4"
@$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
glib gtk2.4/glib-2.4.7.zip
@@ -517,6 +518,10 @@
rm -r -f $(ETHEREAL_LIBS)/zlib123-dll
rm -r -f $(ETHEREAL_LIBS)/gtk2
rm -r -f $(ETHEREAL_LIBS)/gtk-wimp
+ rm -r -f $(ETHEREAL_LIBS)/wpdpack
+ rm -r -f $(ETHEREAL_LIBS)/adns-1.0-win32-04
+ rm -r -f $(ETHEREAL_LIBS)/net-snmp-5.2.1.2
+ rm -r -f $(ETHEREAL_LIBS)/pcre-6.3
################################################################################
# Prepare the source tree for running (t)ethereal directly from there.
