Move to the latest ethereal-win32-libs tag.

svn path=/trunk/; revision=15706

diff --git a/Makefile.nmake b/Makefile.nmake
index 14f109649921a8a81c7767706dd77fc555aba8a1..863690ab270a9a1fef38b724400fbd1454d3bb9b 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -459,7 +459,9 @@ setup: verify_tools
 !ENDIF
 !IFDEF PCRE_DIR
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
-               . pcre-4.4.zip
+               pcre-6.3 pcre-6.3-bin.zip
+       @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \
+               pcre-6.3 pcre-6.3-lib.zip
 !ENDIF
 !IFDEF ZLIB_DIR
        @$(SH) tools\win32-setup.sh --download "$(ETHEREAL_LIBS)" \

diff --git a/config.nmake b/config.nmake
index 3d366c01df58569e8ba8d86e42699c4766f46cb3..c97593b8a4092bb86f30bfd88017c14e65efc7b6 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -120,7 +120,7 @@ ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-04
 # If you don't have PCRE, comment this line out, so that PCRE_DIR
 # isn't defined.
 #
-PCRE_DIR=$(ETHEREAL_LIBS)\pcre-4.4
+PCRE_DIR=$(ETHEREAL_LIBS)\pcre-6.3
 
 #
 # If you have the Nettle encryption library, set this to the pathname

diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index a1494d9f612d4ab6bb7bc1d460d272017f864bc5..18e72c0ed12b4dca43cbfda8cdaf9e163803f506 100755 (executable)
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # DOWNLOAD_PREFIX="http://www.ethereal.com/distribution/win32/development"
-DOWNLOAD_PREFIX="http://anonsvn.ethereal.com/ethereal-win32-libs/tags/2005-07-24/packages"
+DOWNLOAD_PREFIX="http://anonsvn.ethereal.com/ethereal-win32-libs/tags/2005-09-05/packages"
 
 err_exit () {
        echo ""