Win32 bat tweaks

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

diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index 3e3cab1a046bdf87f3209fe7009f499e2a38765a..5c1b8bde8a78addda7573968e667e8b4eb6d3b75 100644 (file)
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -136,7 +136,9 @@ int main(int argc, char *argv[])
    }
 
    OSDependentInit();
+#ifdef HAVE_WIN32
    WSA_Init();                        /* Initialize Windows sockets */
+#endif
 
    if (configfile == NULL) {
       configfile = bstrdup(CONFIG_FILE);

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index a03e22102598e6afffd38d5ecc7db045ca44eedc..dab2552d03e0b0e038a8d86017b7fb8192ede2ff 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -468,14 +468,14 @@ void MainWin::restoreButtonClicked()
    new prerestorePage();
 }
 
+#ifdef HAVE_QWT
 void MainWin::jobPlotButtonClicked()
 {
-#ifdef HAVE_QWT
    JobPlotPass pass;
    pass.use = false;
    new JobPlot(NULL, pass);
-#endif
 }
+#endif
 
 /*
  * The user just finished typing a line in the command line edit box

diff --git a/bacula/src/win32/build-depkgs-mingw32 b/bacula/src/win32/build-depkgs-mingw32
index eb55c47bea337bc630310061b223323688b2577e..d615e152c4878cab8ae8662a2fc1bd446102a6e0 100755 (executable)
--- a/bacula/src/win32/build-depkgs-mingw32
+++ b/bacula/src/win32/build-depkgs-mingw32
@@ -404,70 +404,70 @@ process_nsis()
 
 process_mtx()
 {
-        if get_source "${URL_MTX}" "${DIR_MTX}" "${MKD_MTX}"
-        then
-                echo Patching mtx
-                # We can't run configure in a cross-compile environment so we
-                # patch the files to the correct values
-                cp -f config.h.in config.h
-                cp -f Makefile.in Makefile
-                rm -f configure
-                >patch.log
-                do_patch mtx.patch
-        fi
-        echo Building mtx
-        do_make Makefile prefix=${DEPPKG_DIR} all
-        echo Installing mtx
-        do_make Makefile prefix=${DEPPKG_DIR} install
+   if get_source "${URL_MTX}" "${DIR_MTX}" "${MKD_MTX}"
+   then
+           echo Patching mtx
+           # We can't run configure in a cross-compile environment so we
+           # patch the files to the correct values
+           cp -f config.h.in config.h
+           cp -f Makefile.in Makefile
+           rm -f configure
+           >patch.log
+           do_patch mtx.patch
+   fi
+   echo Building mtx
+   do_make Makefile prefix=${DEPPKG_DIR} all
+   echo Installing mtx
+   do_make Makefile prefix=${DEPPKG_DIR} install
 }
 
 process_mt()
 {
-        if get_source "${URL_MT}" "${DIR_MT}" "${MKD_MT}"
-        then
-                echo "Patching mt"
-                >patch.log
-                do_patch mt.patch
-        fi
-        echo "Building mt"
-        do_make Makefile PREFIX=${DEPPKG_DIR} all
-        echo Installing mt
-        do_make Makefile PREFIX=${DEPPKG_DIR} install
+   if get_source "${URL_MT}" "${DIR_MT}" "${MKD_MT}"
+   then
+           echo "Patching mt"
+           >patch.log
+           do_patch mt.patch
+   fi
+   echo "Building mt"
+   do_make Makefile PREFIX=${DEPPKG_DIR} all
+   echo Installing mt
+   do_make Makefile PREFIX=${DEPPKG_DIR} install
 }
 
 process_sed()
 {
-        if get_source "${URL_SED}" "${DIR_SED}" "${MKD_SED}"
-        then
-                echo Patching sed
-                >patch.log
-                do_patch sed.patch
-                echo Configuring sed
-                ./configure --host=mingw32 \
-                            --prefix=${DEPPKG_DIR} \
-                            --disable-nls >make.log 2>&1
-        fi
-        echo Building sed
-        do_make Makefile all
-        echo Installing sed
-        do_make Makefile install
+   if get_source "${URL_SED}" "${DIR_SED}" "${MKD_SED}"
+   then
+           echo Patching sed
+           >patch.log
+           do_patch sed.patch
+           echo Configuring sed
+           ./configure --host=mingw32 \
+                       --prefix=${DEPPKG_DIR} \
+                       --disable-nls >make.log 2>&1
+   fi
+   echo Building sed
+   do_make Makefile all
+   echo Installing sed
+   do_make Makefile install
 }
 
 process_stab2cv()
 {
-        if get_source "${URL_STAB2CV}" "${DIR_STAB2CV}" "${MKD_STAB2CV}"
-        then
-                # echo Patching stab2cv
-                # >patch.log
-                # do_patch stab2cv.patch
-                echo Configuring stab2cv
-                ./configure --prefix=${DEPPKG_DIR}/tools \
-                            >make.log 2>&1
-        fi
-        echo Building stab2cv
-        do_make Makefile 
-        echo Installing stab2cv
-        do_make Makefile install
+   if get_source "${URL_STAB2CV}" "${DIR_STAB2CV}" "${MKD_STAB2CV}"
+   then
+           # echo Patching stab2cv
+           # >patch.log
+           # do_patch stab2cv.patch
+           echo Configuring stab2cv
+           ./configure --prefix=${DEPPKG_DIR}/tools \
+                       >make.log 2>&1
+   fi
+   echo Building stab2cv
+   do_make Makefile 
+   echo Installing stab2cv
+   do_make Makefile install
 }
 
 process_cmd_utils()