Skip to content

Commit

Permalink
build: Rebuild configure.
Browse files Browse the repository at this point in the history
  • Loading branch information
Marco van Wieringen committed Sep 1, 2016
1 parent 7cdae0b commit 94b845c
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 1 deletion.
3 changes: 3 additions & 0 deletions autoconf/config.h.in
View file
Expand Up @@ -1209,6 +1209,9 @@
/* Directory for backend files */
#undef _PATH_BAREOS_BACKENDDIR

/* Directory for backend query files */
#undef _PATH_BAREOS_BACKENDQUERYDIR

/* Directory for PID files */
#undef _PATH_BAREOS_PIDDIR

Expand Down
57 changes: 56 additions & 1 deletion configure
View file
Expand Up @@ -693,6 +693,7 @@ SHARED_CATALOG_TARGETS
LIBTOOL_INSTALL_DEFAULT_BACKEND_TARGET
DEFAULT_DB_TYPE
DB_LIBS
BACKEND_QUERY_FILES
DB_BACKENDS
uncomment_dbi
SQLITE_BINDIR
Expand Down Expand Up @@ -743,6 +744,7 @@ plugindir
logdir
bsrdir
backenddir
backendquerydir
scriptdir
hostname
basename
Expand Down Expand Up @@ -1041,6 +1043,7 @@ with_archivedir
with_basename
with_hostname
with_scriptdir
with_backendquerydir
with_backenddir
with_bsrdir
with_logdir
Expand Down Expand Up @@ -1807,6 +1810,8 @@ Optional Packages:
--with-basename=RESNAME specify base resource name for daemons
--with-hostname=RESNAME specify host name for daemons
--with-scriptdir=PATH specify path of Bareos scripts directory
--with-backendquerydir=PATH
specify path of Bareos backend query directory
--with-backenddir=PATH specify path of Bareos backends directory
--with-bsrdir=PATH specify path of Bareos bsrs directory
--with-logdir=PATH specify path of Bareos logs directory
Expand Down Expand Up @@ -24790,6 +24795,25 @@ fi



backendquerydir=`eval echo ${scriptdir}/dml`

# Check whether --with-backendquerydir was given.
if test "${with_backendquerydir+set}" = set; then :
withval=$with_backendquerydir;
if test "x$withval" != "xno" ; then
backendquerydir=$withval
fi


fi



cat >>confdefs.h <<_ACEOF
#define _PATH_BAREOS_BACKENDQUERYDIR "$backendquerydir"
_ACEOF



# ------------------------------------------
# Where to place backenddir (backend library files)
Expand Down Expand Up @@ -26442,6 +26466,35 @@ if test x$build_client_only != xyes; then
done
;;
esac

DBI_BACKENDS="sqlite3 mysql postgresql"
BACKEND_QUERY_FILES=""
for backend in ${DB_BACKENDS}
do
case ${backend} in
dbi)
for dbi_backend in ${DBI_BACKENDS}
do
found=0
for defined_queryfile in ${BACKEND_QUERY_FILES}
do
if test ${defined_queryfile} = ${dbi_backend}; then
found=1
break
fi
done
if test ${found} = 0; then
test -z "${BACKEND_QUERY_FILES}" ] && BACKEND_QUERY_FILES="${dbi_backend}" || \
BACKEND_QUERY_FILES="${BACKEND_QUERY_FILES} ${dbi_backend}"
fi
done
;;
*)
test -z "${BACKEND_QUERY_FILES}" && BACKEND_QUERY_FILES="${backend}" || \
BACKEND_QUERY_FILES="${BACKEND_QUERY_FILES} ${backend}"
;;
esac
done
fi

if test x$use_dynamic_cats_backends = xyes; then
Expand All @@ -26462,6 +26515,7 @@ fi




$as_echo "#define PROTOTYPES 1" >>confdefs.h


Expand Down Expand Up @@ -33838,7 +33892,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
exit 1
fi

