Make sure we unload the right slot when swapping.

[bacula/bacula] / bacula / autoconf / configure.in

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index f9debcac621d3619dedc7ca5bc56d3ed4ffc596e..ae994edfe29918db17c53718af383a4dd04f578d 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -184,7 +184,7 @@ then
     AM_GNU_GETTEXT
 fi
 
-
+support_faketape=no
 support_mysql=no
 support_sqlite=no
 support_sqlite3=no
@@ -396,6 +396,19 @@ if test x$support_smartalloc = xyes; then
    AC_DEFINE(SMARTALLOC, 1, [Set if you want Smartalloc enabled])
 fi
 
+# -------------------------------------------
+# faketape (default off)
+# -------------------------------------------
+AC_ARG_ENABLE(faketape,
+  [  --enable-faketape       enable faketape debugging support [disabled]],
+  [if test x$enableval = xyes; then
+    support_faketape=yes
+  fi])
+
+if test x$support_faketape = xyes; then
+   AC_DEFINE(USE_FAKETAPE, 1, [Set if you want faketape enabled])
+fi
+
 # -------------------------------------------
 # static-tools (default off)
 # -------------------------------------------
@@ -1366,6 +1379,27 @@ fi
 if test x$DB_TYPE = xdbi; then
    DB_TYPE=$DB_PROG
    db_type=$DB_PROG
+   pkg=1
+   # Check for batch insert
+   if test $DB_PROG = postgresql; then
+      A=`nm $DB_PROG_LIB | grep PQputCopyData`
+      pkg=$?
+   fi
+
+   if test $DB_PROG = mysql; then
+      A=`nm $DB_PROG_LIB | grep pthread_mutex_lock`
+      pkg=$?     
+   fi
+
+   if test $pkg = 0; then
+      AC_ARG_ENABLE(batch-insert,
+      [        --enable-batch-insert       enable the DB batch insert code [disabled]],
+      [if test x$enableval = xno; then
+         support_batch_insert=no
+       else
+         support_batch_insert=yes
+      fi])
+   fi  
 fi
 
 if test $support_batch_insert = yes ; then
@@ -1944,14 +1978,37 @@ darwin)
           platforms/darwin/Makefile"
   ;;
 debian)
+       if `grep -q ubuntu /etc/apt/sources.list`; then
+          DISTNAME="ubuntu"
+       fi
        DISTVER=`cat /etc/debian_version`
+       if test -f /etc/lsb-release ; then
+          . /etc/lsb-release
+          if test "x$DISTRIB_ID" != "x" ; then
+             DISTNAME=$DISTRIB_ID
+          fi
+          if test "x$DISTRIB_RELEASE" != "x" ; then
+             DISTVER=$DISTRIB_RELEASE
+          fi
+       fi
+       if test "$DISTNAME" = "Ubuntu" ; then
+          DISTNAME="ubuntu"
+       fi
        TAPEDRIVE="/dev/nst0"
        PSCMD="ps -e -o pid,command"
-       PFILES="${PFILES} \
-           platforms/debian/Makefile \
-           platforms/debian/bacula-fd \
-           platforms/debian/bacula-sd \
-           platforms/debian/bacula-dir"
+       if test "$DISTNAME" = "ubuntu" ; then
+          PFILES="${PFILES} \
+             platforms/ubuntu/Makefile \
+             platforms/ubuntu/bacula-fd \
+             platforms/ubuntu/bacula-sd \
+             platforms/ubuntu/bacula-dir"
+       else 
+          PFILES="${PFILES} \
+             platforms/debian/Makefile \
+             platforms/debian/bacula-fd \
+             platforms/debian/bacula-sd \
+             platforms/debian/bacula-dir"
+       fi
   ;;
 freebsd)
        DISTVER=`uname -a |awk '{print $3}'`
@@ -2290,8 +2347,8 @@ chmod 755 bconsole gconsole mtx-changer devel_bacula logrotate
 cd ..
 
 c=updatedb
-chmod 755 $c/update_mysql_tables_10_to_11       $c/update_sqlite3_tables_10_to_11
-chmod 755 $c/update_postgresql_tables_10_to_11  $c/update_sqlite_tables_10_to_11
+chmod 755 $c/update_mysql_tables_10_to_11      $c/update_sqlite3_tables_10_to_11
+chmod 755 $c/update_postgresql_tables_10_to_11 $c/update_sqlite_tables_10_to_11
 
 c=src/cats
 
@@ -2419,6 +2476,7 @@ Configuration on `date`:
   Encryption support:        ${support_crypto} 
   ZLIB support:              ${have_zlib}
   enable-smartalloc:         ${support_smartalloc} 
+  enable-faketape:           ${support_faketape} 
   bat support:               ${support_bat} ${QWT_LDFLAGS}
   enable-gnome:              ${support_gnome} ${gnome_version}
   enable-bwx-console:        ${support_wx_console} ${wx_version}