X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=6dddd39e7ffe527e2d7f042677b2592857e9a0b8;hb=dd82aeb7b124acb350860eeb7265519d65005eba;hp=c4239612c20de21a79ccd77bbfcd9aa6cba80117;hpb=ad7a16fbbb61842d3272431ccac46f128c3335c5;p=bacula%2Fbacula

diff --git a/bacula/configure b/bacula/configure
index c4239612c2..6dddd39e7f 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO PKGCONFIG WXCONFIG CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR CDSTL working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password bimagemgr_cgidir bimagemgr_docdir bimagemgr_binowner bimagemgr_bingroup bimagemgr_dataowner bimagemgr_datagroup dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO PKGCONFIG WXCONFIG WXFLAGS CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS'
 ac_subst_files='MCOMMON'
 
 # Initialize some variables set by options.
@@ -778,6 +778,14 @@ ac_env_CPP_set=${CPP+set}
 ac_env_CPP_value=$CPP
 ac_cv_env_CPP_set=${CPP+set}
 ac_cv_env_CPP_value=$CPP
+ac_env_WXCONFIG_set=${WXCONFIG+set}
+ac_env_WXCONFIG_value=$WXCONFIG
+ac_cv_env_WXCONFIG_set=${WXCONFIG+set}
+ac_cv_env_WXCONFIG_value=$WXCONFIG
+ac_env_WXFLAGS_set=${WXFLAGS+set}
+ac_env_WXFLAGS_value=$WXFLAGS
+ac_cv_env_WXFLAGS_set=${WXFLAGS+set}
+ac_cv_env_WXFLAGS_value=$WXFLAGS
 
 #
 # Report the --help message.
@@ -875,15 +883,14 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnome-includes   Specify location of GNOME headers
-  --with-gnome-libs       Specify location of GNOME libs
-  --with-gnome            Specify prefix for GNOME files
  --with-readline=DIR		 specify readline library directory
 
   --with-python=DIR	  Include Python support.  DIR is the Python base
 			  install directory, default is to search through
 			  a number of common places for the Python files.
   --with-tcp-wrappers=DIR	 enable tcpwrappers support
+  --with-openssl[=DIR]
+                          Include OpenSSL support. DIR is the OpenSSL base
   --with-working-dir=PATH	 specify path of Bacula working directory
   --with-scriptdir=PATH    specify path of Bacula scripts directory
   --with-dump-email=EMAIL	 dump email address
@@ -898,12 +905,6 @@ Optional Packages:
   --with-mon-dir-password=PASSWORD	 specify Director's password used by the monitor
   --with-mon-fd-password=PASSWORD	 specify Client's password used by the monitor
   --with-mon-sd-password=PASSWORD	 specify Storage daemon's password used by the monitor
-  --with-bimagemgr-cgidir=DIR   specify bimagemgr cgi-bin dir
-  --with-bimagemgr-docdir=DIR   specify bimagemgr doc root dir
-  --with-bimagemgr-binowner=USER   specify bimagemgr binary file owner
-  --with-bimagemgr-bingroup=USER   specify bimagemgr binary file group
-  --with-bimagemgr-dataowner=USER	specify bimagemgr data file owner
-  --with-bimagemgr-datagroup=USER	specify bimagemgr data file group
   --with-dir-user=USER		 specify user for Director daemon
   --with-dir-group=GROUP		 specify group for Director daemon
   --with-sd-user=USER		 specify user for Storage daemon
@@ -941,6 +942,9 @@ Some influential environment variables:
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CPP         C preprocessor
+  WXCONFIG    wx-config command. On some systems, you must set it to
+              wx-config-2.6 to use wxWidgets 2.6.
+  WXFLAGS     Parameters to pass to wx-config (e.g. --unicode=no).
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -3191,13 +3195,57 @@ echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   fi
 fi
 
-if test "x$CC" = xgcc
-then
+if test "x$CC" = xgcc; then
    cat >>confdefs.h <<\_ACEOF
 #define HAVE_GCC 1
 _ACEOF
 
 fi
