kes Implement --without-qwt

kes  Fix layout of restore tree dialog

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

diff --git a/bacula/autoconf/aclocal.m4 b/bacula/autoconf/aclocal.m4
index 148a8f058f1237f16714f87820b18d750815b514..a1c61deb138634c0d62af1a6265df083e8424134 100644 (file)
--- a/bacula/autoconf/aclocal.m4
+++ b/bacula/autoconf/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index d61c45399d0bfec9b4ecb0d044fdad3a52bf1336..2540ac09c06743aa86d32ac0f29caf5e300fa700 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2337,8 +2337,6 @@ if test "${support_bat}" = "yes" ; then
   if test "x$QMAKEQT4" != "xnone"; then
     QMAKEBIN=qmake-qt4
   fi
-
-
   
   cd src/qt-console
   chmod 755 install_conf_file build-depkgs-qt-console

diff --git a/bacula/configure b/bacula/configure
index 8be86793c6d264d63cabf78daaa30f8d3924519c..d5d7cf30177618b692dced3855717303cf96533e 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -32117,8 +32117,6 @@ if test "${support_bat}" = "yes" ; then
     QMAKEBIN=qmake-qt4
   fi
 
-
-
   cd src/qt-console
   chmod 755 install_conf_file build-depkgs-qt-console
   echo "Creating bat Makefile"

diff --git a/bacula/src/filed/acl.h b/bacula/src/filed/acl.h
index b716c69229175658ec0cd05b7f4675bcc596aae9..c690b1a5684970771e5e0e4383943a4de62bbef6 100644 (file)
--- a/bacula/src/filed/acl.h
+++ b/bacula/src/filed/acl.h
@@ -4,7 +4,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2004-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 38a4ec9d9560771f89d6fe9885b1a6f991086685..40d50f69eb2b7243e298ea830394b775616cf4f1 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -25,6 +25,8 @@ Add long term statistics job table
 
 General:
 12May08
+kes  Implement --without-qwt
+kes  Fix layout of restore tree dialog
 kes  Add configure bat QWT libraries, so that bat can be built
      with or without the QWT libaries.
 11May08