Recompile ./configure

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index 85d0e5641589845bf72783c0e0b2d0819f0febca..dacb235fe245c0294c4d9ef8bdb313f5b70ca3b0 100644 (file)
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -1157,9 +1157,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at runtime.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
+       STACK_DIRECTION > 0 => grows toward higher addresses
+       STACK_DIRECTION < 0 => grows toward lower addresses
+       STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
@@ -1262,10 +1262,8 @@
    restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict
-#ifndef __restrict__
 # define __restrict__
 #endif
-#endif
 
 /* Define to empty if the C compiler doesn't support this keyword. */
 #undef signed

diff --git a/bacula/configure b/bacula/configure
index 9edd171d92284d84749cece123f4bd75d51893b1..6503d6788b0b389adb443d4d3188594951ff70c5 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for bacula 9.6.0.
+# Generated by GNU Autoconf 2.69 for bacula 9.6.4.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='bacula'
 PACKAGE_TARNAME='bacula'
-PACKAGE_VERSION='9.6.0'
-PACKAGE_STRING='bacula 9.6.0'
+PACKAGE_VERSION='9.6.4'
+PACKAGE_STRING='bacula 9.6.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -927,6 +927,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1020,6 +1021,7 @@ with_embedded_mysql
 with_sqlite3
 enable_largefile
 with_x
+enable_s3
 with_s3
 enable_afs
 with_afsdir
@@ -1082,6 +1084,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1334,6 +1337,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1471,7 +1483,7 @@ fi
 for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
                datadir sysconfdir sharedstatedir localstatedir includedir \
                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir
+               libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1584,7 +1596,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bacula 9.6.0 to adapt to many kinds of systems.
+\`configure' configures bacula 9.6.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1624,6 +1636,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1653,7 +1666,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bacula 9.6.0:";;
+     short | recursive ) echo "Configuration of bacula 9.6.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1687,6 +1700,7 @@ Optional Features:
   --disable-readline      disable readline support [default=yes]
   --enable-batch-insert   enable the DB batch insert code [default=yes]
   --disable-largefile     omit support for large files
+  --disable-s3            disable S3 support [default=yes]
   --disable-afs           disable afs support [default=auto]
   --disable-lzo           disable lzo support [default=yes]
   --disable-acl           disable acl support [default=auto]
@@ -1854,7 +1868,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bacula configure 9.6.0
+bacula configure 9.6.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2789,7 +2803,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bacula $as_me 9.6.0, which was
+It was created by bacula $as_me 9.6.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -20080,6 +20094,8 @@ main ()
     if (*(data + i) != *(data3 + i))
       return 14;
   close (fd);
+  free (data);
+  free (data3);
   return 0;
 }
 _ACEOF
@@ -27176,6 +27192,18 @@ $as_echo "#define HAVE_ACCEPT4 1" >>confdefs.h
 fi
 
 
+
+# Check whether --enable-s3 was given.
+if test "${enable_s3+set}" = set; then :
+  enableval=$enable_s3;
+       if test x$enableval = xno; then
+         support_s3=no
+       fi
+
+
+fi
+
+
 S3_INC=
 S3_LIBS=
 S3_LDFLAGS=
@@ -31908,7 +31936,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bacula $as_me 9.6.0, which was
+This file was extended by bacula $as_me 9.6.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31974,7 +32002,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-bacula config.status 9.6.0
+bacula config.status 9.6.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -34276,6 +34304,7 @@ Configuration on `date`:
    Encryption support:        ${support_crypto}
    ZLIB support:              ${have_zlib}
    LZO support:               ${have_lzo}
+   S3 support:                ${have_libs3}
    enable-smartalloc:         ${support_smartalloc}
    enable-lockmgr:            ${support_lockmgr}
    bat support:               ${support_bat}