+# Extract the first word of "$CXX", so it can be a program name with args.
+set dummy $CXX; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_CXX+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $CXX in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CXX="$CXX" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_CXX" && ac_cv_path_CXX="$CXX"
+  ;;
+esac
+fi
+CXX=$ac_cv_path_CXX
+
+if test -n "$CXX"; then
+  echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test ! -e $CXX; then
+   { { echo "$as_me:$LINENO: error: Unable to find C++ compiler" >&5
+echo "$as_me: error: Unable to find C++ compiler" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3958,8 +4006,12 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
-# Extract the first word of "wx-config", so it can be a program name with args.
-set dummy wx-config; ac_word=$2
+
+if test "x$WXCONFIG" = x; then
+  WXCONFIG=wx-config
+fi
+# Extract the first word of "${WXCONFIG}", so it can be a program name with args.
+set dummy ${WXCONFIG}; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_WXCONFIG+set}" = set; then
@@ -3984,7 +4036,7 @@ do
 done
 done
 
-  test -z "$ac_cv_path_WXCONFIG" && ac_cv_path_WXCONFIG="wx-config"
+  test -z "$ac_cv_path_WXCONFIG" && ac_cv_path_WXCONFIG="${WXCONFIG}"
   ;;
 esac
 fi
@@ -3998,6 +4050,7 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+
 # Extract the first word of "cdrecord", so it can be a program name with args.
 set dummy cdrecord; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -4699,6 +4752,14 @@ if test x$sbindir = x'${exec_prefix}/sbin' ; then
 fi
 sbindir=`eval echo ${sbindir}`
 
+# -------------------------------------------------------------------------
+#  If the user has not set --mandir, we default to /usr/share/man
+# -------------------------------------------------------------------------
+if test x$mandir = x'${prefix}/man' ; then
+   mandir=/usr/share/man
+fi
+
+
 # ------------------------------------------------------------------
 # All list of languages for which a translation exist. Each
 #  language is separated by a space.
@@ -4769,7 +4830,9 @@ support_readline=yes
 support_conio=yes
 support_gnome=no
 support_wx_console=no
+support_tls=no
 gnome_version=
+wx_version=
 support_static_tools=no
 support_static_fd=no
 support_static_sd=no
@@ -4809,347 +4872,9 @@ if test x$support_gnome = xyes; then
      GNOME_DIR=src/gnome2-console
      gnome_version="Version 2.x"
   else
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnome-includes or --without-gnome-includes was given.
-if test "${with_gnome_includes+set}" = set; then
-  withval="$with_gnome_includes"
-
-        CFLAGS="$CFLAGS -I$withval"
-
-fi;
-
-
-# Check whether --with-gnome-libs or --without-gnome-libs was given.
-if test "${with_gnome_libs+set}" = set; then
-  withval="$with_gnome_libs"
-
-        LDFLAGS="$LDFLAGS -L$withval"
-        gnome_prefix=$withval
-
-fi;
-
-
-# Check whether --with-gnome or --without-gnome was given.
-if test "${with_gnome+set}" = set; then
-  withval="$with_gnome"
-  if test x$withval = xyes; then
-                        want_gnome=yes
-                                                                        :
-                else
-                        if test "x$withval" = xno; then
-                                want_gnome=no
-                        else
-                                want_gnome=yes
-                                LDFLAGS="$LDFLAGS -L$withval/lib"
-                                CFLAGS="$CFLAGS -I$withval/include"
-                                gnome_prefix=$withval/lib
-                        fi
-                fi
-else
-  want_gnome=yes
-fi;
-
-        if test "x$want_gnome" = xyes; then
-
-            # Extract the first word of "gnome-config", so it can be a program name with args.
-set dummy gnome-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_GNOME_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GNOME_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GNOME_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no"
-  ;;
-esac
-fi
-GNOME_CONFIG=$ac_cv_path_GNOME_CONFIG
-
-if test -n "$GNOME_CONFIG"; then
-  echo "$as_me:$LINENO: result: $GNOME_CONFIG" >&5
-echo "${ECHO_T}$GNOME_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-            if test "$GNOME_CONFIG" = "no"; then
-              no_gnome_config="yes"
-            else
-              echo "$as_me:$LINENO: checking if $GNOME_CONFIG works" >&5
-echo $ECHO_N "checking if $GNOME_CONFIG works... $ECHO_C" >&6
-              if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
-                echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-
-        # Extract the first word of "orbit-config", so it can be a program name with args.
-set dummy orbit-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ORBIT_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $ORBIT_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ORBIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_ORBIT_CONFIG" && ac_cv_path_ORBIT_CONFIG="no"
-  ;;
-esac
-fi
-ORBIT_CONFIG=$ac_cv_path_ORBIT_CONFIG
-
-if test -n "$ORBIT_CONFIG"; then
-  echo "$as_me:$LINENO: result: $ORBIT_CONFIG" >&5
-echo "${ECHO_T}$ORBIT_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-        # Extract the first word of "orbit-idl", so it can be a program name with args.
-set dummy orbit-idl; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ORBIT_IDL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $ORBIT_IDL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ORBIT_IDL="$ORBIT_IDL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ORBIT_IDL="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_ORBIT_IDL" && ac_cv_path_ORBIT_IDL="no"
-  ;;
-esac
-fi
-ORBIT_IDL=$ac_cv_path_ORBIT_IDL
-
-if test -n "$ORBIT_IDL"; then
-  echo "$as_me:$LINENO: result: $ORBIT_IDL" >&5
-echo "${ECHO_T}$ORBIT_IDL" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-        echo "$as_me:$LINENO: checking for working ORBit environment" >&5
-echo $ECHO_N "checking for working ORBit environment... $ECHO_C" >&6
-if test "${gnome_cv_orbit_found+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-                if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then
-                        gnome_cv_orbit_found=no
-                else
-                        gnome_cv_orbit_found=yes
-                fi
-
-fi
-echo "$as_me:$LINENO: result: $gnome_cv_orbit_found" >&5
-echo "${ECHO_T}$gnome_cv_orbit_found" >&6
-
-
-if test x$gnome_cv_orbit_found = xyes; then
-  HAVE_ORBIT_TRUE=
-  HAVE_ORBIT_FALSE='#'
-else
-  HAVE_ORBIT_TRUE='#'
-  HAVE_ORBIT_FALSE=
-fi
-        if test x$gnome_cv_orbit_found = xyes; then
-
-                ORBIT_CFLAGS=`orbit-config --cflags client server`
-                ORBIT_LIBS=`orbit-config --use-service=name --libs client server`
-
-
-        else
-                if test xfail = xfailure; then
-                        { { echo "$as_me:$LINENO: error: ORBit not installed or installation problem" >&5
-echo "$as_me: error: ORBit not installed or installation problem" >&2;}
+     { { echo "$as_me:$LINENO: error: Unable to find Gnome 2 installation" >&5
+echo "$as_me: error: Unable to find Gnome 2 installation" >&2;}
    { (exit 1); exit 1; }; }
-                fi
-        fi
-
-        echo "$as_me:$LINENO: checking for gnorba libraries" >&5
-echo $ECHO_N "checking for gnorba libraries... $ECHO_C" >&6
-if test "${gnome_cv_gnorba_found+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-                gnome_cv_gnorba_found=no
-                if test x$gnome_cv_orbit_found = xyes; then
-                        GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
-                        GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-                        if test -n "$GNORBA_LIBS"; then
-                                gnome_cv_gnorba_found=yes
-                        fi
-                fi
-
-fi
-echo "$as_me:$LINENO: result: $gnome_cv_gnorba_found" >&5
-echo "${ECHO_T}$gnome_cv_gnorba_found" >&6
-
-
-if test x$gnome_cv_gnorba_found = xyes; then
-  HAVE_GNORBA_TRUE=
-  HAVE_GNORBA_FALSE='#'
-else
-  HAVE_GNORBA_TRUE='#'
-  HAVE_GNORBA_FALSE=
-fi
-        if test x$gnome_cv_orbit_found = xyes; then
-
-                GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
-                GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-
-
-        else
-                if test xfail = xfailure; then
-                        { { echo "$as_me:$LINENO: error: gnorba library not installed or installation problem" >&5
-echo "$as_me: error: gnorba library not installed or installation problem" >&2;}
-   { (exit 1); exit 1; }; }
-                fi
-        fi
-
-                GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
-                GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
-                GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`"
-                GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`"
-                ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`"
-                GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
-                GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-
-              else
-                echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-                no_gnome_config="yes"
-              fi
-            fi
-
-            if test x$exec_prefix = xNONE; then
-                if test x$prefix = xNONE; then
-                    gnome_prefix=$ac_default_prefix/lib
-                else
-                    gnome_prefix=$prefix/lib
-                fi
-            else
-                gnome_prefix=`eval echo \`echo $libdir\``
-            fi
-
-            if test "$no_gnome_config" = "yes"; then
-              echo "$as_me:$LINENO: checking for gnomeConf.sh file in $gnome_prefix" >&5
-echo $ECHO_N "checking for gnomeConf.sh file in $gnome_prefix... $ECHO_C" >&6
-              if test -f $gnome_prefix/gnomeConf.sh; then
-                echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-                echo "loading gnome configuration from" \
-                     "$gnome_prefix/gnomeConf.sh"
-                . $gnome_prefix/gnomeConf.sh
-
-              else
-                echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-                if test xfail = xfail; then
-                  { { echo "$as_me:$LINENO: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&5
-echo "$as_me: error: Could not find the gnomeConf.sh file that is generated by gnome-libs install" >&2;}
-   { (exit 1); exit 1; }; }
-                fi
-              fi
-            fi
-        fi
-
-        if test -n ""; then
-          n=""
-          for i in $n; do
-            echo "$as_me:$LINENO: checking extra library \"$i\"" >&5
-echo $ECHO_N "checking extra library \"$i\"... $ECHO_C" >&6
-            case $i in
-              applets)
-
-                GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets`
-                echo "$as_me:$LINENO: result: $GNOME_APPLETS_LIBS" >&5
-echo "${ECHO_T}$GNOME_APPLETS_LIBS" >&6;;
-              docklets)
-
-                GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets`
-                echo "$as_me:$LINENO: result: $GNOME_DOCKLETS_LIBS" >&5
-echo "${ECHO_T}$GNOME_DOCKLETS_LIBS" >&6;;
-              capplet)
-
-                GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet`
-                echo "$as_me:$LINENO: result: $GNOME_CAPPLET_LIBS" >&5
-echo "${ECHO_T}$GNOME_CAPPLET_LIBS" >&6;;
-              *)
-                echo "$as_me:$LINENO: result: unknown library" >&5
-echo "${ECHO_T}unknown library" >&6
-            esac
-            EXTRA_INCLUDEDIR=`$GNOME_CONFIG --cflags $i`
-            GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR $EXTRA_INCLUDEDIR"
-          done
-        fi
-
-
-     GNOME_DIR=src/gnome-console
-     gnome_version="Version 1.4"
   fi
 fi
 
@@ -5168,11 +4893,13 @@ fi;
 
 WX_DIR=
 if test x$support_wx_console = xyes; then
-  abc=`$WXCONFIG --cppflags`
+  abc=`$WXCONFIG $WXFLAGS --cppflags`
   pkg=$?
   if test $pkg = 0; then
-     WXCONS_CPPFLAGS=`$WXCONFIG --cppflags`
-     WXCONS_LDFLAGS=`$WXCONFIG --libs`
+     wx_version="wxWidgets `$WXCONFIG $WXFLAGS --release`"
+     WXCONS_CPPFLAGS=`$WXCONFIG $WXFLAGS --cppflags`
+     WXCONS_LDFLAGS=`$WXCONFIG $WXFLAGS --libs`
+
 
 
      WX_DIR=src/wx-console
@@ -7535,149 +7262,6 @@ fi;
 
 
 
-# -------------------------------------------
-# check for cdrecord writer location
-# get scsibus,target,lun
-# -------------------------------------------
-CDSTL="3,0,0"
-if test ! x$CDRECORD = x ; then
-   CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD-RW | ${AWK} '{print $1}'`
-   if test x${CDSTL} = x ; then
-      CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep CD+RW | ${AWK} '{print $1}'`
-   fi
-   if test x${CDSTL} = x ; then
-      CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep DVD+RW | ${AWK} '{print $1}'`
-   fi
-   if test x${CDSTL} = x ; then
-      CDSTL=`${CDRECORD} -scanbus 2>/dev/null | grep DVD-RW | ${AWK} '{print $1}'`
-   fi
-   if test x${CDSTL} = x ; then
-      CDSTL="3,0,0"
-   fi
-fi
-
-
-
-# ---------------------------------------------------
-# Check for GMP support/directory
-# ---------------------------------------------------
-#GMP_SRC=
-#local_gmp="no"
-#AC_ARG_WITH(gmp,
-#  [  --with-gmp[=DIR]	 Specify gmp library directory],
-#  [
-#     case "$with_gmp" in
-#     no) : ;;
-#     yes|*)
-#	if test "$with_gmp" != "yes"; then
-#	  GMP_INC="-I$with_gmp"
-#	  GMP_LIBS="-lgmp"
-#	  GMP_LDFLAGS="-L$with_gmp"
-#	else
-#	   with_gmp="/usr/include"
-#	fi
-#	AC_CHECK_HEADER($with_gmp/gmp.h,
-#	   [ AC_MSG_RESULT(yes)
-#	     AC_DEFINE(HAVE_GMP)
-#	     GMP_LIBS="-lgmp"
-#	     got_gmp="yes"
-#	   ],
-#	   [ AC_MSG_ERROR([*** gmp library missing])
-#	   ]
-#	)
-#	;;
-#     esac
-#  ],[
-#    # check for standard gmp library
-#    AC_CHECK_HEADER(/usr/include/gmp.h,
-#    [ AC_MSG_RESULT(yes)
-#      AC_DEFINE(HAVE_GMP)
-#      got_gmp="yes"
-#      GMP_INC=
-#      GMP_LIBS="-lgmp"
-#    ], [
-#      # Did not find standard library, so use our own
-#      AC_MSG_RESULT(yes)
-#      AC_DEFINE(HAVE_GMP)
-#      got_gmp="yes"
-#      local_gmp="yes"
-#      GMP_INC="-I${TOP_DIR}/depkgs/gmp"
-#      GMP_LIBS="-lgmp"
-#      GMP_LDFLAGS="-L${TOP_DIR}/depkgs/gmp"
-#      GMP_SRC="${TOP_DIR}/depkgs/gmp"
-#    ])
-#  ]
-#)
-#AC_SUBST(GMP_INC)
-#AC_SUBST(GMP_LIBS)
-#AC_SUBST(GMP_LDFLAGS)
-#AC_SUBST(GMP_SRC)
-
-# End of GMP stuff
-# -----------------------------------------------------------------------
-
-
-# ---------------------------------------------------
-# Check for CWEB support/directory
-# ---------------------------------------------------
-#CWEB_SRC=
-#CWEB=/bin
-#local_cweb="no"
-#AC_ARG_WITH(cweb,
-#  [  --with-cweb[=DIR]   Specify cweb library directory],
-#  [
-#     case "$with_cweb" in
-#     no) : ;;
-#     yes|*)
-#	if test "$with_cweb" != "yes"; then
-#	  CWEB_INC="-I$with_cweb"
-#	  CWEB_LIBS="-lcweb"
-#	  CWEB_LDFLAGS="-L$with_cweb"
-#	else
-#	   with_cweb="/usr/include"
-#	fi
-#	AC_CHECK_HEADER($with_cweb/cweb.h,
-#	   [ AC_MSG_RESULT(yes)
-#	     AC_DEFINE(HAVE_CWEB)
-#	     CWEB_LIBS="-lcweb"
-#	     got_cweb="yes"
-#	   ],
-#	   [ AC_MSG_ERROR([*** cweb library missing])
-#	   ]
-#	)
-#	;;
-#     esac
-#  ],[
-#    # check for standard cweb library
-#    AC_CHECK_HEADER(/usr/include/cweb.h,
-#    [ AC_MSG_RESULT(yes)
-#      AC_DEFINE(HAVE_CWEB)
-#      got_cweb="yes"
-#      CWEB_INC=
-#      CWEB_LIBS="-lcweb"
-#    ], [
-#      # Did not find starndard library, so use our own
-#      AC_MSG_RESULT(yes)
-#      AC_DEFINE(HAVE_CWEB)
-#      got_cweb="yes"
-#      local_cweb="yes"
-#      CWEB=${TOP_DIR}/depkgs/cweb
-#      CWEB_INC="-I${TOP_DIR}/depkgs/cweb"
-#      CWEB_LIBS="-lcweb"
-#      CWEB_LDFLAGS="-L${TOP_DIR}/depkgs/cweb"
-#      CWEB_SRC="${TOP_DIR}/depkgs/cweb"
-#    ])
-#  ]
-#)
-#AC_SUBST(CWEB)
-#AC_SUBST(CWEB_INC)
-#AC_SUBST(CWEB_LIBS)
-#AC_SUBST(CWEB_LDFLAGS)
-#AC_SUBST(CWEB_SRC)
-
-# End of CWEB stuff
-# -----------------------------------------------------------------------
-
 #
 # Find where sockets are (especially for Solaris)
 # Do this before the TCP Wrappers test since tcp wrappers
