From e78e69bdcd74470750eeec179d188ebae14fc381 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 26 Mar 2007 16:32:56 +0000 Subject: [PATCH] kes Turn on Batch insert code by default as it now passes regression. kes Add ./configure --enable-bat to enable building of Bat. No install yet though. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4428 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/Makefile.in | 2 +- bacula/autoconf/config.h.in | 3 +++ bacula/autoconf/configure.in | 24 +++++++++++++++++++++ bacula/configure | 39 +++++++++++++++++++++++++++++++++-- bacula/scripts/mtx-changer.in | 4 ++-- bacula/src/version.h | 6 +++--- bacula/technotes-2.1 | 4 ++++ 7 files changed, 74 insertions(+), 8 deletions(-) diff --git a/bacula/Makefile.in b/bacula/Makefile.in index b39b5598e4..21e76034da 100755 --- a/bacula/Makefile.in +++ b/bacula/Makefile.in @@ -19,7 +19,7 @@ dummy: # --client-only directories fd_subdirs = src scripts src/lib src/findlib src/filed \ - @READLINE_SRC@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \ + @READLINE_SRC@ @BAT_DIR@ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \ src/console # Non-client-only directores diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index 5310b7d753..e8cbef04e7 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -276,6 +276,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ASSERT_H +/* Set if Bacula bat Qt4 GUI support enabled */ +#undef HAVE_BAT + /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ #undef HAVE_CFLOCALECOPYCURRENT diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 4ba634568a..006287616c 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -196,6 +196,7 @@ support_smartalloc=yes support_readline=yes support_conio=yes support_gnome=no +support_bat=no support_wx_console=no support_tls=no support_crypto=no @@ -248,6 +249,28 @@ if test x$support_gnome = xyes; then fi AC_SUBST(GNOME_DIR) +# ------------------------------------------- +# bat (default off) +# ------------------------------------------- +AC_ARG_ENABLE(bat, + [ --enable-bat enable build of bat Qt4 GUI [disabled]], + [if test x$enableval = xyes; then + AC_DEFINE(HAVE_BAT, 1, [Set if Bacula bat Qt4 GUI support enabled]) + support_bat=yes + fi]) + +BAT_DIR= +if test x$support_bat = xyes; then + abc=`$PKGCONFIG --atleast-version=4.2 QtGui` + pkg=$? + if test $pkg = 0; then + BAT_DIR=src/qt-console + else + AC_MSG_ERROR(Unable to find Qt4 installation needed by bat) + fi +fi +AC_SUBST(BAT_DIR) + # ------------------------------------------- # wx-console (default off) @@ -2182,6 +2205,7 @@ Configuration on `date`: Encryption support: ${support_crypto} ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} + enable-bat: ${support_bat} enable-gnome: ${support_gnome} ${gnome_version} enable-wx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} diff --git a/bacula/configure b/bacula/configure index a3816265f5..f7f2b9266a 100755 --- a/bacula/configure +++ b/bacula/configure @@ -754,6 +754,7 @@ GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR +BAT_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR @@ -1428,6 +1429,7 @@ Optional Features: --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths --enable-gnome enable build of gnome-console GUI disabled + --enable-bat enable build of bat Qt4 GUI disabled --enable-wx-console enable build of wxWidgets console disabled --enable-tray-monitor enable build of Gnome tray monitor (compatible with KDE) disabled --enable-smartalloc enable smartalloc debugging support disabled @@ -14616,6 +14618,7 @@ support_smartalloc=yes support_readline=yes support_conio=yes support_gnome=no +support_bat=no support_wx_console=no support_tls=no support_crypto=no @@ -14669,6 +14672,36 @@ echo "$as_me: error: Unable to find Gnome 2 installation" >&2;} fi +# ------------------------------------------- +# bat (default off) +# ------------------------------------------- +# Check whether --enable-bat was given. +if test "${enable_bat+set}" = set; then + enableval=$enable_bat; if test x$enableval = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BAT 1 +_ACEOF + + support_bat=yes + fi +fi + + +BAT_DIR= +if test x$support_bat = xyes; then + abc=`$PKGCONFIG --atleast-version=4.2 QtGui` + pkg=$? + if test $pkg = 0; then + BAT_DIR=src/qt-console + else + { { echo "$as_me:$LINENO: error: Unable to find Qt4 installation needed by bat" >&5 +echo "$as_me: error: Unable to find Qt4 installation needed by bat" >&2;} + { (exit 1); exit 1; }; } + fi +fi + + # ------------------------------------------- # wx-console (default off) @@ -34711,6 +34744,7 @@ GNOMEUI_LIBS!$GNOMEUI_LIBS$ac_delim GNOME_LIBDIR!$GNOME_LIBDIR$ac_delim GNOME_LIBS!$GNOME_LIBS$ac_delim GNOME_DIR!$GNOME_DIR$ac_delim +BAT_DIR!$BAT_DIR$ac_delim WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim WX_DIR!$WX_DIR$ac_delim @@ -34745,7 +34779,6 @@ job_email!$job_email$ac_delim smtp_host!$smtp_host$ac_delim piddir!$piddir$ac_delim subsysdir!$subsysdir$ac_delim -baseport!$baseport$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -34787,6 +34820,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +baseport!$baseport$ac_delim dir_port!$dir_port$ac_delim fd_port!$fd_port$ac_delim sd_port!$sd_port$ac_delim @@ -34834,7 +34868,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` = 45; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -35511,6 +35545,7 @@ Configuration on `date`: Encryption support: ${support_crypto} ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} + enable-bat: ${support_bat} enable-gnome: ${support_gnome} ${gnome_version} enable-wx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} diff --git a/bacula/scripts/mtx-changer.in b/bacula/scripts/mtx-changer.in index 82e85f9708..44a3e41b60 100644 --- a/bacula/scripts/mtx-changer.in +++ b/bacula/scripts/mtx-changer.in @@ -164,8 +164,8 @@ case $cmd in # # Increase the sleep time if you have a slow device # or remove the sleep and add the following: -# wait_for_drive $device - sleep 15 +# sleep 15 + wait_for_drive $device exit $rtn ;; diff --git a/bacula/src/version.h b/bacula/src/version.h index b9ad4da1f8..bddc782489 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -4,8 +4,8 @@ #undef VERSION #define VERSION "2.1.6" -#define BDATE "25 March 2007" -#define LSMDATE "25Mar07" +#define BDATE "26 March 2007" +#define LSMDATE "26Mar07" #define PROG_COPYRIGHT "Copyright (C) %d-2007 Free Software Foundation Europe e.V.\n" #define BYEAR "2007" /* year for copyright messages in progs */ @@ -56,7 +56,7 @@ /* Turn on the following flag to enable batch attribute inserts * in the catalog. This gives a large speedup. */ -/* #define HAVE_BATCH_FILE_INSERT 1 */ +#define HAVE_BATCH_FILE_INSERT 1 /* Debug flags not normally turned on */ diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1 index 06137cdad8..d41246094d 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -1,6 +1,10 @@ Technical notes on version 2.1 General: +26Mar07 +kes Turn on Batch insert code by default as it now passes regression. +kes Add ./configure --enable-bat to enable building of Bat. + No install yet though. 25Mar07 kes Implement a new .sql command for bat. kes Implement code to turn off pruning in obtaining the next volume. -- 2.39.2