diff options
| author | Gerald Combs <gerald@wireshark.org> | 2005-09-06 19:48:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2005-09-06 19:48:57 +0000 |
| commit | 4ba88078f987176e5abfc11a9f94a0baeb35863c (patch) | |
| tree | d328b4e1d258a3672bd756cfc159369c65007ba6 | |
| parent | 8d183068a08c4af6c4ac86a8bafdf700a5fa594f (diff) | |
Move to the latest ethereal-win32-libs tag.
svn path=/trunk/; revision=15706
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | config.nmake | 2 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 14f1096499..863690ab27 100644 --- 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 3d366c01df..c97593b8a4 100644 --- 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 a1494d9f61..18e72c0ed1 100755 --- 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 "" |