@@ -8141,6 +7725,108 @@ rm -f conftest.err conftest.$ac_objext \
 
 fi;
 
+# -----------------------------------------------------------
+# Check whether OpenSSL is available
+# -----------------------------------------------------------
+echo "$as_me:$LINENO: checking for OpenSSL" >&5
+echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
+
+# Check whether --with-openssl or --without-openssl was given.
+if test "${with_openssl+set}" = set; then
+  withval="$with_openssl"
+  with_openssl_directory=${withval}
+fi;
+
+if test "x$with_openssl_directory" != "x"; then
+	OPENSSL_LIBS="-lssl -lcrypto"
+	OPENSSL_INC=""
+
+	if test "x$with_openssl_directory" != "xyes" && test x"${with_openssl_directory}" != "x"; then
+		OPENSSL_LIBS="-L$with_openssl_directory/lib $OPENSSL_LIBS"
+		OPENSSL_INC="-I$with_openssl_directory/include $OPENSSL_INC"
+	fi
+
+	saved_LIBS="$LIBS"
+	saved_CFLAGS="$CFLAGS"
+	LIBS="$saved_LIBS $OPENSSL_LIBS"
+	CFLAGS="$saved_CFLAGS $OPENSSL_INC"
+
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+ #include <openssl/ssl.h>
+int
+main ()
+{
+ CRYPTO_set_id_callback(NULL);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+   support_tls="yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ support_tls="no"
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+
+	LIBS="$saved_LIBS"
+	CFLAGS="$saved_CFLAGS"
+
+	if test "$support_tls" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_OPENSSL 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TLS 1
+_ACEOF
+
+	fi
+else
+	support_tls="no"
+	OPENSSL_LIBS=""
+	OPENSSL_INC=""
+fi
+
+echo "$as_me:$LINENO: result: $support_tls" >&5
+echo "${ECHO_T}$support_tls" >&6
+
+
+
+
+
 # ------------------------------------------
 # Where to place working dir
 # ------------------------------------------
@@ -8451,93 +8137,6 @@ fi
 
 
 
-# -------------------------------------------------------------------------
-#  Set variables for bimagemgr installation
-# -------------------------------------------------------------------------
-bimagemgr_cgidir=/var/www/cgi-bin
-
-# Check whether --with-bimagemgr-cgidir or --without-bimagemgr-cgidir was given.
-if test "${with_bimagemgr_cgidir+set}" = set; then
-  withval="$with_bimagemgr_cgidir"
-
-       if test "x$withval" != "xno" ; then
-	   bimagemgr_cgidir=$withval
-       fi
-
-
-fi;
-
-bimagemgr_docdir=/var/www/html
-
-# Check whether --with-bimagemgr-docdir or --without-bimagemgr-docdir was given.
-if test "${with_bimagemgr_docdir+set}" = set; then
-  withval="$with_bimagemgr_docdir"
-
-       if test "x$withval" != "xno" ; then
-	   bimagemgr_docdir=$withval
-       fi
-
-
-fi;
-
-bimagemgr_binowner=root
-
-# Check whether --with-bimagemgr-binowner or --without-bimagemgr-binowner was given.
-if test "${with_bimagemgr_binowner+set}" = set; then
-  withval="$with_bimagemgr_binowner"
-
-       if test "x$withval" != "xno" ; then
-	   bimagemgr_binowner=$withval
-       fi
-
-
-fi;
-
-bimagemgr_bingroup=root
-
-# Check whether --with-bimagemgr-bingroup or --without-bimagemgr-bingroup was given.
-if test "${with_bimagemgr_bingroup+set}" = set; then
-  withval="$with_bimagemgr_bingroup"
-
-       if test "x$withval" != "xno" ; then
-	   bimagemgr_bingroup=$withval
-       fi
-
-
-fi;
-
-bimagemgr_dataowner=apache
-
-# Check whether --with-bimagemgr-dataowner or --without-bimagemgr-dataowner was given.
-if test "${with_bimagemgr_dataowner+set}" = set; then
-  withval="$with_bimagemgr_dataowner"
-
-       if test "x$withval" != "xno" ; then
-	   bimagemgr_dataowner=$withval
-       fi
-
-
-fi;
-
-bimagemgr_datagroup=apache
-
-# Check whether --with-bimagemgr-datagroup or --without-bimagemgr-datagroup was given.
-if test "${with_bimagemgr_datagroup+set}" = set; then
-  withval="$with_bimagemgr_datagroup"
-
-       if test "x$withval" != "xno" ; then
-	   bimagemgr_datagroup=$withval
-       fi
-
-
-fi;
-
-
-
-
-
-
-
 
 #
 # Handle users and groups for each daemon
@@ -18289,112 +17888,8 @@ done
 
 
 
-for ac_func in snprintf vsnprintf gethostid
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-if test "$DISTNAME" = "hpux" ; then
-       echo "*** getdomainname check is disabled for hpux"
-else
-
-for ac_func in getdomainname
+for ac_func in snprintf vsnprintf gethostid fseeko
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -18495,7 +17990,6 @@ _ACEOF
 fi
 done
 
-fi
 
 
 
@@ -21432,7 +20926,7 @@ bsdi)
 	TAPEDRIVE="/dev/nrmt0"
 	PTHREAD_LIB="-pthread"
 	CFLAGS="${CFLAGS} -pthread"
