From: <ke...@us...> - 2008-02-27 17:19:38
|
Revision: 6498 http://bacula.svn.sourceforge.net/bacula/?rev=6498&view=rev Author: kerns Date: 2008-02-27 09:19:44 -0800 (Wed, 27 Feb 2008) Log Message: ----------- Apply Joao's patch to separate DB_TYPE and DB_PROG in configure. Modified Paths: -------------- trunk/bacula/autoconf/bacula-macros/db.m4 trunk/bacula/autoconf/configure.in trunk/bacula/configure Modified: trunk/bacula/autoconf/bacula-macros/db.m4 =================================================================== --- trunk/bacula/autoconf/bacula-macros/db.m4 2008-02-27 16:21:04 UTC (rev 6497) +++ trunk/bacula/autoconf/bacula-macros/db.m4 2008-02-27 17:19:44 UTC (rev 6498) @@ -118,7 +118,67 @@ ]) +AC_DEFUN([BA_CHECK_DBI_DRIVER], +[ +db_found=no +db_prog=no +AC_MSG_CHECKING(for DBI drivers support) +AC_ARG_WITH(dbi-driver, +[ + --with-dbi-driver@<:@=DRIVER@:>@ Suport for DBI driver. DRIVER is + the one DBI driver like Mysql, Postgresql, others. + Default is to not configure any driver.], +[ + if test "$withval" != "no"; then + case $withval in + "mysql") + db_prog="mysql" + if test -f /usr/local/mysql/bin/mysql; then + SQL_BINDIR=/usr/local/mysql/bin + elif test -f /usr/bin/mysql; then + SQL_BINDIR=/usr/bin + elif test -f /usr/local/bin/mysql; then + SQL_BINDIR=/usr/local/bin + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Unable to find mysql in standard locations) + fi + ;; + "postgresql") + db_prog="postgresql" + PG_CONFIG=`which pg_config` + if test -n "$PG_CONFIG";then + SQL_BINDIR=`"$PG_CONFIG" --bindir` + elif test -f /usr/local/bin/psql; then + SQL_BINDIR=/usr/local/bin + elif test -f /usr/bin/psql; then + SQL_BINDIR=/usr/bin + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(Unable to find psql in standard locations) + fi + ;; + *) + AC_MSG_RESULT(no) + AC_MSG_ERROR(Unable to set DBI driver. $withval is not supported) + ;; + esac + AC_MSG_RESULT(yes) + DB_PROG=$db_prog + + else + AC_MSG_RESULT(no) + fi +],[ + AC_MSG_RESULT(no) +]) +AC_SUBST(SQL_BINDIR) +AC_SUBST(DB_PROG) + +]) + + AC_DEFUN([BA_CHECK_MYSQL_DB], [ db_found=no Modified: trunk/bacula/autoconf/configure.in =================================================================== --- trunk/bacula/autoconf/configure.in 2008-02-27 16:21:04 UTC (rev 6497) +++ trunk/bacula/autoconf/configure.in 2008-02-27 17:19:44 UTC (rev 6498) @@ -1332,6 +1332,8 @@ BA_CHECK_DBI_DB +BA_CHECK_DBI_DRIVER + AC_SUBST(cats) AC_SUBST(DB_TYPE) @@ -1361,6 +1363,11 @@ fi fi +if test x$DB_TYPE = xdbi; then + DB_TYPE=$DB_PROG + db_type=$DB_PROG +fi + if test $support_batch_insert = yes ; then AC_DEFINE(HAVE_BATCH_FILE_INSERT, 1, [Set if DB batch insert code enabled]) fi Modified: trunk/bacula/configure =================================================================== --- trunk/bacula/configure 2008-02-27 16:21:04 UTC (rev 6497) +++ trunk/bacula/configure 2008-02-27 17:19:44 UTC (rev 6498) @@ -832,6 +832,7 @@ SQL_INCLUDE SQL_BINDIR DBI_DBD_DRIVERDIR +DB_PROG cats DB_TYPE GETCONF @@ -1537,6 +1538,10 @@ --with-dbi[=DIR] Include DBI support. DIR is the DBD base install directory, default is to search through a number of common places for the DBI files. + + --with-dbi-driver[=DRIVER] Suport for DBI driver. DRIVER is + the one DBI driver like Mysql, Postgresql, others. + Default is to not configure any driver. --with-x use the X Window System Some influential environment variables: @@ -17994,8 +17999,82 @@ +db_found=no +db_prog=no +{ echo "$as_me:$LINENO: checking for DBI drivers support" >&5 +echo $ECHO_N "checking for DBI drivers support... $ECHO_C" >&6; } +# Check whether --with-dbi-driver was given. +if test "${with_dbi_driver+set}" = set; then + withval=$with_dbi_driver; + if test "$withval" != "no"; then + case $withval in + "mysql") + db_prog="mysql" + if test -f /usr/local/mysql/bin/mysql; then + SQL_BINDIR=/usr/local/mysql/bin + elif test -f /usr/bin/mysql; then + SQL_BINDIR=/usr/bin + elif test -f /usr/local/bin/mysql; then + SQL_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 mysql in standard locations" >&5 +echo "$as_me: error: Unable to find mysql in standard locations" >&2;} + { (exit 1); exit 1; }; } + fi + ;; + "postgresql") + db_prog="postgresql" + PG_CONFIG=`which pg_config` + if test -n "$PG_CONFIG";then + SQL_BINDIR=`"$PG_CONFIG" --bindir` + elif test -f /usr/local/bin/psql; then + SQL_BINDIR=/usr/local/bin + elif test -f /usr/bin/psql; then + SQL_BINDIR=/usr/bin + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { { echo "$as_me:$LINENO: error: Unable to find psql in standard locations" >&5 +echo "$as_me: error: Unable to find psql in standard locations" >&2;} + { (exit 1); exit 1; }; } + fi + ;; + *) + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { { echo "$as_me:$LINENO: error: Unable to set DBI driver. $withval is not supported" >&5 +echo "$as_me: error: Unable to set DBI driver. $withval is not supported" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + DB_PROG=$db_prog + + 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 + + + + + + + + + # ------------------------------------------- # enable batch attribute DB insert (default on) # ------------------------------------------- @@ -18024,6 +18103,11 @@ fi fi +if test x$DB_TYPE = xdbi; then + DB_TYPE=$DB_PROG + db_type=$DB_PROG +fi + if test $support_batch_insert = yes ; then cat >>confdefs.h <<\_ACEOF @@ -31285,6 +31369,7 @@ SQL_INCLUDE!$SQL_INCLUDE$ac_delim SQL_BINDIR!$SQL_BINDIR$ac_delim DBI_DBD_DRIVERDIR!$DBI_DBD_DRIVERDIR$ac_delim +DB_PROG!$DB_PROG$ac_delim cats!$cats$ac_delim DB_TYPE!$DB_TYPE$ac_delim GETCONF!$GETCONF$ac_delim @@ -31313,7 +31398,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |