aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authormorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>2010-09-23 05:50:10 +0000
committermorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>2010-09-23 05:50:10 +0000
commit7c87473ca6b33e0c7d00773f6065659ffbefac4d (patch)
tree45321553d9af0e403ccc88032bc5dc2684cf0944 /Makefile.nmake
parent8c88f74f2a51945e47c4cdc7fedb015d5f63d36f (diff)
Assume we HAVE_GZCLEARERR on Windows and when using cmake
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34192 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 3b328d78b6..5318820077 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -359,6 +359,7 @@ config.h : config.h.win32 config.nmake
-e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \
-e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \
-e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \
+ -e "s/@HAVE_GZCLEARERR@/$(ZLIB_GZCLEARERR_CONFIG)/" \
-e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \
-e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \
-e "s/@HAVE_PCAP_DATALINK_NAME_TO_VAL@/$(PCAP_DATALINK_NAME_TO_VAL_CONFIG)/" \