ac_config_files="$ac_config_files autoconf/Make.common Makefile GNUmakefile manpages/Makefile scripts/bareos-config scripts/bareos-config-lib.sh scripts/bareos-explorer scripts/bareos-glusterfind-wrapper scripts/btraceback scripts/bconsole scripts/bareos scripts/bareos-ctl-dir scripts/bareos-ctl-fd scripts/bareos-ctl-sd scripts/devel_bareos scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/logwatch/Makefile scripts/logwatch/logfile.bareos.conf scripts/bat.console_apps src/Makefile src/include/host.h src/console/Makefile src/console/bconsole.conf src/qt-tray-monitor/bareos-tray-monitor.desktop src/qt-tray-monitor/tray-monitor.conf src/qt-tray-monitor/tray-monitor.pro src/qt-console/bat.conf src/qt-console/bat.desktop src/qt-console/bat.pro src/qt-console/install_conf_file src/defaultconfigs/bareos-dir.d/catalog/MyCatalog.conf src/defaultconfigs/bareos-dir.d/client/bareos-fd.conf src/defaultconfigs/bareos-dir.d/console/bareos-mon.conf src/defaultconfigs/bareos-dir.d/director/bareos-dir.conf src/defaultconfigs/bareos-dir.d/fileset/Catalog.conf src/defaultconfigs/bareos-dir.d/fileset/LinuxAll.conf src/defaultconfigs/bareos-dir.d/fileset/SelfTest.conf src/defaultconfigs/bareos-dir.d/job/BackupCatalog.conf src/defaultconfigs/bareos-dir.d/jobdefs/DefaultJob.conf src/defaultconfigs/bareos-dir.d/messages/Daemon.conf src/defaultconfigs/bareos-dir.d/messages/Standard.conf src/defaultconfigs/bareos-dir.d/storage/File.conf src/defaultconfigs/bareos-sd.d/device/FileStorage.conf src/defaultconfigs/bareos-sd.d/director/bareos-dir.conf src/defaultconfigs/bareos-sd.d/director/bareos-mon.conf src/defaultconfigs/bareos-sd.d/storage/bareos-sd.conf src/defaultconfigs/bareos-fd.d/client/myself.conf src/defaultconfigs/bareos-fd.d/director/bareos-dir.conf src/defaultconfigs/bareos-fd.d/director/bareos-mon.conf src/defaultconfigs/tray-monitor.d/client/FileDaemon-local.conf src/defaultconfigs/tray-monitor.d/director/Director-local.conf src/defaultconfigs/tray-monitor.d/monitor/bareos-mon.conf src/defaultconfigs/tray-monitor.d/storage/StorageDaemon-local.conf src/dird/Makefile src/dird/bareos-dir.conf src/lib/Makefile src/lib/unittests/Makefile src/stored/Makefile src/stored/bareos-sd.conf src/stored/backends/Makefile src/filed/Makefile src/filed/bareos-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_bareos_database src/cats/update_bareos_tables src/cats/grant_bareos_privileges src/cats/make_bareos_tables src/cats/drop_bareos_tables src/cats/drop_bareos_database src/cats/install-default-backend src/cats/ddl/versions.map src/findlib/Makefile src/findlib/unittests/Makefile src/lmdb/Makefile src/ndmp/Makefile src/tests/Makefile src/tools/Makefile src/plugins/filed/Makefile src/plugins/filed/python-ldap-conf.d/bareos-dir.d/fileset/plugin-ldap.conf.example src/plugins/stored/Makefile src/plugins/dird/Makefile po/Makefile.in src/defaultconfigs/diskonly/bareos-sd.conf src/defaultconfigs/diskonly/bareos-dir.conf $PFILES"
ac_config_files="$ac_config_files autoconf/Make.common Makefile GNUmakefile manpages/Makefile scripts/bareos-config scripts/bareos-config-lib.sh scripts/bareos-explorer scripts/bareos-glusterfind-wrapper scripts/btraceback scripts/bconsole scripts/bareos scripts/bareos-ctl-dir scripts/bareos-ctl-fd scripts/bareos-ctl-sd scripts/devel_bareos scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/logwatch/Makefile scripts/logwatch/logfile.bareos.conf scripts/bat.console_apps src/Makefile src/include/host.h src/console/Makefile src/console/bconsole.conf src/qt-tray-monitor/bareos-tray-monitor.desktop src/qt-tray-monitor/tray-monitor.conf src/qt-tray-monitor/tray-monitor.pro src/qt-console/bat.conf src/qt-console/bat.desktop src/qt-console/bat.pro src/qt-console/install_conf_file src/defaultconfigs/bareos-dir.d/catalog/MyCatalog.conf src/defaultconfigs/bareos-dir.d/client/bareos-fd.conf src/defaultconfigs/bareos-dir.d/console/bareos-mon.conf src/defaultconfigs/bareos-dir.d/director/bareos-dir.conf src/defaultconfigs/bareos-dir.d/fileset/Catalog.conf src/defaultconfigs/bareos-dir.d/fileset/LinuxAll.conf src/defaultconfigs/bareos-dir.d/fileset/SelfTest.conf src/defaultconfigs/bareos-dir.d/job/BackupCatalog.conf src/defaultconfigs/bareos-dir.d/jobdefs/DefaultJob.conf src/defaultconfigs/bareos-dir.d/messages/Daemon.conf src/defaultconfigs/bareos-dir.d/messages/Standard.conf src/defaultconfigs/bareos-dir.d/storage/File.conf src/defaultconfigs/bareos-sd.d/device/FileStorage.conf src/defaultconfigs/bareos-sd.d/director/bareos-dir.conf src/defaultconfigs/bareos-sd.d/director/bareos-mon.conf src/defaultconfigs/bareos-sd.d/storage/bareos-sd.conf src/defaultconfigs/bareos-fd.d/client/myself.conf src/defaultconfigs/bareos-fd.d/director/bareos-dir.conf src/defaultconfigs/bareos-fd.d/director/bareos-mon.conf src/defaultconfigs/tray-monitor.d/client/FileDaemon-local.conf src/defaultconfigs/tray-monitor.d/director/Director-local.conf src/defaultconfigs/tray-monitor.d/monitor/bareos-mon.conf src/defaultconfigs/tray-monitor.d/storage/StorageDaemon-local.conf src/dird/Makefile src/dird/bareos-dir.conf src/lib/Makefile src/lib/unittests/Makefile src/stored/Makefile src/stored/bareos-sd.conf src/stored/backends/Makefile src/filed/Makefile src/filed/bareos-fd.conf src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_bareos_database src/cats/update_bareos_tables src/cats/grant_bareos_privileges src/cats/make_bareos_tables src/cats/drop_bareos_tables src/cats/drop_bareos_database src/cats/install-default-backend src/cats/ddl/versions.map src/cats/dml/Makefile src/findlib/Makefile src/findlib/unittests/Makefile src/lmdb/Makefile src/ndmp/Makefile src/tests/Makefile src/tools/Makefile src/plugins/filed/Makefile src/plugins/filed/python-ldap-conf.d/bareos-dir.d/fileset/plugin-ldap.conf.example src/plugins/stored/Makefile src/plugins/dird/Makefile po/Makefile.in src/defaultconfigs/diskonly/bareos-sd.conf src/defaultconfigs/diskonly/bareos-dir.conf $PFILES"

cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
Expand Down Expand Up @@ -35008,6 +35062,7 @@ do
"src/cats/drop_bareos_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_bareos_database" ;;
"src/cats/install-default-backend") CONFIG_FILES="$CONFIG_FILES src/cats/install-default-backend" ;;
"src/cats/ddl/versions.map") CONFIG_FILES="$CONFIG_FILES src/cats/ddl/versions.map" ;;
"src/cats/dml/Makefile") CONFIG_FILES="$CONFIG_FILES src/cats/dml/Makefile" ;;
"src/findlib/Makefile") CONFIG_FILES="$CONFIG_FILES src/findlib/Makefile" ;;
"src/findlib/unittests/Makefile") CONFIG_FILES="$CONFIG_FILES src/findlib/unittests/Makefile" ;;
"src/lmdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/lmdb/Makefile" ;;
Expand Down

0 comments on commit 94b845c

Please sign in to comment.