From 718b14c7ce8dceb7faa6a6c22dbe197f6dabfbb9 Mon Sep 17 00:00:00 2001
From: Bill Meier <wmeier@newsguy.com>
Date: Thu, 14 Feb 2008 17:16:12 +0000
Subject: Glib >= 2.14.5 does not require iconv

svn path=/trunk/; revision=24330
---
 epan/Makefile.nmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'epan/Makefile.nmake')

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index e875457666..1698be2b32 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -37,7 +37,9 @@ libwireshark_LIBS = \
 	$(LUA_LIBS) \
 	$(SMI_LIBS) \
 	..\wiretap\wiretap-$(WTAP_VERSION).lib \
+!IFDEF ICONV_DIR
 	$(ICONV_DIR)\lib\iconv.lib \
+!ENDIF
 	crypt\airpdcap.lib \
 	ftypes\ftypes.lib \
 	dfilter\dfilter.lib \
-- 
cgit v1.2.3