diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-02-15 03:09:07 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-02-15 03:09:07 +0000 |
| commit | 00dbc56e0a22fc67c1a5468076e7c922d61d567f (patch) | |
| tree | 39d12fa686dfe54c82d1e81bee0d6533a84a1b78 /packaging | |
| parent | 25c8741da356a0cc6c104982a6afe6367c56fc55 (diff) | |
iconv is now not normally used;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24333 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 6f1c0539bd..094508a737 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -305,7 +305,9 @@ File "..\..\epan\libwireshark.dll" File "${GLIB_DIR}\bin\libglib-2.0-0.dll" File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll" File "${GLIB_DIR}\bin\libgobject-2.0-0.dll" +!IFDEF ICONV_DIR File "${ICONV_DIR}\bin\iconv.dll" +!ENDIF File "${GETTEXT_DIR}\bin\intl.dll" !ifdef ZLIB_DIR File "${ZLIB_DIR}\zlib1.dll" |