From b94c9412b27482f6e6499266c09b8287423b96a1 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 13 May 2008 06:50:22 +0000 Subject: [PATCH] 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 --- bacula/autoconf/aclocal.m4 | 4 ++-- bacula/autoconf/configure.in | 2 -- bacula/configure | 2 -- bacula/src/filed/acl.h | 2 +- bacula/technotes-2.3 | 2 ++ 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bacula/autoconf/aclocal.m4 b/bacula/autoconf/aclocal.m4 index 148a8f058f..a1c61deb13 100644 --- 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 d61c45399d..2540ac09c0 100644 --- 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 8be86793c6..d5d7cf3017 100755 --- 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 b716c69229..c690b1a568 100644 --- 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 38a4ec9d95..40d50f69eb 100644 --- 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 -- 2.39.5