Tweak recompile configure.in

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index b10962811e9eb1ed3570b3f3b988bdacd71e07b2..c2b3fd85b57a2984ddc49227e8ef9aca2b870031 100644 (file)
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -281,7 +281,7 @@
 /* Define to 1 if you have the `backtrace' function. */
 #undef HAVE_BACKTRACE
 
-/* Set if Bacula bat Qt GUI support enabled */
+/* Set if Bacula bat Qt4/5 GUI support enabled */
 #undef HAVE_BAT
 
 /* Define to 1 if you have the `be64toh' function. */
@@ -290,6 +290,9 @@
 /* Big Endian */
 #undef HAVE_BIG_ENDIAN
 
+/* Define to 1 if you have the '__builtin_bswap32' function */
+#undef HAVE_BSWAP32
+
 /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT

diff --git a/bacula/configure b/bacula/configure
index 34b79f6f7286c084f2e38c0bfa633dbc2f350879..599f8e156a91245cebdb981d3fc4adc11fed6b38 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.0.6.
+# Generated by GNU Autoconf 2.69 for bacula 9.1.0.
 #
 #
 # 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.0.6'
-PACKAGE_STRING='bacula 9.0.6'
+PACKAGE_VERSION='9.1.0'
+PACKAGE_STRING='bacula 9.1.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -898,6 +898,9 @@ DATE
 VERSION
 FALSEPRG
 TRUEPRG
+WIN32TOPDIR
+WIN32MAINDIR
+WIN32BUILDDIR
 TOP_DIR
 BUILD_DIR
 target_alias
@@ -1585,7 +1588,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.0.6 to adapt to many kinds of systems.
+\`configure' configures bacula 9.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1655,7 +1658,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bacula 9.0.6:";;
+     short | recursive ) echo "Configuration of bacula 9.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1672,7 +1675,7 @@ Optional Features:
   --enable-includes       enable installing of include files [default=no]
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
-  --enable-bat            enable build of bat Qt GUI [default=no]
+  --enable-bat            enable build of bat Qt4/5 GUI [default=no]
   --enable-smartalloc     enable smartalloc debugging support [default=no]
   --enable-lockmgr        enable lock manager support [default=no]
   --enable-static-tools   enable static tape tools [default=no]
@@ -1854,7 +1857,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bacula configure 9.0.6
+bacula configure 9.1.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2789,7 +2792,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.0.6, which was
+It was created by bacula $as_me 9.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3180,6 +3183,13 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 ac_config_headers="$ac_config_headers src/config.h:autoconf/config.h.in"
 
 
+WIN32BUILDDIR=${BUILD_DIR}/src/win32
+WIN32MAINDIR=${BUILD_DIR}
+WIN32TOPDIR=${TOP_DIR}
+
+
+
+
 for ac_prog in true
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -28672,6 +28682,29 @@ fi
 done
 
 
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int f(int b) {
+  return __builtin_bswap32(b);
+}
+
+int
+main ()
+{
+int a = f(10);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+$as_echo "#define HAVE_BSWAP32 1" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
 for ac_func in snprintf vsnprintf gethostid fseeko
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -29904,16 +29937,16 @@ fi
 $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
 if test "x$ac_cv_lib_acl_acl_get_file" = xyes; then :
 
-        have_acl=yes
-        if test $have_afs = yes; then
-                                       if test -d /usr/lib64/; then
-               FDLIBS="-L/usr/lib64 -lacl $FDLIBS"
-            else
-               FDLIBS="-L/usr/lib -lacl $FDLIBS"
-            fi
-         else
-            FDLIBS="-lacl $FDLIBS"
-         fi
+       have_acl=yes
+       if test $have_afs = yes; then
+                                   if test -d /usr/lib64/; then
+              FDLIBS="-L/usr/lib64 -lacl $FDLIBS"
+           else
+              FDLIBS="-L/usr/lib -lacl $FDLIBS"
+           fi
+        else
+           FDLIBS="-lacl $FDLIBS"
+        fi
 
 fi
 
@@ -29958,8 +29991,8 @@ fi
 $as_echo "$ac_cv_lib_pacl_acl_get_file" >&6; }
 if test "x$ac_cv_lib_pacl_acl_get_file" = xyes; then :
 
-         have_acl=yes
-         FDLIBS="-lpacl $FDLIBS"
+        have_acl=yes
+        FDLIBS="-lpacl $FDLIBS"
 
 fi
 
@@ -29971,10 +30004,10 @@ $as_echo_n "checking for ACL_TYPE_DEFAULT_DIR in acl.h include file... " >&6; }
 
 $as_echo "#define HAVE_ACL_TYPE_DEFAULT_DIR 1" >>confdefs.h
 
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
       fi
    fi
@@ -29987,10 +30020,10 @@ $as_echo_n "checking for ACL_TYPE_EXTENDED in acl.h include file... " >&6; }
 
 $as_echo "#define HAVE_ACL_TYPE_EXTENDED 1" >>confdefs.h
 
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
       fi
    fi
@@ -30052,10 +30085,10 @@ fi
 $as_echo "$ac_cv_lib_sec_acltotext" >&6; }
 if test "x$ac_cv_lib_sec_acltotext" = xyes; then :
 
-        have_acl=yes
-        FDLIBS="-lsec $FDLIBS"
+       have_acl=yes
+       FDLIBS="-lsec $FDLIBS"
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_totext in -lsec" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_totext in -lsec" >&5
 $as_echo_n "checking for acl_totext in -lsec... " >&6; }
 if ${ac_cv_lib_sec_acl_totext+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -30093,7 +30126,7 @@ fi
 $as_echo "$ac_cv_lib_sec_acl_totext" >&6; }
 if test "x$ac_cv_lib_sec_acl_totext" = xyes; then :
 
-          have_extended_acl=yes
+         have_extended_acl=yes
 
 
 fi
@@ -30134,18 +30167,18 @@ ACLOBJS=
 
 $as_echo "#define HAVE_ACL 1" >>confdefs.h
 
-                                    if test x${HAVE_LINUX_OS_TRUE} = x; then
-            ACLOBJS="bacl.c bacl_linux.c"
-         fi
-         if test x${HAVE_SUN_OS_TRUE} = x; then
-            ACLOBJS="bacl.c bacl_solaris.c"
-         fi
-         if test x${HAVE_FREEBSD_OS_TRUE} = x; then
-            ACLOBJS="bacl.c bacl_freebsd.c"
-         fi
-         if test x${HAVE_DARWIN_OS_TRUE} = x; then
-            ACLOBJS="bacl.c bacl_osx.c"
-         fi
+                                if test x${HAVE_LINUX_OS_TRUE} = x; then
+           ACLOBJS="bacl.c bacl_linux.c"
+        fi
+        if test x${HAVE_SUN_OS_TRUE} = x; then
+           ACLOBJS="bacl.c bacl_solaris.c"
+        fi
+        if test x${HAVE_FREEBSD_OS_TRUE} = x; then
+           ACLOBJS="bacl.c bacl_freebsd.c"
+        fi
+        if test x${HAVE_DARWIN_OS_TRUE} = x; then
+           ACLOBJS="bacl.c bacl_osx.c"
+        fi
       fi
       if test $have_extended_acl = yes; then
 
@@ -30605,18 +30638,18 @@ XATTROBJS=
 
 $as_echo "#define HAVE_XATTR 1" >>confdefs.h
 
-                                    if test x${HAVE_LINUX_OS_TRUE} = x; then
-            XATTROBJS="bxattr.c bxattr_linux.c"
-         fi
-         if test x${HAVE_SUN_OS_TRUE} = x; then
-            XATTROBJS="bxattr.c bxattr_solaris.c"
-         fi
-         if test x${HAVE_FREEBSD_OS_TRUE} = x; then
-            XATTROBJS="bxattr.c bxattr_freebsd.c"
-         fi
-         if test x${HAVE_DARWIN_OS_TRUE} = x; then
-            XATTROBJS="bxattr.c bxattr_osx.c"
-         fi
+                                if test x${HAVE_LINUX_OS_TRUE} = x; then
+           XATTROBJS="bxattr.c bxattr_linux.c"
+        fi
+        if test x${HAVE_SUN_OS_TRUE} = x; then
+           XATTROBJS="bxattr.c bxattr_solaris.c"
+        fi
+        if test x${HAVE_FREEBSD_OS_TRUE} = x; then
+           XATTROBJS="bxattr.c bxattr_freebsd.c"
+        fi
+        if test x${HAVE_DARWIN_OS_TRUE} = x; then
+           XATTROBJS="bxattr.c bxattr_osx.c"
+        fi
       fi
    fi
 fi
@@ -31236,7 +31269,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
 fi
 
 
-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/baculabackupreport scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps scripts/bacula-tray-monitor.desktop 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/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 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.pl 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_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/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables 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 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES"
+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/btraceback scripts/bconsole scripts/baculabackupreport scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper scripts/bat.console_apps scripts/bacula-tray-monitor.desktop 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/bat.pro.mingw64 src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf src/qt-console/tray-monitor/tray-monitor.pro src/qt-console/tray-monitor/tray-monitor.pro.mingw32 src/qt-console/tray-monitor/tray-monitor.pro.mingw64 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.pl 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_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/cats/install-default-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables updatedb/update_postgresql_tables 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 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec platforms/rpms/suse/bacula-mtx.spec $PFILES"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -31747,7 +31780,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.0.6, which was
+This file was extended by bacula $as_me 9.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31813,7 +31846,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.0.6
+bacula config.status 9.1.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -32340,8 +32373,6 @@ do
     "scripts/logrotate") CONFIG_FILES="$CONFIG_FILES scripts/logrotate" ;;
     "scripts/mtx-changer") CONFIG_FILES="$CONFIG_FILES scripts/mtx-changer" ;;
     "scripts/disk-changer") CONFIG_FILES="$CONFIG_FILES scripts/disk-changer" ;;
-    "scripts/dvd-handler") CONFIG_FILES="$CONFIG_FILES scripts/dvd-handler" ;;
-    "scripts/dvd-simulator") CONFIG_FILES="$CONFIG_FILES scripts/dvd-simulator" ;;
     "scripts/logwatch/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/logwatch/Makefile" ;;
     "scripts/logwatch/logfile.bacula.conf") CONFIG_FILES="$CONFIG_FILES scripts/logwatch/logfile.bacula.conf" ;;
     "scripts/bat.desktop") CONFIG_FILES="$CONFIG_FILES scripts/bat.desktop" ;;
@@ -33983,7 +34014,16 @@ if test "${support_bat}" = "yes" ; then
    touch bat
    chmod 755 bat
    rm -f Makefile
-   rm -rf moc32 obj32
+   rm -rf moc32 obj32 moc64 obj64 ui32 ui64
+   $QMAKE
+   ${MAKE:-make} clean
+
+   cd tray-monitor
+   echo "Creating tray-monitor Makefile"
+   rm -f Makefile
+   rm -rf moc32 obj32 moc64 obj64 ui32 ui64
+   $QMAKE
+   ${MAKE:-make} clean
    $QMAKE
    ${MAKE:-make} clean
    cd ${BUILD_DIR}
@@ -34000,7 +34040,6 @@ cd ${BUILD_DIR}
 
 cd scripts
 chmod 755 bacula btraceback mtx-changer
-chmod 755 dvd-handler dvd-simulator
 chmod 755 bconsole disk-changer devel_bacula logrotate
 cd ..
 
@@ -34031,6 +34070,8 @@ chmod 755 $c/mysql
 
 chmod 755 $c/install-default-backend
 
+chmod 755 src/win32/build-depkgs-mingw32 src/win32/build-depkgs-mingw-w64
+
 if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then
    largefile_support="yes"
 fi