From d83072d2786c6bff6ee3078254d6870b1c5e9f7b Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Thu, 1 Aug 2013 17:11:13 +0200 Subject: [PATCH] Use modern autoconf idioms. Autoconf 2.59 says that AC_OUTPUT with arguments is obsolete Rewrite to use AC_CONFIG_FILES. --- autoconf/configure.in | 169 +++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 84 deletions(-) diff --git a/autoconf/configure.in b/autoconf/configure.in index 1f64a8d9490..9d38d1757a3 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -3715,90 +3715,91 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi -AC_OUTPUT([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_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_OUTPUT if test "${support_bat}" = "yes" ; then if test "x$QMAKE" = "xnone"; then