kes Move qwt (Graphics libarary for Qt4) to depkgs.

kes  Update src/win32/cats/bacula_cats.def to include the new
     db_get_query_dbids() call on Win32.

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 95ae9dc6ed569ac68c66c7999935e78a391e1baa..95fb2c2f3b621fe5a402aab93b420817f0e60a63 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -269,7 +269,36 @@ if test x$support_bat = xyes; then
      AC_MSG_ERROR(Unable to find Qt4 installation needed by bat)
   fi
 fi
+
+# 
+#  If bat is enabled, we need the qwt library
+got_qwt=no
+if test x$support_bat = xyes; then
+   AC_ARG_WITH(qwt,
+     [ --with-qwt@<:@=DIR@:>@            specify qwt library directory],
+     [
+       case "$with_qwt" in
+       no) : ;;
+       yes|*)
+         if test -f ${with_qwt}/include/qwt.h; then
+            QWT_INC="${with_qwt}/include"
+            QWT_LDFLAGS="-L${with_qwt}/lib"
+         else
+            echo " "
+            echo "qwt.h not found. bat turned off ..."
+            echo " "
+            BAT_DIR=
+            support_bat=no
+         fi
+         ;;
+       esac
+     ]  
+   )
+fi
+
 AC_SUBST(BAT_DIR)
+AC_SUBST(QWT_INC)
+AC_SUBST(QWT_LDFLAGS)
 
 
 # -------------------------------------------
@@ -2189,11 +2218,6 @@ if test "${support_bat}" = "yes" ; then
   cd src/qt-console
   a=`pwd`
   chmod 755 install_conf_file build-depkgs-qt-console
-  echo " "
-  echo "Downloading, building, and installing the qwt graphics library"
-  echo " The install will be to directory ${a}/qwt ..."
-  echo " "
-  ./build-depkgs-qt-console
   echo "Creating bat Makefile" 
   qmake
 fi

diff --git a/bacula/configure b/bacula/configure
index 8439d97d14dde8651c61a3ec403d007f61a00221..7133071639b51d2c27dbe5a6c1744294be41d1b5 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -755,6 +755,8 @@ GNOME_LIBDIR
 GNOME_LIBS
 GNOME_DIR
 BAT_DIR
+QWT_INC
+QWT_LDFLAGS
 WXCONS_CPPFLAGS
 WXCONS_LDFLAGS
 WX_DIR
@@ -1461,6 +1463,7 @@ Optional Packages:
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
   --with-included-gettext use the GNU gettext library included here
+ --with-qwt[=DIR]                specify qwt library directory
  --with-readline[=DIR]        specify readline library directory
 
   --with-python[=DIR]  Include Python support.  DIR is the Python base
@@ -14706,6 +14709,38 @@ echo "$as_me: error: Unable to find Qt4 installation needed by bat" >&2;}
   fi
 fi
 
+#
+#  If bat is enabled, we need the qwt library
+got_qwt=no
+if test x$support_bat = xyes; then
+
+# Check whether --with-qwt was given.
+if test "${with_qwt+set}" = set; then
+  withval=$with_qwt;
+       case "$with_qwt" in
+       no) : ;;
+       yes|*)
+         if test -f ${with_qwt}/include/qwt.h; then
+            QWT_INC="${with_qwt}/include"
+            QWT_LDFLAGS="-L${with_qwt}/lib"
+         else
+            echo " "
+            echo "qwt.h not found. bat turned off ..."
+            echo " "
+            BAT_DIR=
+            support_bat=no
+         fi
+         ;;
+       esac
+
+
+fi
+
+fi
+
+
+
+
 
 
 # -------------------------------------------
@@ -35129,6 +35164,8 @@ GNOME_LIBDIR!$GNOME_LIBDIR$ac_delim
 GNOME_LIBS!$GNOME_LIBS$ac_delim
 GNOME_DIR!$GNOME_DIR$ac_delim
 BAT_DIR!$BAT_DIR$ac_delim
+QWT_INC!$QWT_INC$ac_delim
+QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim
 WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim
 WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim
 WX_DIR!$WX_DIR$ac_delim
@@ -35161,8 +35198,6 @@ scriptdir!$scriptdir$ac_delim
 dump_email!$dump_email$ac_delim
 job_email!$job_email$ac_delim
 smtp_host!$smtp_host$ac_delim
-piddir!$piddir$ac_delim
-subsysdir!$subsysdir$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -35204,6 +35239,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+piddir!$piddir$ac_delim
+subsysdir!$subsysdir$ac_delim
 baseport!$baseport$ac_delim
 dir_port!$dir_port$ac_delim
 fd_port!$fd_port$ac_delim
@@ -35254,7 +35291,7 @@ DISTVER!$DISTVER$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -35840,11 +35877,6 @@ if test "${support_bat}" = "yes" ; then
   cd src/qt-console
   a=`pwd`
   chmod 755 install_conf_file build-depkgs-qt-console
-  echo " "
-  echo "Downloading, building, and installing the qwt graphics library"
-  echo " The install will be to directory ${a}/qwt ..."
-  echo " "
-  ./build-depkgs-qt-console
   echo "Creating bat Makefile"
   qmake
 fi

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 48c929567715e5134e93b8c482d8ccc4e86ec950..7beeb1ac175e3f778eca3b8e7de6cb9ff01373c6 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -66,17 +66,10 @@ Priority:
 - Make restore use the in-use volume reservation algorithm.
 - Look at mincore: http://insights.oetiker.ch/linux/fadvise.html
 - Unicode input http://en.wikipedia.org/wiki/Byte_Order_Mark
