Assume we HAVE_GZCLEARERR on Windows and when using cmake
svn path=/trunk/; revision=34192
This commit is contained in:
parent
7cdf98c245
commit
d8310ff499
|
@ -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)/" \
|
||||
|
|
|
@ -111,6 +111,9 @@
|
|||
/* Define to use libz library */
|
||||
#cmakedefine HAVE_LIBZ 1
|
||||
|
||||
/* Define to 1 if you have the `gzclearerr' function */
|
||||
#cmakedefine HAVE_GZCLEARERR 1
|
||||
|
||||
/* Define to 1 if you have the <lua5.1/lauxlib.h> header file. */
|
||||
#cmakedefine HAVE_LUA5_1_LAUXLIB_H 1
|
||||
|
||||
|
|
|
@ -1071,6 +1071,7 @@ ZLIB_LIBS=$(ZLIB_DIR)\lib\zdll.lib
|
|||
ZLIB_DLL=$(ZLIB_DIR)\zlib1.dll
|
||||
# Nmake uses carets to escape special characters
|
||||
ZLIB_CONFIG=^#define HAVE_LIBZ 1
|
||||
ZLIB_GZCLEARERR_CONFIG=^#define HAVE_GZCLEARERR 1
|
||||
!else
|
||||
ZLIB_CFLAGS=
|
||||
ZLIB_LIBS=
|
||||
|
|
Loading…
Reference in New Issue