]> git.sur5r.net Git - bacula/bacula/commitdiff
Put configure back in sync
authorKern Sibbald <kern@sibbald.com>
Fri, 19 Dec 2003 11:21:04 +0000 (11:21 +0000)
committerKern Sibbald <kern@sibbald.com>
Fri, 19 Dec 2003 11:21:04 +0000 (11:21 +0000)
git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@906 91ce42f0-d328-0410-95d8-f526ca767f89

bacula/configure

index 3cdefd088bb6fe9001541a82872c3298b4592d80..8710d861cbf264d978139ba6ef7dbccae01b7647 100755 (executable)
@@ -7005,86 +7005,14 @@ fi;
 
 
 
-db_found=no
-echo "$as_me:$LINENO: checking for PostgreSQL support" >&5
-echo $ECHO_N "checking for PostgreSQL support... $ECHO_C" >&6
 
-# Check whether --with-postgresql was given.
-if test "${with_postgresql+set}" = set; then
-  withval="$with_postgresql"
 
-  if test "$withval" != "no"; then
-        if test "$withval" = "yes"; then
-                if test -f /usr/local/postgresql/include/postgresql/libpq-fe.h; then
-                        POSTGRESQL_INCDIR=/usr/local/postgresql/include/postgresql
-                        POSTGRESQL_LIBDIR=/usr/local/postgresql/lib/postgresql
-                        POSTGRESQL_BINDIR=/usr/local/postgresql/bin
-                elif test -f /usr/include/postgresql/libpq-fe.h; then
-                        POSTGRESQL_INCDIR=/usr/include/postgresql
-                        POSTGRESQL_LIBDIR=/usr/lib/postgresql
-                        POSTGRESQL_BINDIR=/usr/bin
-                elif test -f /usr/include/libpq-fe.h; then
-                        POSTGRESQL_INCDIR=/usr/include
-                        POSTGRESQL_LIBDIR=/usr/lib
-                        POSTGRESQL_BINDIR=/usr/bin
-                elif test -f /usr/local/include/postgresql/libpq-fe.h; then
-                        POSTGRESQL_INCDIR=/usr/local/include/postgresql
-                        POSTGRESQL_LIBDIR=/usr/local/lib/postgresql
-                        POSTGRESQL_BINDIR=/usr/local/bin
-                elif test -f /usr/local/include/libpq-fe.h; then
-                        POSTGRESQL_INCDIR=/usr/local/include
-                        POSTGRESQL_LIBDIR=/usr/local/lib
-                        POSTGRESQL_BINDIR=/usr/local/bin
-                else
-                   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-                   { { echo "$as_me:$LINENO: error: Unable to find libpq-fe.h in standard locations" >&5
-echo "$as_me: error: Unable to find libpq-fe.h in standard locations" >&2;}
-   { (exit 1); exit 1; }; }
-                fi
-        else
-                if test -f $withval/include/postgresql/libpq-fe.h; then
-                        POSTGRESQL_INCDIR=$withval/include/postgresql
-                        POSTGRESQL_LIBDIR=$withval/lib/postgresql
-                        POSTGRESQL_BINDIR=$withval/bin
-                elif test -f $withval/include/libpq-fe.h; then
-                        POSTGRESQL_INCDIR=$withval/include
-                        POSTGRESQL_LIBDIR=$withval/lib
-                        POSTGRESQL_BINDIR=$withval/bin
-                else
-                   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-                   { { echo "$as_me:$LINENO: error: Invalid PostgreSQL directory $withval - unable to find libpq-fe.h under $withval" >&5
-echo "$as_me: error: Invalid PostgreSQL directory $withval - unable to find libpq-fe.h under $withval" >&2;}
-   { (exit 1); exit 1; }; }
-                fi
-        fi
-    SQL_INCLUDE=-I$POSTGRESQL_INCDIR
-    SQL_LFLAGS="-L$POSTGRESQL_LIBDIR -lpq -lz"
-    SQL_BINDIR=$POSTGRESQL_BINDIR
 
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSTGRESQL 1
-_ACEOF
+# ------------------------------------------------
+# Bacula check for various SQL database engines
+# ------------------------------------------------
+BA_CHECK_POSTGRESQL_DB
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-    db_found=yes
-    support_postgresql=yes
-    db_name=PostgreSQL
-    DB_NAME=postgresql
-
-  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 MySQL support" >&5
@@ -7176,9 +7104,6 @@ echo "${ECHO_T}no" >&6
 fi;
 
 
-echo "$as_me:$LINENO: checking for embedded MySQL support" >&5
-echo $ECHO_N "checking for embedded MySQL support... $ECHO_C" >&6
-
 # Check whether --with-embedded-mysql or --without-embedded-mysql was given.
 if test "${with_embedded_mysql+set}" = set; then
   withval="$with_embedded_mysql"
@@ -17897,7 +17822,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/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 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/tconsole/Makefile 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/make_postgresql_tables src/cats/drop_postgresql_tables src/cats/create_postgresql_database src/cats/grant_postgresql_privileges src/cats/make_mysql_tables src/cats/drop_mysql_tables src/cats/update_mysql_tables src/cats/create_mysql_database src/cats/grant_mysql_privileges src/cats/make_sqlite_tables src/cats/drop_sqlite_tables src/cats/update_sqlite_tables src/cats/create_sqlite_database  src/cats/grant_sqlite_privileges src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/make_bdb_tables src/cats/drop_bdb_tables src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/findlib/Makefile src/tools/Makefile $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/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 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/tconsole/Makefile 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/make_postgresql_tables src/cats/drop_postgresql_tables src/cats/create_postgresql_database src/cats/grant_postgresql_privileges src/cats/make_mysql_tables src/cats/drop_mysql_tables src/cats/update_mysql_tables src/cats/create_mysql_database src/cats/grant_mysql_privileges src/cats/make_sqlite_tables src/cats/drop_sqlite_tables src/cats/update_sqlite_tables src/cats/create_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/make_bdb_tables src/cats/drop_bdb_tables src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/update_bacula_tables src/findlib/Makefile src/tools/Makefile $PFILES"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18480,7 +18405,6 @@ do
   "src/cats/drop_sqlite_tables" ) CONFIG_FILES="$CONFIG_FILES src/cats/drop_sqlite_tables" ;;
   "src/cats/update_sqlite_tables" ) CONFIG_FILES="$CONFIG_FILES src/cats/update_sqlite_tables" ;;
   "src/cats/create_sqlite_database" ) CONFIG_FILES="$CONFIG_FILES src/cats/create_sqlite_database" ;;
-  "src/cats/grant_sqlite_privileges" ) CONFIG_FILES="$CONFIG_FILES src/cats/grant_sqlite_privileges" ;;
   "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" ;;
@@ -19270,7 +19194,6 @@ chmod 755 src/cats/create_mysql_database
 chmod 755 src/cats/make_catalog_backup src/cats/delete_catalog_backup
 chmod 755 src/cats/grant_postgresql_privileges
 chmod 755 src/cats/grant_mysql_privileges
-chmod 755 src/cats/grant_sqlite_privileges
 chmod 755 src/cats/make_sqlite_tables src/cats/drop_sqlite_tables
 chmod 755 src/cats/update_sqlite_tables
 chmod 755 src/cats/make_bacula_tables src/cats/drop_bacula_tables