X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=42440e2bfb6ecefb452aeebac756d74060ae7db6;hb=a698b6e3cd8527d96541276cd912496b5ca0e175;hp=555921d121ee6dece7bd3073d3619eb5a6ea01fe;hpb=6d8e2b21f661b4d1844d0b8dce3df119ca2952aa;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index 555921d121..42440e2bfb 100755 --- a/bacula/configure +++ b/bacula/configure @@ -774,6 +774,8 @@ GNOME_DIR BAT_DIR QWT_INC QWT_LDFLAGS +QWT_LIB +QWT WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR @@ -833,6 +835,7 @@ SQL_INCLUDE SQL_BINDIR DBI_DBD_DRIVERDIR DB_PROG +DB_PROG_LIB cats DB_TYPE GETCONF @@ -1458,6 +1461,7 @@ Optional Features: --enable-bwx-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 + --enable-faketape enable faketape debugging support disabled --enable-static-tools enable static tape tools disabled --enable-static-fd enable static File daemon disabled --enable-static-sd enable static Storage daemon disabled @@ -1473,6 +1477,7 @@ Optional Features: --disable-readline disable readline support disable --enable-batch-insert enable the DB batch insert code disabled + --enable-batch-insert enable the DB batch insert code disabled --disable-largefile omit support for large files Optional Packages: @@ -13425,7 +13430,7 @@ _ACEOF fi - +support_faketape=no support_mysql=no support_sqlite=no support_sqlite3=no @@ -13523,6 +13528,9 @@ fi got_qwt=no QWT_INC= QWT_LDFLAGS= +QWT_LIB= +QWT= +no_qwt=no if test x$support_bat = xyes; then { echo "$as_me:$LINENO: checking for qwt support" >&5 echo $ECHO_N "checking for qwt support... $ECHO_C" >&6; } @@ -13532,11 +13540,14 @@ if test "${with_qwt+set}" = set; then withval=$with_qwt; case "$with_qwt" in no) + no_qwt=yes ;; yes|*) if test -f ${with_qwt}/include/qwt.h; then QWT_INC="${with_qwt}/include" QWT_LDFLAGS="-L${with_qwt}/lib" + QWT_LIB="-lqwt" + QWT="qwt" fi ;; esac @@ -13547,7 +13558,8 @@ fi # # Search in standard places, or --with-qwt not specified # - if test x$QWT_INC = x; then + if test $no_qwt = no; then + if test x$QWT_INC = x; then for root in /usr /usr/local; do for ver in qwt qwt5 qwt-qt4; do if test -f ${root}/include/${ver}/qwt.h; then @@ -13557,21 +13569,24 @@ fi else QWT_LDFLAGS="-L${root}/lib" fi + QWT_LIB="-lqwt" + QWT="qwt" got_qwt=yes break; fi done done + fi fi if test x$QWT_INC = x; then { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Unable to find qwt package needed by bat" >&5 -echo "$as_me: error: Unable to find qwt package needed by bat" >&2;} - { (exit 1); exit 1; }; } - BAT_DIR= - support_bat=no else + +cat >>confdefs.h <<\_ACEOF +#define HAVE_QWT 1 +_ACEOF + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } fi @@ -13582,6 +13597,8 @@ fi + + # ------------------------------------------- # bwx-console (default off) # ------------------------------------------- @@ -13668,6 +13685,25 @@ _ACEOF fi +# ------------------------------------------- +# faketape (default off) +# ------------------------------------------- +# Check whether --enable-faketape was given. +if test "${enable_faketape+set}" = set; then + enableval=$enable_faketape; if test x$enableval = xyes; then + support_faketape=yes + fi +fi + + +if test x$support_faketape = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define USE_FAKETAPE 1 +_ACEOF + +fi + # ------------------------------------------- # static-tools (default off) # ------------------------------------------- @@ -18014,10 +18050,48 @@ if test "${with_dbi_driver+set}" = set; then db_prog="mysql" if test -f /usr/local/mysql/bin/mysql; then SQL_BINDIR=/usr/local/mysql/bin + if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \ + -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then + SQL_LIBDIR=/usr/local/mysql/lib64/mysql + else + SQL_LIBDIR=/usr/local/mysql/lib/mysql + fi elif test -f /usr/bin/mysql; then SQL_BINDIR=/usr/bin + if test -f /usr/lib64/mysql/libmysqlclient_r.a \ + -o -f /usr/lib64/mysql/libmysqlclient_r.so; then + SQL_LIBDIR=/usr/lib64/mysql + elif test -f /usr/lib/mysql/libmysqlclient_r.a \ + -o -f /usr/lib/mysql/libmysqlclient_r.so; then + SQL_LIBDIR=/usr/lib/mysql + else + SQL_LIBDIR=/usr/lib + fi elif test -f /usr/local/bin/mysql; then SQL_BINDIR=/usr/local/bin + if test -f /usr/local/lib64/mysql/libmysqlclient_r.a \ + -o -f /usr/local/lib64/mysql/libmysqlclient_r.so; then + SQL_LIBDIR=/usr/local/lib64/mysql + elif test -f /usr/local/lib/mysql/libmysqlclient_r.a \ + -o -f /usr/local/lib/mysql/libmysqlclient_r.so; then + SQL_LIBDIR=/usr/local/lib/mysql + else + SQL_LIBDIR=/usr/local/lib + fi + elif test -f $withval/bin/mysql; then + SQL_BINDIR=$withval/bin + if test -f $withval/lib64/mysql/libmysqlclient_r.a \ + -o -f $withval/lib64/mysql/libmysqlclient_r.so; then + SQL_LIBDIR=$withval/lib64/mysql + elif test -f $withval/lib64/libmysqlclient_r.a \ + -o -f $withval/lib64/libmysqlclient_r.so; then + SQL_LIBDIR=$withval/lib64 + elif test -f $withval/lib/libmysqlclient_r.a \ + -o -f $withval/lib/libmysqlclient_r.so; then + SQL_LIBDIR=$withval/lib/ + else + SQL_LIBDIR=$withval/lib/mysql + fi else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } @@ -18025,23 +18099,47 @@ echo "${ECHO_T}no" >&6; } echo "$as_me: error: Unable to find mysql in standard locations" >&2;} { (exit 1); exit 1; }; } fi + DB_PROG_LIB=$SQL_LIBDIR/libmysqlclient_r.a ;; "postgresql") db_prog="postgresql" PG_CONFIG=`which pg_config` - if test -n "$PG_CONFIG";then + if test -n "$PG_CONFIG"; then SQL_BINDIR=`"$PG_CONFIG" --bindir` + SQL_LIBDIR=`"$PG_CONFIG" --libdir` elif test -f /usr/local/bin/psql; then SQL_BINDIR=/usr/local/bin + if test -d /usr/local/lib64; then + SQL_LIBDIR=/usr/local/lib64 + else + SQL_LIBDIR=/usr/local/lib + fi elif test -f /usr/bin/psql; then - SQL_BINDIR=/usr/bin + SQL_BINDIR=/usr/local/bin + if test -d /usr/lib64/postgresql; then + SQL_LIBDIR=/usr/lib64/postgresql + elif test -d /usr/lib/postgresql; then + SQL_LIBDIR=/usr/lib/postgresql + elif test -d /usr/lib64; then + SQL_LIBDIR=/usr/lib64 + else + SQL_LIBDIR=/usr/lib + fi + elif test -f $withval/bin/psql; then + SQL_BINDIR=$withval/bin + if test -d $withval/lib64; then + SQL_LIBDIR=$withval/lib64 + else + SQL_LIBDIR=$withval/lib + fi else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } { { echo "$as_me:$LINENO: error: Unable to find psql in standard locations" >&5 echo "$as_me: error: Unable to find psql in standard locations" >&2;} { (exit 1); exit 1; }; } - fi + fi + DB_PROG_LIB=$SQL_LIBDIR/libpq.a ;; *) { echo "$as_me:$LINENO: result: no" >&5 @@ -18055,7 +18153,6 @@ echo "$as_me: error: Unable to set DBI driver. $withval is not supported" >&2;} { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } DB_PROG=$db_prog - else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } @@ -18076,6 +18173,7 @@ fi + # ------------------------------------------- # enable batch attribute DB insert (default on) # ------------------------------------------- @@ -18107,6 +18205,29 @@ fi if test x$DB_TYPE = xdbi; then DB_TYPE=$DB_PROG db_type=$DB_PROG + pkg=1 + # Check for batch insert + if test $DB_PROG = postgresql; then + A=`nm $DB_PROG_LIB | grep PQputCopyData` + pkg=$? + fi + + if test $DB_PROG = mysql; then + A=`nm $DB_PROG_LIB | grep pthread_mutex_lock` + pkg=$? + fi + + if test $pkg = 0; then + # Check whether --enable-batch-insert was given. +if test "${enable_batch_insert+set}" = set; then + enableval=$enable_batch_insert; if test x$enableval = xno; then + support_batch_insert=no + else + support_batch_insert=yes + fi +fi + + fi fi if test $support_batch_insert = yes ; then @@ -30110,14 +30231,37 @@ darwin) platforms/darwin/Makefile" ;; debian) + if `grep -q ubuntu /etc/apt/sources.list`; then + DISTNAME="ubuntu" + fi DISTVER=`cat /etc/debian_version` + if test -f /etc/lsb-release ; then + . /etc/lsb-release + if test "x$DISTRIB_ID" != "x" ; then + DISTNAME=$DISTRIB_ID + fi + if test "x$DISTRIB_RELEASE" != "x" ; then + DISTVER=$DISTRIB_RELEASE + fi + fi + if test "$DISTNAME" = "Ubuntu" ; then + DISTNAME="ubuntu" + fi TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" - PFILES="${PFILES} \ - platforms/debian/Makefile \ - platforms/debian/bacula-fd \ - platforms/debian/bacula-sd \ - platforms/debian/bacula-dir" + if test "$DISTNAME" = "ubuntu" ; then + PFILES="${PFILES} \ + platforms/ubuntu/Makefile \ + platforms/ubuntu/bacula-fd \ + platforms/ubuntu/bacula-sd \ + platforms/ubuntu/bacula-dir" + else + PFILES="${PFILES} \ + platforms/debian/Makefile \ + platforms/debian/bacula-fd \ + platforms/debian/bacula-sd \ + platforms/debian/bacula-dir" + fi ;; freebsd) DISTVER=`uname -a |awk '{print $3}'` @@ -30325,7 +30469,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi -ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile po/Makefile.in $PFILES" +ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile po/Makefile.in updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" ac_config_commands="$ac_config_commands default" @@ -31001,6 +31145,10 @@ do "src/findlib/Makefile") CONFIG_FILES="$CONFIG_FILES src/findlib/Makefile" ;; "src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "updatedb/update_mysql_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_10_to_11" ;; + "updatedb/update_sqlite3_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_10_to_11" ;; + "updatedb/update_postgresql_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_10_to_11" ;; + "updatedb/update_sqlite_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite_tables_10_to_11" ;; "$PFILES") CONFIG_FILES="$CONFIG_FILES $PFILES" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; @@ -31276,6 +31424,8 @@ GNOME_DIR!$GNOME_DIR$ac_delim BAT_DIR!$BAT_DIR$ac_delim QWT_INC!$QWT_INC$ac_delim QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim +QWT_LIB!$QWT_LIB$ac_delim +QWT!$QWT$ac_delim WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim WX_DIR!$WX_DIR$ac_delim @@ -31304,8 +31454,6 @@ PYTHON_INCDIR!$PYTHON_INCDIR$ac_delim OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim OPENSSL_INC!$OPENSSL_INC$ac_delim working_dir!$working_dir$ac_delim -archivedir!$archivedir$ac_delim -scriptdir!$scriptdir$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -31347,6 +31495,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +archivedir!$archivedir$ac_delim +scriptdir!$scriptdir$ac_delim dump_email!$dump_email$ac_delim job_email!$job_email$ac_delim smtp_host!$smtp_host$ac_delim @@ -31376,6 +31526,7 @@ SQL_INCLUDE!$SQL_INCLUDE$ac_delim SQL_BINDIR!$SQL_BINDIR$ac_delim DBI_DBD_DRIVERDIR!$DBI_DBD_DRIVERDIR$ac_delim DB_PROG!$DB_PROG$ac_delim +DB_PROG_LIB!$DB_PROG_LIB$ac_delim cats!$cats$ac_delim DB_TYPE!$DB_TYPE$ac_delim GETCONF!$GETCONF$ac_delim @@ -31404,7 +31555,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` = 55; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -31966,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" @@ -31975,6 +32124,17 @@ if test "${support_bat}" = "yes" ; then cd ${BUILD_DIR} fi +# configure and prepare libtokyodbm for bacula +pushd src/lib/tokyocabinet > /dev/null +tcdbm_opt= +if test x$largefile_support = xyes; then + tcdbm_opt=--enable-off64 +fi +./configure $tcdbm_opt +popd > /dev/null +# need tokyo header files for "make depend" +cp src/lib/tokyocabinet/t*.h src/lib + echo "Doing make of dependencies" ${MAKE:-make} depend @@ -31984,6 +32144,10 @@ chmod 755 dvd-handler dvd-simulator chmod 755 bconsole gconsole mtx-changer devel_bacula logrotate cd .. +c=updatedb +chmod 755 $c/update_mysql_tables_10_to_11 $c/update_sqlite3_tables_10_to_11 +chmod 755 $c/update_postgresql_tables_10_to_11 $c/update_sqlite_tables_10_to_11 + c=src/cats chmod 755 $c/create_bacula_database $c/update_bacula_tables $c/make_bacula_tables @@ -32110,6 +32274,7 @@ Configuration on `date`: Encryption support: ${support_crypto} ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} + enable-faketape: ${support_faketape} bat support: ${support_bat} ${QWT_LDFLAGS} enable-gnome: ${support_gnome} ${gnome_version} enable-bwx-console: ${support_wx_console} ${wx_version}