Use LUA 5.1.4

svn path=/trunk/; revision=26329

diff --git a/Makefile.nmake b/Makefile.nmake
index 11aab9be57b8f61773d80e3ca4991e430de0f71a..562df24bf68e78283ade981d310eb8b0644541c6 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -756,7 +756,7 @@ process_libs:
 !ENDIF
 !IFDEF LUA_DIR
        @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-               . lua5_1_dll.zip
+               lua5.1.4 lua5_1_4_Win32_dll9_lib.zip
 !ENDIF
 
 !IFDEF GNUTLS_DIR
@@ -1077,7 +1077,7 @@ install-all: install-generated-files
        xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d
 !ENDIF
 !IFDEF LUA_DIR
-       xcopy "$(LUA_DIR)\lib\dll\lua5.1.dll" $(INSTALL_DIR) /d
+       xcopy "$(LUA_DIR)\lua5.1.dll" $(INSTALL_DIR) /d
 !ENDIF
 !IFDEF SMI_DIR
        if not exist $(INSTALL_DIR)\snmp mkdir $(INSTALL_DIR)\snmp

diff --git a/config.nmake b/config.nmake
index 32eb80503997db0244434ab09257ee0be17771b0..0515256bd099a26dee1982f065c02062433328d4 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -263,7 +263,7 @@ KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5
 # If you don't have LUA, comment this line out, so that LUA_DIR
 # isn't defined.
 #
-LUA_DIR=$(WIRESHARK_LIBS)\lua5.1
+LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
 
 #
 # Optional: the PORTAUDIO library enables audio output for RTP streams.
@@ -801,7 +801,7 @@ LIBGCRYPT_CONFIG=
 
 !IFDEF LUA_DIR
 LUA_CFLAGS=/I$(LUA_DIR)\include
-LUA_LIBS=$(LUA_DIR)\lib\dll\lua5.1.lib
+LUA_LIBS=$(LUA_DIR)\lua5.1.lib
 # Nmake uses carets to escape special characters
 LUA_CONFIG=^#define HAVE_LUA 1
 LUA_VERSION=^#define HAVE_LUA_5_1 1

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index f9b191acbd5db17538f3355b93f058d5285a34ac..59ed1d80bde673ff2b21e1de815289c5b818cf4e 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -334,7 +334,7 @@ File "${GNUTLS_DIR}\bin\libgpg-error-0.dll"
 File "${GNUTLS_DIR}\bin\libtasn1-3.dll"
 !endif
 !ifdef LUA_DIR
-File "${LUA_DIR}\lib\dll\lua5.1.dll"
+File "${LUA_DIR}\lua5.1.dll"
 File "..\..\epan\wslua\init.lua"
 File "..\..\epan\wslua\console.lua"
 File "..\..\epan\wslua\dtd_gen.lua"

diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index b4997cb87ad8c00ef0fe12fe782bea26b90adb7f..b41a9ed25b194fbb75daa9be215a0e46e02fb415 100755 (executable)
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -7,7 +7,7 @@
 # in order to provide backward compatibility with older trees (e.g. a
 # previous release or an older SVN checkout).
 # Save previous tag.
-DOWNLOAD_TAG="2008-09-25"
+DOWNLOAD_TAG="2008-10-01"
 DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/$DOWNLOAD_TAG/packages/"
 TAG_FILE="current_tag.txt"