-	PSCMD="ps -x -o pid,command"
+	PSCMD="ps -ax -o pid,command"
 	lld="qd"
 	llu="qu"
 	PFILES="${PFILES} \
@@ -21472,7 +20966,7 @@ freebsd)
 	lld="qd"
 	llu="qu"
 	TAPEDRIVE="/dev/nrsa0"
-	PSCMD="ps -x -o pid,command"
+	PSCMD="ps -ax -o pid,command"
 	PFILES="${PFILES} \
 	    platforms/freebsd/Makefile \
 	    platforms/freebsd/bacula-fd \
@@ -21506,7 +21000,7 @@ netbsd)
 	lld="qd"
 	llu="qu"
 	TAPEDRIVE="/dev/nrst0"
-	PSCMD="ps -a -o pid,command"
+	PSCMD="ps -ax -o pid,command"
 	PTHREAD_LIB="-pthread"
 	CFLAGS="${CFLAGS} -pthread"
   ;;
@@ -21599,6 +21093,7 @@ solaris)
 _ACEOF
 
 	fi
+	LIBS="$LIBS -lresolv"
   ;;
 suse)
 	DISTVER=`cat /etc/SuSE-release |grep VERSION|\
@@ -21668,7 +21163,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/linux/floppy/Makefile rescue/linux/cdrom/Makefile rescue/linux/cdrom/bacula/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/dvd-writepart scripts/dvd-freespace scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf 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/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf 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/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_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_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_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database 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/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf src/win32/pebuilder/Makefile src/bimagemgr/Makefile src/bimagemgr/bacula-bimagemgr.spec $PFILES"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ac_config_files="$ac_config_files autoconf/Make.common Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/dvd-writepart scripts/dvd-freespace scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf 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/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_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_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_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database 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/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf src/win32/pebuilder/Makefile $PFILES"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -22200,13 +21695,6 @@ do
   # Handling of arguments.
   "autoconf/Make.common" ) CONFIG_FILES="$CONFIG_FILES autoconf/Make.common" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "rescue/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/Makefile" ;;
-  "rescue/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/linux/Makefile" ;;
-  "rescue/linux/floppy/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/linux/floppy/Makefile" ;;
-  "rescue/linux/cdrom/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/linux/cdrom/Makefile" ;;
-  "rescue/linux/cdrom/bacula/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/linux/cdrom/bacula/Makefile" ;;
-  "rescue/freebsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/freebsd/Makefile" ;;
-  "rescue/solaris/Makefile" ) CONFIG_FILES="$CONFIG_FILES rescue/solaris/Makefile" ;;
   "scripts/startmysql" ) CONFIG_FILES="$CONFIG_FILES scripts/startmysql" ;;
   "scripts/stopmysql" ) CONFIG_FILES="$CONFIG_FILES scripts/stopmysql" ;;
   "scripts/btraceback" ) CONFIG_FILES="$CONFIG_FILES scripts/btraceback" ;;
@@ -22231,13 +21719,10 @@ do
   "scripts/bacula-tray-monitor.desktop" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula-tray-monitor.desktop" ;;
   "scripts/logwatch/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/logwatch/Makefile" ;;
   "scripts/logwatch/logfile.bacula.conf" ) CONFIG_FILES="$CONFIG_FILES scripts/logwatch/logfile.bacula.conf" ;;
-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "src/host.h" ) CONFIG_FILES="$CONFIG_FILES src/host.h" ;;
   "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;;
   "src/console/bconsole.conf" ) CONFIG_FILES="$CONFIG_FILES src/console/bconsole.conf" ;;
-  "src/gnome-console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnome-console/Makefile" ;;
-  "src/gnome-console/gnome-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/gnome-console/gnome-console.conf" ;;
   "src/gnome2-console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gnome2-console/Makefile" ;;
   "src/gnome2-console/gnome-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/gnome2-console/gnome-console.conf" ;;
   "src/wx-console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/wx-console/Makefile" ;;
@@ -22301,8 +21786,6 @@ do
   "src/win32/console/bconsole.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/console/bconsole.conf" ;;
   "src/win32/wx-console/wx-console.conf" ) CONFIG_FILES="$CONFIG_FILES src/win32/wx-console/wx-console.conf" ;;
   "src/win32/pebuilder/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/win32/pebuilder/Makefile" ;;
-  "src/bimagemgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/bimagemgr/Makefile" ;;
-  "src/bimagemgr/bacula-bimagemgr.spec" ) CONFIG_FILES="$CONFIG_FILES src/bimagemgr/bacula-bimagemgr.spec" ;;
   "$PFILES" ) CONFIG_FILES="$CONFIG_FILES $PFILES" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:autoconf/config.h.in" ;;
@@ -22430,6 +21913,7 @@ s,@GROWISOFS@,$GROWISOFS,;t t
 s,@DVDRWMEDIAINFO@,$DVDRWMEDIAINFO,;t t
 s,@PKGCONFIG@,$PKGCONFIG,;t t
 s,@WXCONFIG@,$WXCONFIG,;t t
+s,@WXFLAGS@,$WXFLAGS,;t t
 s,@CDRECORD@,$CDRECORD,;t t
 s,@PIDOF@,$PIDOF,;t t
 s,@AWK@,$AWK,;t t
@@ -22478,23 +21962,6 @@ s,@GNOME_INCLUDEDIR@,$GNOME_INCLUDEDIR,;t t
 s,@GNOMEUI_LIBS@,$GNOMEUI_LIBS,;t t
 s,@GNOME_LIBDIR@,$GNOME_LIBDIR,;t t
 s,@GNOME_LIBS@,$GNOME_LIBS,;t t
-s,@GNOMEGNORBA_LIBS@,$GNOMEGNORBA_LIBS,;t t
-s,@GTKXMHTML_LIBS@,$GTKXMHTML_LIBS,;t t
-s,@ZVT_LIBS@,$ZVT_LIBS,;t t
-s,@GNOME_CONFIG@,$GNOME_CONFIG,;t t
-s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
-s,@ORBIT_IDL@,$ORBIT_IDL,;t t
-s,@HAVE_ORBIT_TRUE@,$HAVE_ORBIT_TRUE,;t t
-s,@HAVE_ORBIT_FALSE@,$HAVE_ORBIT_FALSE,;t t
-s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
-s,@ORBIT_LIBS@,$ORBIT_LIBS,;t t
-s,@HAVE_GNORBA_TRUE@,$HAVE_GNORBA_TRUE,;t t
-s,@HAVE_GNORBA_FALSE@,$HAVE_GNORBA_FALSE,;t t
-s,@GNORBA_CFLAGS@,$GNORBA_CFLAGS,;t t
-s,@GNORBA_LIBS@,$GNORBA_LIBS,;t t
-s,@GNOME_APPLETS_LIBS@,$GNOME_APPLETS_LIBS,;t t
-s,@GNOME_DOCKLETS_LIBS@,$GNOME_DOCKLETS_LIBS,;t t
-s,@GNOME_CAPPLET_LIBS@,$GNOME_CAPPLET_LIBS,;t t
 s,@GNOME_DIR@,$GNOME_DIR,;t t
 s,@WXCONS_CPPFLAGS@,$WXCONS_CPPFLAGS,;t t
 s,@WXCONS_LDFLAGS@,$WXCONS_LDFLAGS,;t t
@@ -22518,7 +21985,8 @@ s,@CONS_LDFLAGS@,$CONS_LDFLAGS,;t t
 s,@READLINE_SRC@,$READLINE_SRC,;t t
 s,@PYTHON_LIBS@,$PYTHON_LIBS,;t t
 s,@PYTHON_INCDIR@,$PYTHON_INCDIR,;t t
-s,@CDSTL@,$CDSTL,;t t
+s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
+s,@OPENSSL_INC@,$OPENSSL_INC,;t t
 s,@working_dir@,$working_dir,;t t
 s,@scriptdir@,$scriptdir,;t t
 s,@dump_email@,$dump_email,;t t
@@ -22536,12 +22004,6 @@ s,@sd_password@,$sd_password,;t t
 s,@mon_dir_password@,$mon_dir_password,;t t
 s,@mon_fd_password@,$mon_fd_password,;t t
 s,@mon_sd_password@,$mon_sd_password,;t t
-s,@bimagemgr_cgidir@,$bimagemgr_cgidir,;t t
-s,@bimagemgr_docdir@,$bimagemgr_docdir,;t t
-s,@bimagemgr_binowner@,$bimagemgr_binowner,;t t
-s,@bimagemgr_bingroup@,$bimagemgr_bingroup,;t t
-s,@bimagemgr_dataowner@,$bimagemgr_dataowner,;t t
-s,@bimagemgr_datagroup@,$bimagemgr_datagroup,;t t
 s,@dir_user@,$dir_user,;t t
 s,@dir_group@,$dir_group,;t t
 s,@sd_user@,$sd_user,;t t
@@ -23193,6 +22655,7 @@ fi
 
 cd scripts
 chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer
+chmod 755 dvd-writepart dvd-freespace
 chmod 755 bconsole gconsole mtx-changer devel_bacula logrotate
 cd ..
 
@@ -23272,6 +22735,7 @@ Configuration on `date`:
   Working directory:	      ${working_dir}
   PID directory:	      ${piddir}
   Subsys directory:	      ${subsysdir}
+  Man directory:	      ${mandir}
   C Compiler:		      ${CC} ${CCVERSION}
   C++ Compiler: 	      ${CXX} ${CXXVERSION}
   Compiler flags:	      ${WCFLAGS} ${CFLAGS}
@@ -23306,10 +22770,11 @@ Configuration on `date`:
   Bacula conio support:       ${got_conio} ${CONS_LIBS}
   readline support:	      ${got_readline} ${PRTREADLINE_SRC}
   TCP Wrappers support:       ${TCPW_MSG}
+  TLS support:		      ${support_tls}
   ZLIB support: 	      ${have_zlib}
   enable-smartalloc:	      ${support_smartalloc}
   enable-gnome: 	      ${support_gnome} ${gnome_version}
-  enable-wx-console:	      ${support_wx_console}
+  enable-wx-console:	      ${support_wx_console} ${wx_version}
   enable-tray-monitor:	      ${support_tray_monitor}
   client-only:		      ${build_client_only}
   ACL support:		      ${have_acl}
@@ -23318,7 +22783,3 @@ Configuration on `date`:
   " > config.out
 
 cat config.out
-
-# old stuff
-# cweb support: 	      ${got_cweb} ${CWEB_SRC}
-# gmp support:		      ${got_gmp} ${GMP_SRC}