-- How does restore JobId=nnn work? (Dirk)
-- What does: restore select fileset="TestSet" client="workplay-fd" pool="Default"
-> storage="File2"  before="2007-02-05 23:05:04" do?  (Dirk)
-
-- Implement update jobid=
-- Mention Eric and Marc's work + Marc's doc.
-- Add TLS to bat
+- Add TLS to bat (should be done).
 - When Pool specifies Storage command override does not work.
 - Implement wait_for_sysop() message display in wait_for_device(), which
   now prints warnings too often.
-
 - Ensure that each device in an Autochanger has a different
   Device Index.
 - Add Catalog = to Pool resource so that pools will exist
@@ -103,8 +96,6 @@ Priority:
    > configuration string value to a CRYPTO_CIPHER_* value, if anyone is  
    > interested in implementing this functionality.
 
-- Ensure that moving a purged Volume in ua_purge.c to the RecyclePool
-  does the right thing.
 - Why doesn't @"xxx abc" work in a conf file?
 - Figure out some way to "automatically" backup conf changes.
 - Add the OS version back to the Win32 client info.
@@ -121,7 +112,6 @@ Priority:
 - Test Volume compatibility between machine architectures
 - Encryption documentation
 - Wrong jobbytes with query 12 (todo)
-- bacula-1.38.2-ssl.patch
 - Bare-metal recovery Windows (todo)
    
 
@@ -147,13 +137,11 @@ Projects:
   - Look at Webmin
      http://www.orangecrate.com/modules.php?name=News&file=article&sid=501
 - Performance
-  - FD-SD quick disconnect
   - Despool attributes in separate thread
   - Database speedups
   - Embedded MySQL
   - Check why restore repeatedly sends Rechdrs between
     each data chunk -- according to James Harper 9Jan07.
-  - Building the in memory restore tree is slow.
 - Features
   - Better scheduling  
   - Full at least once a month, ...
@@ -1767,3 +1755,8 @@ Block Position: 0
   apparently not.  This  happened when I removed the pool directive and 
   started the director.
 - Add Where: client:/.... to restore job report.
+- Ensure that moving a purged Volume in ua_purge.c to the RecyclePool
+  does the right thing.
+- FD-SD quick disconnect
+- Building the in memory restore tree is slow.
+

diff --git a/bacula/src/cats/bdb_get.c b/bacula/src/cats/bdb_get.c
index 3e17a2a1eda0a358902809109f8081b32ddee44c..d887d51c32115645a266e3b657678b8b73ebc05a 100644 (file)
--- a/bacula/src/cats/bdb_get.c
+++ b/bacula/src/cats/bdb_get.c
@@ -492,7 +492,8 @@ int db_get_fileset_record(JCR *jcr, B_DB *mdb, FILESET_DBR *fsr)
    return stat;
 }
 
-
+bool db_get_query_dbids(JCR *jcr, B_DB *mdb, POOL_MEM &query, dbid_list &ids)
+{ return false; }
 
 int db_get_file_attributes_record(JCR *jcr, B_DB *mdb, char *fname, JOB_DBR *jr, FILE_DBR *fdbr)
 { return 0; }

diff --git a/bacula/src/qt-console/bat.pro.in b/bacula/src/qt-console/bat.pro.in
index ec236623a99df1bd8ca69c584dd7fb95478bbeda..7f3de5d6200ea3cffd26af6f8bcb38cd3d49e0e5 100644 (file)
--- a/bacula/src/qt-console/bat.pro.in
+++ b/bacula/src/qt-console/bat.pro.in
@@ -17,12 +17,12 @@ confs.commands = ./install_conf_file
 TEMPLATE = app
 TARGET = bat
 DEPENDPATH += .
-INCLUDEPATH += . ./console ./restore ./select
-INCLUDEPATH += .. ./qwt/include
+INCLUDEPATH += .. . ./console ./restore ./select
+INCLUDEPATH += @QWT_INC@
 LIBS        += -L../lib            
 LIBS        += -lbac
 LIBS        += -lssl -lcrypto
-LIBS        += -L./qwt/lib -lqwt
+LIBS        += @QWT_LDFLAGS@ -lqwt
 RESOURCES = main.qrc
 MOC_DIR = moc
 OBJECTS_DIR = obj

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 7ecd5a2beba66fd43a88c6474ed9a4a840d82033..9e4760fbb7ca3267719ac18e55afca4273c0dbb8 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.1.25"
-#define BDATE   "07 July 2007"
-#define LSMDATE "07Jul07"
+#define BDATE   "11 July 2007"
+#define LSMDATE "11Jul07"
 
 #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 5d16077baafe49f0b13587eaf4ead553540af386..0c614945f743444c0a43f140eea1318e2feea4cd 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,6 +1,10 @@
               Technical notes on version 2.1
 
 General:
+11Jul07
+kes  Move qwt (Graphics libarary for Qt4) to depkgs.
+kes  Update src/win32/cats/bacula_cats.def to include the new       
+     db_get_query_dbids() call on Win32.
 07Jul07
 kes  Correct a problem when selecting a scratch volume and moving
      it to another pool that lost some columns.