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)
# -------------------------------------------
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
GNOME_LIBS
GNOME_DIR
BAT_DIR
+QWT_INC
+QWT_LDFLAGS
WXCONS_CPPFLAGS
WXCONS_LDFLAGS
WX_DIR
--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
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
+
+
+
+
# -------------------------------------------
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
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
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
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
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
- 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
> 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.
- 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)
- 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, ...
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.
+
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; }
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
#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 */
_Z8InsertDBPKciP3JCRP4B_DBPc\r
_Z8UpdateDBPKciP3JCRP4B_DBPc\r
_Z8_db_lockPKciP4B_DB\r
+_ZN9dbid_listC1Ev\r
+_ZN9dbid_listC2Ev\r
+_ZN9dbid_listD1Ev\r
+_ZN9dbid_listD2Ev\r
\r
; sql_create.o\r
_Z12my_batch_endP3JCRP4B_DBPKc\r
_Z17db_get_client_idsP3JCRP4B_DBPiPPj\r
_Z17db_get_job_recordP3JCRP4B_DBP7JOB_DBR\r
_Z18db_get_pool_recordP3JCRP4B_DBP8POOL_DBR\r
+_Z18db_get_query_dbidsP3JCRP4B_DBR8POOL_MEMR9dbid_list\r
_Z19db_get_media_recordP3JCRP4B_DBP9MEDIA_DBR\r
_Z20db_get_client_recordP3JCRP4B_DBP10CLIENT_DBR\r
_Z21db_get_counter_recordP3JCRP4B_DBP11COUNTER_DBR\r
+++ /dev/null
-LIBRARY bacula_cats.dll\r
-EXPORTS\r
-\r
-; bdb.c:\r
-; mysql.c:\r
-; postgresql.c:\r
-; sqlite.c:\r
-?db_get_type@@YAPBDXZ\r
-?db_sql_query@@YAHPAUB_DB@@PBDP6AHPAXHPAPAD@Z2@Z\r
-?db_escape_string@@YAXPAD0H@Z\r
-?db_init_database@@YAPAUB_DB@@PAVJCR@@PBD111H1H@Z\r
-?db_open_database@@YAHPAVJCR@@PAUB_DB@@@Z\r
-?db_close_database@@YAXPAVJCR@@PAUB_DB@@@Z\r
-\r
-; sql.c:\r
-?_db_unlock@@YAXPBDHPAUB_DB@@@Z\r
-?db_strerror@@YAPADPAUB_DB@@@Z\r
-?db_int64_handler@@YAHPAXHPAPAD@Z\r
-?db_end_transaction@@YAXPAVJCR@@PAUB_DB@@@Z\r
-?db_start_transaction@@YAXPAVJCR@@PAUB_DB@@@Z\r
-?_db_lock@@YAXPBDHPAUB_DB@@@Z\r
-\r
-; sql_cmds.c\r
-?list_pool@@3PBDB DATA\r
-?client_backups@@3PBDB DATA\r
-?del_File@@3PBDB DATA\r
-?upd_Purged@@3PBDB DATA\r
-?cnt_DelCand@@3PBDB DATA\r
-?del_Job@@3PBDB DATA\r
-?del_JobMedia@@3PBDB DATA\r
-?cnt_JobMedia@@3PBDB DATA\r
-?sel_JobMedia@@3PBDB DATA\r
-?select_job@@3PBDB DATA\r
-?drop_deltabs@@3PAPBDA DATA\r
-?create_deltabs@@3PAPBDA DATA\r
-?insert_delcand@@3PBDB DATA\r
-?select_backup_del@@3PBDB DATA\r
-?select_verify_del@@3PBDB DATA\r
-?select_restore_del@@3PBDB DATA\r
-?select_admin_del@@3PBDB DATA\r
-?select_migrate_del@@3PBDB DATA\r
-?uar_count_files@@3PBDB DATA\r
-?uar_list_jobs@@3PBDB DATA\r
-?uar_file@@3PBDB DATA\r
-?uar_sel_files@@3PBDB DATA\r
-?uar_del_temp@@3PBDB DATA\r
-?uar_del_temp1@@3PBDB DATA\r
-?uar_create_temp@@3PBDB DATA\r
-?uar_create_temp1@@3PBDB DATA\r
-?uar_last_full@@3PBDB DATA\r
-?uar_full@@3PBDB DATA\r
-?uar_dif@@3PBDB DATA\r
-?uar_inc@@3PBDB DATA\r
-?uar_list_temp@@3PBDB DATA\r
-?uar_sel_jobid_temp@@3PBDB DATA\r
-?uar_sel_all_temp1@@3PBDB DATA\r
-?uar_sel_all_temp@@3PBDB DATA\r
-?uar_sel_fileset@@3PBDB DATA\r
-?uar_mediatype@@3PBDB DATA\r
-?uar_jobid_fileindex@@3PBDB DATA\r
-?uar_jobids_fileindex@@3PBDB DATA\r
-?uar_jobid_fileindex_from_dir@@3PBDB DATA\r
-?uar_jobid_fileindex_from_table@@3PBDB DATA\r
-\r
-; bdb_create.c:\r
-; sql_create.c:\r
-?db_create_job_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z\r
-?db_create_jobmedia_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOBMEDIA_DBR@@@Z\r
-?db_create_pool_record@@YA_NPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z\r
-?db_create_storage_record@@YA_NPAVJCR@@PAUB_DB@@PAVSTORAGE_DBR@@@Z\r
-?db_create_mediatype_record@@YA_NPAVJCR@@PAUB_DB@@PAVMEDIATYPE_DBR@@@Z\r
-?db_create_media_record@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
-?db_create_client_record@@YAHPAVJCR@@PAUB_DB@@PAUCLIENT_DBR@@@Z\r
-?db_create_counter_record@@YAHPAVJCR@@PAUB_DB@@PAUCOUNTER_DBR@@@Z\r
-?db_create_fileset_record@@YA_NPAVJCR@@PAUB_DB@@PAUFILESET_DBR@@@Z\r
-?db_create_file_attributes_record@@YAHPAVJCR@@PAUB_DB@@PAUATTR_DBR@@@Z\r
-\r
-; bdb_delete.c:\r
-; sql_delete.c:\r
-?db_delete_pool_record@@YAHPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z\r
-?db_delete_media_record@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
-\r
-; bdb_find.c:\r
-; sql_find.c:\r
-?db_find_job_start_time@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@PAPAD@Z\r
-?db_find_failed_job_since@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@PADAAH@Z\r
-?db_find_last_jobid@@YA_NPAVJCR@@PAUB_DB@@PBDPAUJOB_DBR@@@Z\r
-?db_find_next_volume@@YAHPAVJCR@@PAUB_DB@@H_NPAUMEDIA_DBR@@@Z\r
-\r
-; bdb_get.c:\r
-; sql_get.c:\r
-?db_get_file_attributes_record@@YAHPAVJCR@@PAUB_DB@@PADPAUJOB_DBR@@PAUFILE_DBR@@@Z\r
-?db_get_job_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z\r
-?db_get_job_volume_names@@YAHPAVJCR@@PAUB_DB@@IPAPAD@Z\r
-?db_get_job_volume_parameters@@YAHPAVJCR@@PAUB_DB@@IPAPAUVOL_PARAMS@@@Z\r
-?db_get_pool_ids@@YAHPAVJCR@@PAUB_DB@@PAHPAPAI@Z\r
-?db_get_client_ids@@YAHPAVJCR@@PAUB_DB@@PAHPAPAI@Z\r
-?db_get_pool_record@@YA_NPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z\r
-?db_get_client_record@@YAHPAVJCR@@PAUB_DB@@PAUCLIENT_DBR@@@Z\r
-?db_get_fileset_record@@YAHPAVJCR@@PAUB_DB@@PAUFILESET_DBR@@@Z\r
-?db_get_media_ids@@YA_NPAVJCR@@PAUB_DB@@IPAHPAPAI@Z\r
-?db_get_media_record@@YA_NPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
-\r
-; bdb_list.c:\r
-; sql_list.c:\r
-?db_list_sql_query@@YAHPAVJCR@@PAUB_DB@@PBDP6AXPAX2@Z3HW4e_list_type@@@Z\r
-?db_list_pool_records@@YAXPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@P6AXPAXPBD@Z3W4e_list_type@@@Z\r
-?db_list_client_records@@YAXPAVJCR@@PAUB_DB@@P6AXPAXPBD@Z2W4e_list_type@@@Z\r
-?db_list_media_records@@YAXPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@P6AXPAXPBD@Z3W4e_list_type@@@Z\r
-?db_list_jobmedia_records@@YAXPAVJCR@@PAUB_DB@@IP6AXPAXPBD@Z2W4e_list_type@@@Z\r
-?db_list_job_records@@YAXPAVJCR@@PAUB_DB@@PAUJOB_DBR@@P6AXPAXPBD@Z3W4e_list_type@@@Z\r
-?db_list_job_totals@@YAXPAVJCR@@PAUB_DB@@PAUJOB_DBR@@P6AXPAXPBD@Z3@Z\r
-?db_list_files_for_job@@YAXPAVJCR@@PAUB_DB@@IP6AXPAXPBD@Z2@Z\r
-\r
-; bdb_update.c:\r
-; sql_update.c:\r
-?db_add_digest_to_file_record@@YAHPAVJCR@@PAUB_DB@@IPADH@Z\r
-?db_mark_file_record@@YAHPAVJCR@@PAUB_DB@@II@Z\r
-?db_update_job_start_record@@YA_NPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z\r
-?db_update_job_end_record@@YAHPAVJCR@@PAUB_DB@@PAUJOB_DBR@@@Z\r
-?db_update_client_record@@YAHPAVJCR@@PAUB_DB@@PAUCLIENT_DBR@@@Z\r
-?db_update_counter_record@@YAHPAVJCR@@PAUB_DB@@PAUCOUNTER_DBR@@@Z\r
-?db_update_pool_record@@YAHPAVJCR@@PAUB_DB@@PAUPOOL_DBR@@@Z\r
-?db_update_storage_record@@YA_NPAVJCR@@PAUB_DB@@PAVSTORAGE_DBR@@@Z\r
-?db_update_media_record@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
-?db_update_media_defaults@@YAHPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
-?db_make_inchanger_unique@@YAXPAVJCR@@PAUB_DB@@PAUMEDIA_DBR@@@Z\r
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.
projects / bacula / bacula / commitdiff