From e1bd36a53a99a814c6c0296bf9f4f5c8f990241e Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 23 Apr 2004 16:29:16 +0000 Subject: [PATCH] Minor changes + .cvsignore files git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1274 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/configure.in | 2 +- bacula/configure | 4 ++-- bacula/src/lib/message.c | 2 +- bacula/src/win32/.cvsignore | 2 +- bacula/src/win32/baculafd/.cvsignore | 1 + bacula/src/win32/console/.cvsignore | 1 + 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 bacula/src/win32/baculafd/.cvsignore create mode 100644 bacula/src/win32/console/.cvsignore diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 37ca9a59d4..49650be4f5 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -1664,7 +1664,7 @@ AC_OUTPUT([autoconf/Make.common \ src/win32/winbacula.nsi \ src/win32/baculafd/bacula-fd.conf \ src/win32/Makefile \ - src/win32/console/bconsole.conf.in \ + src/win32/console/bconsole.conf \ $PFILES ], [(echo "Doing make of dependencies"; make depend;) ] ) diff --git a/bacula/configure b/bacula/configure index 217ad1b53a..15dc243dfa 100755 --- a/bacula/configure +++ b/bacula/configure @@ -18186,7 +18186,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/fd 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/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.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/filed/win32/Makefile 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/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 src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf.in $PFILES" + ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/fd 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/gnome-console.console_apps scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.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/filed/win32/Makefile 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/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 src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf $PFILES" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18800,7 +18800,7 @@ do "src/win32/winbacula.nsi" ) CONFIG_FILES="$CONFIG_FILES src/win32/winbacula.nsi" ;; "src/win32/baculafd/bacula-fd.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/baculafd/bacula-fd.conf" ;; "src/win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/win32/Makefile" ;; - "src/win32/console/bconsole.conf.in" ) CONFIG_FILES="$CONFIG_FILES src/win32/console/bconsole.conf.in" ;; + "src/win32/console/bconsole.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/console/bconsole.conf" ;; "$PFILES" ) CONFIG_FILES="$CONFIG_FILES $PFILES" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:autoconf/config.h.in" ;; diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c index 697fc59220..a5407b0ea4 100755 --- a/bacula/src/lib/message.c +++ b/bacula/src/lib/message.c @@ -31,7 +31,7 @@ #include "bacula.h" #include "jcr.h" -#if !define(HAVE_CONSOLE) +#if !defined(HAVE_CONSOLE) #if defined(HAVE_CYGWIN) || defined(HAVE_WIN32) #include #endif diff --git a/bacula/src/win32/.cvsignore b/bacula/src/win32/.cvsignore index e7a3db50e5..5608e57fd7 100644 --- a/bacula/src/win32/.cvsignore +++ b/bacula/src/win32/.cvsignore @@ -1,3 +1,3 @@ install install-debug -bacula-fd.conf +winbacula.nsi diff --git a/bacula/src/win32/baculafd/.cvsignore b/bacula/src/win32/baculafd/.cvsignore new file mode 100644 index 0000000000..ebb91b39d6 --- /dev/null +++ b/bacula/src/win32/baculafd/.cvsignore @@ -0,0 +1 @@ +bacula-fd.conf diff --git a/bacula/src/win32/console/.cvsignore b/bacula/src/win32/console/.cvsignore new file mode 100644 index 0000000000..126489d4fc --- /dev/null +++ b/bacula/src/win32/console/.cvsignore @@ -0,0 +1 @@ +bconsole.conf -- 2.39.5