Add zlib to cross Win32 build

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2966 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/Makefile.in b/bacula/src/win32/Makefile.in
index 58b1238bf98de32de11380cbc3e392aace7f7dd8..e42a432939d102763473f3938d2498cadd0f5b8b 100644 (file)
--- a/bacula/src/win32/Makefile.in
+++ b/bacula/src/win32/Makefile.in
@@ -24,7 +24,7 @@ INCLUDE_OPENSSL = -I$(CROSSTOOLS)/openssl/include
 
 LIB_MINGW = $(MINGW)/mingw32/lib
 LIB_PTHREADS = $(DEPKGS)/pthreads/pthreadGCE.dll
-#LIB_ZLIB = $(DEPKGS)/libz.a
+LIB_ZLIB = $(DEPKGS)/zlib/libz.a
 #LIB_SSL = $(DEPKGS)/openssl/libssl.a
 #LIB_CRYPTO = $(DEPKGS)/openssl/libcrypto.a
 
@@ -35,6 +35,7 @@ INCLUDES = \
        $(INCLUDE_MINGW) \
        $(INCLUDE_PTHREADS) \
        $(INCLUDE_BACULA) \
+       $(INCLUDE_ZLIB) \
        $(INCLUDE_ICONS)
 
 #      $(INCLUDE_VSS) \
@@ -43,11 +44,11 @@ INCLUDES = \
 
 HAVES = \
        -DHAVE_MINGW \
+       -DHAVE_ZLIB_H \
+       -DHAVE_LIBZ \
        -DHAVE_WIN32
 
 #       -DWIN32_VSS \
-#       -DHAVE_ZLIB_H \
-#       -DHAVE_LIBZ \
 #       -DHAVE_OPENSSL \
 #       -DHAVE_TLS \