iconv is now not normally used;

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24333 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 6f1c0539bd49bee416087e458dd37ede9936a5c7..094508a737eb1d3f40b60818b17dab6565447b04 100644 (file)
--- 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"