diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-05 22:38:12 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-05 22:38:12 +0000 |
| commit | b6debe9bdcbd52d0cf67bf9629a98dc798bb05f4 (patch) | |
| tree | 5f1736f1fe84fe354ac59c2fedf17f47e4b5b148 /packaging/nsis/wireshark.nsi | |
| parent | e5c9acbf5f9b040774fcf06b0b53a66c5de60dd4 (diff) | |
Use the latest library tag, which updates GNUTLS. Add code to check for
libintl-8.dll and add the GNUTLS version if needed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36483 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging/nsis/wireshark.nsi')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index cf9202d640..47b4277545 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -407,6 +407,9 @@ File "${GNUTLS_DIR}\bin\libgnutls-extra-26.dll" File "${GNUTLS_DIR}\bin\libgnutls-openssl-26.dll" File "${GNUTLS_DIR}\bin\libgpg-error-0.dll" File "${GNUTLS_DIR}\bin\libtasn1-3.dll" +StrCmp "${INTL_DLL}" "libintl-8.dll" SkipLibIntl8 +File "${GNUTLS_DIR}\bin\libintl-8.dll" +SkipLibIntl8: !endif !ifdef LUA_DIR File "${LUA_DIR}\lua5.1.dll" |