From 0ff10bcd72d63c79d458b66a74e4f707a25c7a39 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 4 Jan 2010 15:38:37 +0100 Subject: [PATCH] Add Ingres configuration --- bacula/.gitignore | 6 ++ bacula/autoconf/bacula-macros/db.m4 | 57 +++++++++++- bacula/autoconf/config.h.in | 6 ++ bacula/autoconf/configure.in | 15 +++- bacula/configure | 133 +++++++++++++++++++++++----- bacula/src/cats/myingres.c | 2 +- 6 files changed, 192 insertions(+), 27 deletions(-) diff --git a/bacula/.gitignore b/bacula/.gitignore index 02483f2dbc..4cf7a5047b 100644 --- a/bacula/.gitignore +++ b/bacula/.gitignore @@ -238,20 +238,24 @@ src/cats/create_bdb_database src/cats/create_mysql_database src/cats/create_postgresql_database src/cats/create_sqlite_database +src/cats/create_ingres_database src/cats/drop_bdb_tables src/cats/drop_mysql_tables src/cats/drop_postgresql_tables src/cats/drop_sqlite_tables +src/cats/drop_ingres_tables src/cats/grant_bacula_privileges src/cats/grant_mysql_privileges src/cats/grant_postgresql_privileges src/cats/grant_sqlite_privileges +src/cats/grant_ingres_privileges src/cats/list_files.sql src/cats/list_jobs.sql src/cats/make_bdb_tables src/cats/make_mysql_tables src/cats/make_postgresql_tables src/cats/make_sqlite_tables +src/cats/make_ingres_tables src/cats/mysql src/cats/sqlite src/cats/make_bacula_tables @@ -262,11 +266,13 @@ src/cats/update_bacula_tables src/cats/update_mysql_tables src/cats/update_postgresql_tables src/cats/update_sqlite_tables +src/cats/update_ingres_tables src/cats/drop_bacula_database src/cats/drop_bdb_database src/cats/drop_mysql_database src/cats/drop_postgresql_database src/cats/drop_sqlite_database +src/cats/drop_ingres_database src/cats/grant_bdb_privileges src/cats/update_bdb_tables src/cats/create_sqlite3_database diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4 index e6de28db75..f0cae93a90 100644 --- a/bacula/autoconf/bacula-macros/db.m4 +++ b/bacula/autoconf/bacula-macros/db.m4 @@ -422,7 +422,7 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@], [Include MySQL support. DIR is the My SQL_BINDIR=$MYSQL_BINDIR SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a - AC_DEFINE(HAVE_MYSQL) + AC_DEFINE(HAVE_MYSQL, 1, [Set if you have an Ingres Database]) AC_MSG_RESULT(yes) db_found=yes support_mysql=yes @@ -533,6 +533,60 @@ AC_SUBST(SQL_BINDIR) ]) +AC_DEFUN([BA_CHECK_INGRES_DB], +[ +db_found=no +AC_MSG_CHECKING(for Ingres support) +AC_ARG_WITH(ingres, +AC_HELP_STRING([--with-ingres@<:@=DIR@:>@], [Include Ingres support. DIR is the Ingres base install directory, default is to search through a number of common places for the Ingres files.]), +[ + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + if test -f ${II_SYSTEM}/files/eqdefc.h; then + INGRES_INCDIR=${II_SYSTEM}/files + INGRES_LIBDIR=${II_SYSTEM}/lib + INGRES_BINDIR=${II_SYSTEM}/bin + elif test -f ${II_SYSTEM}/ingres/files/eqdefc.h; then + INGRES_INCDIR=${II_SYSTEM}/ingres/files + INGRES_LIBDIR=${II_SYSTEM}/ingres/lib + INGRES_BINDIR=${II_SYSTEM}/bin + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Unable to find eqdefc.h in standard locations) + fi + else + if test -f $withval/files/eqdefc.h; then + INGRES_INCDIR=$withval/files + INGRES_LIBDIR=$withval/lib + INGRES_BINDIR=$withval/bin + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Invalid Ingres directory $withval - unable to find sqlite3.h under $withval) + fi + fi + SQL_INCLUDE=-I$INGRES_INCDIR + SQL_LFLAGS="-L$INGRES_LIBDIR -lingres" + SQL_BINDIR=$INGRES_BINDIR + SQL_LIB=$INGRES_LIBDIR/libingres.a + AC_DEFINE(HAVE_INGRES, 1, [Set if have Ingres Database]) + AC_MSG_RESULT(yes) + db_found=yes + support_ingres=yes + db_type=Ingres + DB_TYPE=ingres + + else + AC_MSG_RESULT(no) + fi +],[ + AC_MSG_RESULT(no) +]) + +AC_SUBST(SQL_LFLAGS) +AC_SUBST(SQL_INCLUDE) +AC_SUBST(SQL_BINDIR) +]) + AC_DEFUN([BA_CHECK_SQLITE3_DB], [ db_found=no @@ -613,7 +667,6 @@ AC_SUBST(SQL_BINDIR) ]) - AC_DEFUN([BA_CHECK_POSTGRESQL_DB], [ db_found=no diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index 7c44bd7710..15e4ea5086 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -461,6 +461,9 @@ /* Define to 1 if you have the `inet_pton' function. */ #undef HAVE_INET_PTON +/* Set if have Ingres Database */ +#undef HAVE_INGRES + /* Define if you have the 'intmax_t' type in or . */ #undef HAVE_INTMAX_T @@ -570,6 +573,9 @@ /* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP +/* Set if you have an Ingres Database */ +#undef HAVE_MYSQL + /* Define to 1 if you have the `nanosleep' function. */ #undef HAVE_NANOSLEEP diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 0c620c5a9d..0fb1dda81d 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -327,6 +327,7 @@ support_mysql=no support_sqlite=no support_sqlite3=no support_postgresql=no +support_ingres=no support_dbi=no support_smartalloc=yes support_readline=yes @@ -1684,6 +1685,8 @@ BA_CHECK_POSTGRESQL_DB BA_CHECK_MYSQL_DB +BA_CHECK_INGRES_DB + BA_CHECK_SQLITE3_DB # BA_CHECK_SQLITE_DB @@ -3015,6 +3018,12 @@ AC_OUTPUT([autoconf/Make.common \ src/cats/grant_sqlite3_privileges \ src/cats/drop_sqlite3_tables \ src/cats/drop_sqlite3_database \ + src/cats/create_ingres_database \ + src/cats/update_ingres_tables \ + src/cats/make_ingres_tables \ + src/cats/grant_ingres_privileges \ + src/cats/drop_ingres_tables \ + src/cats/drop_ingres_database \ src/cats/sqlite \ src/cats/mysql \ src/cats/create_bdb_database \ @@ -3107,6 +3116,10 @@ chmod 755 $c/grant_sqlite3_privileges $c/drop_sqlite3_tables $c/drop_sqlite3_d 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 chmod 755 $c/sqlite chmod 755 $c/mysql @@ -3143,7 +3156,7 @@ if test "x${db_type}" = "xInternal" ; then echo " " echo " " echo "You have not specified either --enable-client-only or one of the" - echo " supported databases: MySQL, PostgreSQL, SQLite3, SQLite or DBI." + echo " supported databases: MySQL, PostgreSQL, Ingres, SQLite3 or DBI." echo " This is not permitted. Please reconfigure." echo " " echo "Aborting the configuration ..." diff --git a/bacula/configure b/bacula/configure index 2422889a6e..c90307875a 100755 --- a/bacula/configure +++ b/bacula/configure @@ -1738,6 +1738,9 @@ Optional Packages: Include MySQL support. DIR is the MySQL base install directory, default is to search through a number of common places for the MySQL files. + --with-ingres[=DIR] Include Ingres support. DIR is the Ingres base + install directory, default is to search through a + number of common places for the Ingres files. --with-sqlite3[=DIR] Include SQLite3 support. DIR is the SQLite3 base install directory, default is to search through a number of common places for the SQLite3 files. @@ -5989,13 +5992,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5992: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5995: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5995: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5998: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5998: output\"" >&5) + (eval echo "\"\$as_me:6001: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7216,7 +7219,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7219 "configure"' > conftest.$ac_ext + echo '#line 7222 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9431,11 +9434,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9434: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9437: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9438: \$? = $ac_status" >&5 + echo "$as_me:9441: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9770,11 +9773,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9773: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9776: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9777: \$? = $ac_status" >&5 + echo "$as_me:9780: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9875,11 +9878,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9878: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9881: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9882: \$? = $ac_status" >&5 + echo "$as_me:9885: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9930,11 +9933,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9933: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9936: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9937: \$? = $ac_status" >&5 + echo "$as_me:9940: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12686,7 +12689,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12689 "configure" +#line 12692 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12782,7 +12785,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12785 "configure" +#line 12788 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14794,11 +14797,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14797: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14800: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14801: \$? = $ac_status" >&5 + echo "$as_me:14804: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14893,11 +14896,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14896: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14899: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14900: \$? = $ac_status" >&5 + echo "$as_me:14903: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14945,11 +14948,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14948: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14951: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14952: \$? = $ac_status" >&5 + echo "$as_me:14955: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -24020,6 +24023,7 @@ support_mysql=no support_sqlite=no support_sqlite3=no support_postgresql=no +support_ingres=no support_dbi=no support_smartalloc=yes support_readline=yes @@ -28213,7 +28217,8 @@ _ACEOF SQL_BINDIR=$MYSQL_BINDIR SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_MYSQL 1 _ACEOF @@ -28348,6 +28353,78 @@ fi +db_found=no +{ echo "$as_me:$LINENO: checking for Ingres support" >&5 +echo $ECHO_N "checking for Ingres support... $ECHO_C" >&6; } + +# Check whether --with-ingres was given. +if test "${with_ingres+set}" = set; then + withval=$with_ingres; + if test "$withval" != "no"; then + if test "$withval" = "yes"; then + if test -f ${II_SYSTEM}/files/eqdefc.h; then + INGRES_INCDIR=${II_SYSTEM}/files + INGRES_LIBDIR=${II_SYSTEM}/lib + INGRES_BINDIR=${II_SYSTEM}/bin + elif test -f ${II_SYSTEM}/ingres/files/eqdefc.h; then + INGRES_INCDIR=${II_SYSTEM}/ingres/files + INGRES_LIBDIR=${II_SYSTEM}/ingres/lib + INGRES_BINDIR=${II_SYSTEM}/bin + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { { echo "$as_me:$LINENO: error: Unable to find eqdefc.h in standard locations" >&5 +echo "$as_me: error: Unable to find eqdefc.h in standard locations" >&2;} + { (exit 1); exit 1; }; } + fi + else + if test -f $withval/files/eqdefc.h; then + INGRES_INCDIR=$withval/files + INGRES_LIBDIR=$withval/lib + INGRES_BINDIR=$withval/bin + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { { echo "$as_me:$LINENO: error: Invalid Ingres directory $withval - unable to find sqlite3.h under $withval" >&5 +echo "$as_me: error: Invalid Ingres directory $withval - unable to find sqlite3.h under $withval" >&2;} + { (exit 1); exit 1; }; } + fi + fi + SQL_INCLUDE=-I$INGRES_INCDIR + SQL_LFLAGS="-L$INGRES_LIBDIR -lingres" + SQL_BINDIR=$INGRES_BINDIR + SQL_LIB=$INGRES_LIBDIR/libingres.a + +cat >>confdefs.h <<\_ACEOF +#define HAVE_INGRES 1 +_ACEOF + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + db_found=yes + support_ingres=yes + db_type=Ingres + DB_TYPE=ingres + + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi + +else + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + +fi + + + + + + + + db_found=no { echo "$as_me:$LINENO: checking for SQLite3 support" >&5 echo $ECHO_N "checking for SQLite3 support... $ECHO_C" >&6; } @@ -44025,7 +44102,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/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 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_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 src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 examples/nagios/check_bacula/Makefile $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/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 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_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/create_ingres_database src/cats/update_ingres_tables src/cats/make_ingres_tables src/cats/grant_ingres_privileges src/cats/drop_ingres_tables src/cats/drop_ingres_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/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 examples/nagios/check_bacula/Makefile $PFILES" ac_config_commands="$ac_config_commands default" @@ -45029,6 +45106,12 @@ do "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/create_ingres_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_ingres_database" ;; + "src/cats/update_ingres_tables") CONFIG_FILES="$CONFIG_FILES src/cats/update_ingres_tables" ;; + "src/cats/make_ingres_tables") CONFIG_FILES="$CONFIG_FILES src/cats/make_ingres_tables" ;; + "src/cats/grant_ingres_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_ingres_privileges" ;; + "src/cats/drop_ingres_tables") CONFIG_FILES="$CONFIG_FILES src/cats/drop_ingres_tables" ;; + "src/cats/drop_ingres_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_ingres_database" ;; "src/cats/sqlite") CONFIG_FILES="$CONFIG_FILES src/cats/sqlite" ;; "src/cats/mysql") CONFIG_FILES="$CONFIG_FILES src/cats/mysql" ;; "src/cats/create_bdb_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_bdb_database" ;; @@ -46908,6 +46991,10 @@ chmod 755 $c/grant_sqlite3_privileges $c/drop_sqlite3_tables $c/drop_sqlite3_d 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 chmod 755 $c/sqlite chmod 755 $c/mysql @@ -46939,7 +47026,7 @@ if test "x${db_type}" = "xInternal" ; then echo " " echo " " echo "You have not specified either --enable-client-only or one of the" - echo " supported databases: MySQL, PostgreSQL, SQLite3, SQLite or DBI." + echo " supported databases: MySQL, PostgreSQL, Ingres, SQLite3 or DBI." echo " This is not permitted. Please reconfigure." echo " " echo "Aborting the configuration ..." diff --git a/bacula/src/cats/myingres.c b/bacula/src/cats/myingres.c index aa34bc84b5..17d94fef46 100644 --- a/bacula/src/cats/myingres.c +++ b/bacula/src/cats/myingres.c @@ -4,7 +4,7 @@ #ifdef HAVE_INGRES -#include +#include # include extern IISQLCA sqlca; /* SQL Communications Area */ #include -- 2.39.5