Fix MinGW build problems.

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

diff --git a/bacula/src/win32/dird/Makefile b/bacula/src/win32/dird/Makefile
index 019b67eec2619c80ca88140f531f7f5c746215b1..9ac9599b1388f5c57213dc7b70f8960260ace112 100644 (file)
--- a/bacula/src/win32/dird/Makefile
+++ b/bacula/src/win32/dird/Makefile
@@ -17,6 +17,7 @@ INCLUDES = \
 DEFINES = \
        -DUSING_DLL \
        -DUSING_CATS \
+       -DWINVER=0x500 \
        $(HAVES)
 
 vpath %.c ../../dird

diff --git a/bacula/src/win32/filed/Makefile b/bacula/src/win32/filed/Makefile
index e0e19dff21624e3e8ab7214c6385176a5756b73d..b887e5c7d3ed743c8cc61d34e8d23a4eb224dacd 100644 (file)
--- a/bacula/src/win32/filed/Makefile
+++ b/bacula/src/win32/filed/Makefile
@@ -19,6 +19,7 @@ INCLUDES = \
 DEFINES = \
        -DUSING_DLL \
        -DWIN32_VSS \
+       -DWINVER=0x500 \
        $(HAVES)
 
 vpath %.c ../../filed ../libwin32

diff --git a/bacula/src/win32/filed/vss_generic.cpp b/bacula/src/win32/filed/vss_generic.cpp
index 2d48141a9f00f4c99507085fd058d848f421344c..f87c6d57c781aa5a26cdd162c3cd55e541ba5ac8 100644 (file)
--- a/bacula/src/win32/filed/vss_generic.cpp
+++ b/bacula/src/win32/filed/vss_generic.cpp
@@ -610,7 +610,7 @@ BOOL VSSClientGeneric::CheckWriterStatus()
         bstrncpy(str, "\"", sizeof(str));
         wchar_2_UTF8(szBuf, bstrWriterName.p, sizeof(szBuf));
         bstrncat(str, szBuf, sizeof(str));
-        bstrncat(str, "\", State: 0x");
+        bstrncat(str, "\", State: 0x",sizeof(str));
         itoa(eWriterStatus, szBuf, sizeof(szBuf));
         bstrncat(str, szBuf, sizeof(str));
         bstrncat(str, " (", sizeof(str));

diff --git a/bacula/src/win32/installer/Makefile b/bacula/src/win32/installer/Makefile
index 61af0e4294826ac69c5cfd3394a6a7793dfc25a9..9d98eec25ec4aec4737c90921e0f526f785adaa4 100644 (file)
--- a/bacula/src/win32/installer/Makefile
+++ b/bacula/src/win32/installer/Makefile
@@ -94,6 +94,9 @@ SCRIPTS := \
        ../cats/make_catalog_backup.cmd \
        ../cats/delete_catalog_backup.cmd
 
+SSL_FILES := \
+       openssl.cnf
+
 ##########################################################################
 
 # Targets
@@ -106,7 +109,7 @@ installer:  $(INSTALL_EXE)
 
 clean:
        @echo "Cleaning `pwd`"
-       $(CMD_ECHO)-rm -f $(INSTALL_EXE) $(BACULA_BINARIES) $(DEPKGS_BINARIES) $(NONGCC_BINARIES) $(NONGCC_LIBRARIES)
+       $(CMD_ECHO)-rm -f $(INSTALL_EXE) $(BACULA_BINARIES) $(DEPKGS_BINARIES) $(NONGCC_BINARIES) $(NONGCC_LIBRARIES) $(SSL_FILES)
        $(CMD_ECHO)-rm -f $(BACULA_BINARIES) $(addsuffix .dbg,$(basename $(BACULA_BINARIES)))
        $(CMD_ECHO)-rm -f $(DEPKGS_BINARIES) $(addsuffix .dbg,$(basename $(DEPKGS_BINARIES)))
        $(CMD_ECHO)-rm -f *.exe
@@ -134,7 +137,9 @@ $(foreach file,$(addprefix $(DEPKGS)/lib/, $(NONGCC_LIBRARIES)),$(eval $(call Co
 
 $(foreach file,$(addprefix $(BINDIR)/, $(BACULA_BINARIES)),$(eval $(call Strip_Binary,$(file))))
 
-$(INSTALL_EXE): winbacula.nsi $(BACULA_BINARIES) $(SCRIPTS) $(DEPKGS_BINARIES) $(NONGCC_BINARIES) $(NONGCC_LIBRARIES)
+$(foreach file,$(addprefix $(DEPKGS)/ssl/, $(SSL_FILES)),$(eval $(call Copy_Binary,$(file))))
+
+$(INSTALL_EXE): winbacula.nsi $(BACULA_BINARIES) $(SCRIPTS) $(DEPKGS_BINARIES) $(NONGCC_BINARIES) $(NONGCC_LIBRARIES) $(SSL_FILES)
        NSISDIR=$(NSIS_DIR) \
        $(NSIS_DIR)/makensis -V3 $(DEFINES) winbacula.nsi
 

diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index 565076f9e73e65c9f195ef3535bdc033e48fba1b..8de4b90976096c553f2b5e7674fbe4f43e489240 100644 (file)
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -371,7 +371,7 @@ Function InstallCommonFiles
     File "/oname=$INSTDIR\openssl.cnf" "${DEPKGS_BIN}\..\openssl.cnf"
 !endif
 !if "${BUILD_TOOLS}" == "MinGW"
-    File "/oname=$INSTDIR\openssl.cnf" "${DEPKGS_BIN}\..\ssl\openssl.cnf"
+    File "/oname=$INSTDIR\openssl.cnf" "${DEPKGS_BIN}\openssl.cnf"
 !endif
     File "${DEPKGS_BIN}\openssl.exe"
     File "${BACULA_BIN}\bsleep.exe"

diff --git a/bacula/src/win32/stored/Makefile b/bacula/src/win32/stored/Makefile
index 937e86a9f9fabcc70d78e2ff5bc6eb04dcb774ed..3caa0f8e88096aa6e6077a11d31c47937c40e833 100644 (file)
--- a/bacula/src/win32/stored/Makefile
+++ b/bacula/src/win32/stored/Makefile
@@ -20,6 +20,7 @@ INCLUDES = \
 
 DEFINES = \
        -DUSING_DLL \
+       -DWINVER=0x500 \
        $(HAVES)
 
 vpath %.c ../../stored baculasd