From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 16 Aug 2007 08:44:39 +0000 (+0000)
Subject: kes  Fix configure to create bat Makefile before creating dependencies.
X-Git-Tag: Release-7.0.0~5834
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=89867dec58abdd24c77b1e12c1a89cfc8f625b71;p=bacula%2Fbacula

kes  Fix configure to create bat Makefile before creating dependencies.
kes  Eliminate the egg files from the tray-monitor. Use gtk calls.
kes  Add a tooltip to the tray monitor.

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index da51c9909a..7044b0257b 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2204,9 +2204,20 @@ AC_OUTPUT([autoconf/Make.common \
 	   src/tools/Makefile \
 	   po/Makefile.in \
 	   $PFILES ],  
-	  [(echo "Doing make of dependencies"; ${MAKE:-make} depend;) ]
+	  [ ]
 )
 
+if test "${support_bat}" = "yes" ; then
+  cd src/qt-console
+  chmod 755 install_conf_file build-depkgs-qt-console
+  echo "Creating bat Makefile"	
+  qmake
+  cd ${BUILD_DIR}
+fi
+
+echo "Doing make of dependencies"
+${MAKE:-make} depend
+
 cd scripts
 chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer
 chmod 755 dvd-handler dvd-simulator
@@ -2239,13 +2250,6 @@ chmod 755 $c/mysql
 
 chmod 755 src/win32/build-depkgs-mingw32
 
-if test "${support_bat}" = "yes" ; then
-  cd src/qt-console
-  chmod 755 install_conf_file build-depkgs-qt-console
-  echo "Creating bat Makefile"	
-  qmake
-  cd ${BUILD_DIR}
-fi
 
 
 if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then
diff --git a/bacula/configure b/bacula/configure
index e10b62c62f..f61dd1ee6c 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -31990,7 +31990,7 @@ echo "$as_me: executing $ac_dest commands" >&6;}
         ;;
       esac
     done ;;
-    default ) (echo "Doing make of dependencies"; ${MAKE:-make} depend;)
+    default )
  ;;
   esac
 done
@@ -32026,6 +32026,17 @@ if test "$no_create" != yes; then
 fi
 
 
+if test "${support_bat}" = "yes" ; then
+  cd src/qt-console
+  chmod 755 install_conf_file build-depkgs-qt-console
+  echo "Creating bat Makefile"
+  qmake
+  cd ${BUILD_DIR}
+fi
+
+echo "Doing make of dependencies"
+${MAKE:-make} depend
+
 cd scripts
 chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer
 chmod 755 dvd-handler dvd-simulator
@@ -32058,13 +32069,6 @@ chmod 755 $c/mysql
 
 chmod 755 src/win32/build-depkgs-mingw32
 
-if test "${support_bat}" = "yes" ; then
-  cd src/qt-console
-  chmod 755 install_conf_file build-depkgs-qt-console
-  echo "Creating bat Makefile"
-  qmake
-  cd ${BUILD_DIR}
-fi
 
 
 if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then
diff --git a/bacula/src/version.h b/bacula/src/version.h
index c3ba21d46b..b9f5ee182a 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.3.0"
-#define BDATE   "15 August 2007"
-#define LSMDATE "15Aug07"
+#define VERSION "2.3.1"
+#define BDATE   "16 August 2007"
+#define LSMDATE "16Aug07"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2007"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index a0a5ba0a0e..d78c52cad5 100644
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,10 @@
               Technical notes on version 2.3
 
 General:
+16Aug07
+kes  Fix configure to create bat Makefile before creating dependencies.
+kes  Eliminate the egg files from the tray-monitor. Use gtk calls.
+kes  Add a tooltip to the tray monitor.
 15Aug07
 kes  Update AUTHORs file
 kes  Increase the default max concurrent jobs to 20 in FD and SD to