From 8eb329a1e60543b190f96f9b520d19c462afedf5 Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Thu, 27 Feb 2014 15:15:52 +0100 Subject: [PATCH] Revert "Rebuild configure." This reverts commit 9a6e898cac8b719a2b567ca9194673906e7803ce. --- configure | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 42e44e02e45..093fd55ae53 100755 --- a/configure +++ b/configure @@ -31730,7 +31730,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi -ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile debian/bareos-common.preinst debian/bareos-filedaemon.preinst debian/bareos-director.preinst debian/bareos-storage.preinst scripts/bareos-config scripts/bareos-config-lib.sh 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/dird/Makefile src/dird/bareos-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bareos-sd.conf 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/findlib/Makefile src/ndmp/Makefile src/tests/Makefile src/tools/Makefile src/plugins/filed/Makefile 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 manpages/Makefile debian/bareos-common.preinst debian/bareos-filedaemon.preinst debian/bareos-director.preinst debian/bareos-storage.preinst scripts/bareos-config 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/dird/Makefile src/dird/bareos-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bareos-sd.conf 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_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_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_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/findlib/Makefile src/ndmp/Makefile src/tests/Makefile src/tools/Makefile src/plugins/filed/Makefile 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_commands="$ac_config_commands default" @@ -32827,7 +32827,6 @@ do "debian/bareos-director.preinst") CONFIG_FILES="$CONFIG_FILES debian/bareos-director.preinst" ;; "debian/bareos-storage.preinst") CONFIG_FILES="$CONFIG_FILES debian/bareos-storage.preinst" ;; "scripts/bareos-config") CONFIG_FILES="$CONFIG_FILES scripts/bareos-config" ;; - "scripts/bareos-config-lib.sh") CONFIG_FILES="$CONFIG_FILES scripts/bareos-config-lib.sh" ;; "scripts/btraceback") CONFIG_FILES="$CONFIG_FILES scripts/btraceback" ;; "scripts/bconsole") CONFIG_FILES="$CONFIG_FILES scripts/bconsole" ;; "scripts/bareos") CONFIG_FILES="$CONFIG_FILES scripts/bareos" ;; @@ -32864,6 +32863,26 @@ do "src/cats/make_catalog_backup.pl") CONFIG_FILES="$CONFIG_FILES src/cats/make_catalog_backup.pl" ;; "src/cats/make_catalog_backup") CONFIG_FILES="$CONFIG_FILES src/cats/make_catalog_backup" ;; "src/cats/delete_catalog_backup") CONFIG_FILES="$CONFIG_FILES src/cats/delete_catalog_backup" ;; + "src/cats/create_postgresql_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_postgresql_database" ;; + "src/cats/update_postgresql_tables") CONFIG_FILES="$CONFIG_FILES src/cats/update_postgresql_tables" ;; + "src/cats/make_postgresql_tables") CONFIG_FILES="$CONFIG_FILES src/cats/make_postgresql_tables" ;; + "src/cats/grant_postgresql_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_postgresql_privileges" ;; + "src/cats/drop_postgresql_tables") CONFIG_FILES="$CONFIG_FILES src/cats/drop_postgresql_tables" ;; + "src/cats/drop_postgresql_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_postgresql_database" ;; + "src/cats/create_mysql_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_mysql_database" ;; + "src/cats/update_mysql_tables") CONFIG_FILES="$CONFIG_FILES src/cats/update_mysql_tables" ;; + "src/cats/make_mysql_tables") CONFIG_FILES="$CONFIG_FILES src/cats/make_mysql_tables" ;; + "src/cats/grant_mysql_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_mysql_privileges" ;; + "src/cats/drop_mysql_tables") CONFIG_FILES="$CONFIG_FILES src/cats/drop_mysql_tables" ;; + "src/cats/drop_mysql_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_mysql_database" ;; + "src/cats/create_sqlite3_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_sqlite3_database" ;; + "src/cats/update_sqlite3_tables") CONFIG_FILES="$CONFIG_FILES src/cats/update_sqlite3_tables" ;; + "src/cats/make_sqlite3_tables") CONFIG_FILES="$CONFIG_FILES src/cats/make_sqlite3_tables" ;; + "src/cats/grant_sqlite3_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_sqlite3_privileges" ;; + "src/cats/drop_sqlite3_tables") CONFIG_FILES="$CONFIG_FILES src/cats/drop_sqlite3_tables" ;; + "src/cats/drop_sqlite3_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_sqlite3_database" ;; + "src/cats/sqlite") CONFIG_FILES="$CONFIG_FILES src/cats/sqlite" ;; + "src/cats/mysql") CONFIG_FILES="$CONFIG_FILES src/cats/mysql" ;; "src/cats/create_bareos_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_bareos_database" ;; "src/cats/update_bareos_tables") CONFIG_FILES="$CONFIG_FILES src/cats/update_bareos_tables" ;; "src/cats/grant_bareos_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_bareos_privileges" ;; @@ -34478,7 +34497,24 @@ c=src/cats chmod 755 $c/create_bareos_database $c/update_bareos_tables $c/make_bareos_tables chmod 755 $c/grant_bareos_privileges $c/drop_bareos_tables $c/drop_bareos_database + +chmod 755 $c/create_mysql_database $c/update_mysql_tables $c/make_mysql_tables +chmod 755 $c/grant_mysql_privileges $c/drop_mysql_tables $c/drop_mysql_database + +chmod 755 $c/create_sqlite3_database $c/update_sqlite3_tables $c/make_sqlite3_tables +chmod 755 $c/grant_sqlite3_privileges $c/drop_sqlite3_tables $c/drop_sqlite3_database + +chmod 755 $c/create_postgresql_database $c/update_postgresql_tables $c/make_postgresql_tables +chmod 755 $c/grant_postgresql_privileges $c/drop_postgresql_tables $c/drop_postgresql_database + +#chmod 755 $c/create_ingres_database $c/update_ingres_tables $c/make_ingres_tables +#chmod 755 $c/grant_ingres_privileges $c/drop_ingres_tables $c/drop_ingres_database + + chmod 755 $c/make_catalog_backup $c/delete_catalog_backup $c/make_catalog_backup.pl +chmod 755 $c/sqlite +chmod 755 $c/mysql + chmod 755 $c/install-default-backend if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then @@ -34502,6 +34538,8 @@ echo "Cleaning up" echo " " ${MAKE:-make} clean +dnl for some Debian based distribution, e.g. Univention, there are additional packages to build +dnl must run after clean cp ${BUILD_DIR}/debian/control.common ${BUILD_DIR}/debian/control DEBIAN_CONTROL_ADDITIONAL=${BUILD_DIR}/platforms/$DISTNAME/debian/control.additional if test -e "$DEBIAN_CONTROL_ADDITIONAL"; then