]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/autoconf/configure.in
This commit was manufactured by cvs2svn to create tag
[bacula/bacula] / bacula / autoconf / configure.in
index bf84950b79f3c9f426b36556505ba4ee1d3ab46f..d47e0d82d474d0c1c7d29b3203a9a9bbc9be2ea5 100644 (file)
@@ -12,7 +12,7 @@ AC_CONFIG_AUX_DIR(${BUILD_DIR}/autoconf)
 AC_CONFIG_HEADER(src/config.h:autoconf/config.h.in)
 
 dnl require a recent autoconf
-AC_PREREQ(2.12)
+AC_PREREQ(2.13)
 
 
 dnl search for true and false programs.
@@ -23,7 +23,7 @@ AC_CANONICAL_HOST
 
 dnl bacula version
 VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
-DATE=`sed -n -e 's/^.*[ \t]*DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
+DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 LSMDATE=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 AC_SUBST(VERSION)dnl 
 AC_SUBST(DATE)dnl 
@@ -61,6 +61,8 @@ AC_PATH_PROG(TBL, tbl, tbl)
 AC_PATH_PROG(AR, ar, ar)
 AC_PATH_PROG(RANLIB, ranlib, ranlib)
 AC_PATH_PROG(OPENSSL, openssl, none)
+AC_PATH_PROG(MTX, mtx, mtx)
+AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config)
 
 test -n "$ARFLAG" || ARFLAGS="cr"
 AC_SUBST(ARFLAGS)
@@ -139,6 +141,14 @@ fi
 support_mysql=no
 support_sqlite=no
 support_smartalloc=yes
+support_readline=yes
+support_gnome=no
+support_static_tools=no
+support_static_fd=no
+support_static_sd=no
+support_static_dir=no
+support_static_cons=no
+build_client_only=no
 cats=
 db_name=Internal
 DB_NAME=bdb
@@ -146,26 +156,37 @@ DB_NAME=bdb
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING COMMAND LINE OPTIONS
 dnl# --------------------------------------------------------------------------
-AC_ARG_ENABLE(everything,
-  [  --enable-everything     enable standard non-multichoice features: marked *],
-  [if test x$enableval = xyes; then
-    support_smartalloc=yes
-  fi])
 
 # -------------------------------------------
 # gnome (default off)
 # -------------------------------------------
-support_gnome=no
 AC_ARG_ENABLE(gnome,
-  [  --enable-gnome    enable build of gnome-console GUI                     *],
+  [  --enable-gnome      enable build of gnome-console GUI [disabled]],
   [if test x$enableval = xyes; then
     support_gnome=yes
   fi])
 
 GNOME_DIR=
 if test x$support_gnome = xyes; then
+  abc=`$PKGCONFIG --exists libgnomeui-2.0`
+  pkg=$?
+  if test $pkg = 0; then
+     GNOME_INCLUDEDIR=`pkg-config --cflags-only-I libgnomeui-2.0`
+     GNOMEUI_LIBS=`pkg-config --libs-only-l libgnomeui-2.0`
+     GNOME_LIBDIR=`pkg-config --libs libgnomeui-2.0`
+     GNOME_LIBS=`pkg-config --libs-only-l libgnomeui-2.0`
+     AC_SUBST(GNOME_INCLUDEDIR)
+     AC_SUBST(GNOMEUI_LIBS)
+     AC_SUBST(GNOME_LIBDIR)
+     AC_SUBST(GNOME_LIBS)
+     GNOME_DIR=src/gnome2-console
+     gnome_version="version 2.x"
+  else
+dnl do 1.4 stuff
     GNOME_INIT
     GNOME_DIR=src/gnome-console
+    gnome_version="version 1.4"
+  fi
 fi
 AC_SUBST(GNOME_DIR)
 
@@ -174,7 +195,7 @@ AC_SUBST(GNOME_DIR)
 # smartalloc (default off)
 # -------------------------------------------
 AC_ARG_ENABLE(smartalloc,
-  [  --enable-smartalloc     enable smartalloc debugging support                  *],
+  [  --enable-smartalloc     enable smartalloc debugging support [disabled]],
   [if test x$enableval = xno; then
     support_smartalloc=no
   fi])
@@ -183,15 +204,106 @@ if test x$support_smartalloc = xyes; then
    AC_DEFINE(SMARTALLOC)
 fi
 
+# -------------------------------------------
+# static-tools (default off)
+# -------------------------------------------
+AC_ARG_ENABLE(static-tools,
+   [  --enable-static-tools   enable static tape tools [disabled]],
+   [if test x$enableval = xyes; then
+     support_static_tools=yes
+   fi])
+
+TTOOL_LDFLAGS=
+if test x$support_static_tools = xyes; then
+   TTOOL_LDFLAGS="-static"
+fi
+AC_SUBST(TTOOL_LDFLAGS)
+
+# -------------------------------------------
+# static-fd    (default off)
+# -------------------------------------------
+AC_ARG_ENABLE(static-fd,
+   [  --enable-static-fd      enable static File daemon [disabled]],
+   [if test x$enableval = xyes; then
+     support_static_fd=yes
+   fi])
+
+STATIC_FD=
+if test x$support_static_fd = xyes; then
+   STATIC_FD="static-bacula-fd"
+fi
+AC_SUBST(STATIC_FD)
 
+# -------------------------------------------
+# static-sd    (default off)
+# -------------------------------------------
+AC_ARG_ENABLE(static-sd,
+   [  --enable-static-sd      enable static Storage daemon [disabled]],
+   [if test x$enableval = xyes; then
+     support_static_sd=yes
+   fi])
+
+STATIC_SD=
+if test x$support_static_sd = xyes; then
+   STATIC_SD="static-bacula-sd"
+fi
+AC_SUBST(STATIC_SD)
+
+# -------------------------------------------
+# static-dir   (default off)
+# -------------------------------------------
+AC_ARG_ENABLE(static-dir,
+   [  --enable-static-dir     enable static Director [disabled]],
+   [if test x$enableval = xyes; then
+     support_static_dir=yes
+   fi])
+
+STATIC_DIR=
+if test x$support_static_dir = xyes; then
+   STATIC_DIR="static-bacula-dir"
+fi
+AC_SUBST(STATIC_DIR)
+
+# -------------------------------------------
+# static-cons  (default off)
+# -------------------------------------------
+AC_ARG_ENABLE(static-cons,
+   [  --enable-static-cons    enable static Console [disabled]],
+   [if test x$enableval = xyes; then
+     support_static_cons=yes
+   fi])
+
+STATIC_CONS=
+STATIC_GNOME_CONS=
+if test x$support_static_cons = xyes; then
+   STATIC_CONS="static-console"
+   STATIC_GNOME_CONS="static-gnome-console"
+fi
+AC_SUBST(STATIC_CONS)
+AC_SUBST(STATIC_GNOME_CONS)
+
+# -------------------------------------------
+# client_only  (default off)
+# -------------------------------------------
+AC_ARG_ENABLE(client-only,
+   [  --enable-client-only    build client (File daemon) only [disabled]],
+   [if test x$enableval = xyes; then
+     build_client_only=yes
+   fi])
+if test x$build_client_only = xno; then
+   ALL_DIRS="subdirs"
+else
+   ALL_DIRS=""
+fi
+AC_SUBST(ALL_DIRS)
 
 # ---------------------------------------------------
 # Check for readline support/directory (default on)
 # ---------------------------------------------------
-support_readline=yes
 # this allows you to turn it completely off
 AC_ARG_ENABLE(readline,
-  [  --disable-readline      disable readline support ],
+  [  --disable-readline      disable readline support [enabled]
+                                                     ],
   [if test x$enableval = xno; then
     support_readline=no
   fi])
@@ -200,20 +312,19 @@ got_readline="no"
 READLINE_SRC=
 if test x$support_readline = xyes; then
    AC_ARG_WITH(readline,
-     [ --with-readline[=DIR]   Specify readline library directory],
+     [ --with-readline=DIR              specify readline library directory],
      [
        case "$with_readline" in
        no) : ;;
        yes|*)
          if test "$with_readline" != "yes"; then
-           CONS_INC="-I$with_readline"
+           CONS_INC="-I${with_readline}"
            CONS_LDFLAGS="-L$with_readline"
          else
             with_readline="/usr/include/readline" 
          fi
-         AC_CHECK_HEADER($with_readline/readline.h, 
-            [ AC_MSG_RESULT(yes)
-              AC_DEFINE(HAVE_READLINE) 
+         AC_CHECK_HEADER(${with_readline}/readline.h, 
+            [ AC_DEFINE(HAVE_READLINE) 
               CONS_LIBS="-lreadline -ltermcap"
               got_readline="yes"   
             ],
@@ -225,21 +336,25 @@ if test x$support_readline = xyes; then
      ],[
        # check for standard readline library
        AC_CHECK_HEADER(/usr/include/readline/readline.h, 
-       [ AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_READLINE)
-        got_readline="yes"
-        CONS_INC="-I/usr/include/readline"
-        CONS_LIBS="-lreadline -ltermcap"
-       ], [
-        # Did not find starndard library, so user our own
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_READLINE)
-        got_readline="yes"
-        CONS_INC="-I${TOP_DIR}/depkgs"
-        CONS_LIBS="-lreadline -lhistory -ltermcap"
-        CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
-        PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
-       ])
+        [ AC_DEFINE(HAVE_READLINE)
+          got_readline="yes"
+          CONS_INC="-I/usr/include/readline"
+          CONS_LIBS="-lreadline -ltermcap"
+        ], [
+          # Did not find standard library, so try Bacula's default
+           AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h, 
+             [ AC_DEFINE(HAVE_READLINE) 
+                got_readline="yes"   
+                CONS_INC="-I${TOP_DIR}/depkgs/readline"
+                CONS_LIBS="-lreadline -lhistory -ltermcap"
+                CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
+                PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
+             ],
+             [ AC_MSG_ERROR([*** readline library missing]) 
+             ]
+           )
+        ]
+       )
      ]  
    )
 fi
@@ -256,18 +371,9 @@ AC_HEADER_STAT
 AC_HEADER_DIRENT
 
 AC_CHECK_FUNCS(strcasecmp select setenv putenv tcgetattr setlocale lstat lchown)
+AC_CHECK_FUNCS(nanosleep)
 
-#AC_CHECK_FUNC(getopt_long, AC_DEFINE(HAVE_GETOPT_LONG),
-#   [LIBEXTRAOBJ="$LIBEXTRAOBJ getopt.o getopt1.o"
-#    EXTRAOBJ="$EXTRAOBJ lib/getopt.o lib/getopt1.o"])
-
-AC_CHECK_FUNC(getopt_long, AC_DEFINE(HAVE_GETOPT_LONG))
-
-
-AC_FUNC_STRCOLL
-
-AC_CHECK_HEADERS(varargs.h \
-               sys/ptem.h sys/pte.h sys/stream.h) 
+AC_CHECK_HEADERS(varargs.h)
 
 # End of readline stuff
 # -----------------------------------------------------------------------
@@ -276,57 +382,57 @@ AC_CHECK_HEADERS(varargs.h \
 # ---------------------------------------------------
 # 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)
+#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
 # -----------------------------------------------------------------------
@@ -335,60 +441,60 @@ AC_SUBST(GMP_SRC)
 # ---------------------------------------------------
 # 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)
+#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
 # -----------------------------------------------------------------------
@@ -400,11 +506,11 @@ AC_SUBST(CWEB_SRC)
 # -----------------------------------------------------------
 TCPW_MSG="no" 
 AC_ARG_WITH(tcp-wrappers,
-  [  --with-tcp-wrappers=DIR Enable tcpwrappers support],
+  [  --with-tcp-wrappers=DIR    enable tcpwrappers support],
   [
     if test "x$withval" != "xno" ; then
        saved_LIBS="$LIBS"
-       LIBS="$LIBS -lwrap -lnsl"
+       LIBS="$saved_LIBS -lwrap"
        AC_MSG_CHECKING(for libwrap)
        AC_TRY_LINK(
          [ #include <tcpd.h>
@@ -416,8 +522,21 @@ AC_ARG_WITH(tcp-wrappers,
            AC_MSG_RESULT(yes)
            AC_DEFINE(HAVE_LIBWRAP)
            TCPW_MSG="yes" 
-         ],
-         [AC_MSG_ERROR([*** libwrap missing]) ]
+         ], [
+           LIBS="$saved_LIBS -lwrap -lnsl"
+           AC_TRY_LINK(
+             [ #include <tcpd.h>
+                int deny_severity = 0;
+                int allow_severity = 0;
+                struct request_info *req; ],
+             [ hosts_access(req); ],
+             [
+                AC_MSG_RESULT(yes)
+                AC_DEFINE(HAVE_LIBWRAP)
+                TCPW_MSG="yes" 
+             ],
+             [AC_MSG_ERROR([*** libwrap missing]) ] ]
+           )
        )
     fi
   ]
@@ -428,7 +547,7 @@ AC_ARG_WITH(tcp-wrappers,
 # ------------------------------------------
 working_dir=`eval echo ${sysconfdir}/working`
 AC_ARG_WITH(working-dir,
-   [  --with-working-dir=PATH Specify location of Bacula working files],
+   [  --with-working-dir=PATH   specify path of Bacula working directory],
    [
        if test "x$withval" != "xno" ; then     
              working_dir=$withval
@@ -438,12 +557,29 @@ AC_ARG_WITH(working-dir,
 
 AC_SUBST(working_dir)
 
+
+# ------------------------------------------
+# Where to place scriptdir (script files)
+# ------------------------------------------
+scriptdir=`eval echo ${sysconfdir}`
+AC_ARG_WITH(scriptdir,
+   [  --with-scriptdir=PATH    specify path of Bacula scripts directory],
+   [
+       if test "x$withval" != "xno" ; then     
+             scriptdir=$withval
+       fi
+   ]
+)
+
+AC_SUBST(scriptdir)
+
+
 # ------------------------------------------
 # Where to send dump email
 # ------------------------------------------
-dump_email=root
+dump_email=root@localhost
 AC_ARG_WITH(dump-email,
-   [  --with-dump-email=Dump email address],
+   [  --with-dump-email=EMAIL   dump email address],
    [
        if test "x$withval" != "xno" ; then     
              dump_email=$withval
@@ -456,9 +592,9 @@ AC_SUBST(dump_email)
 # ------------------------------------------
 # Where to send job email
 # ------------------------------------------
-job_email=root
+job_email=root@localhost
 AC_ARG_WITH(job-email,
-   [  --with-job-email=Job output email address],
+   [  --with-job-email=EMAIL    job output email address],
    [
        if test "x$withval" != "xno" ; then     
              job_email=$withval
@@ -473,7 +609,7 @@ AC_SUBST(job_email)
 # ------------------------------------------
 smtp_host=localhost
 AC_ARG_WITH(smtp_host,
-   [  --with-smtp-host=SMTP mail host address],
+   [  --with-smtp-host=HOST             SMTP mail host address],
    [
        if test "x$withval" != "xno" ; then     
              smtp_host=$withval
@@ -489,7 +625,7 @@ AC_SUBST(smtp_host)
 # ------------------------------------
 piddir=/var/run
 AC_ARG_WITH(pid-dir,
-    [  --with-pid-dir=PATH    Specify location of Bacula pid files],
+    [  --with-pid-dir=PATH              specify location of Bacula pid files],
     [
        if test "x$withval" != "xno" ; then     
            piddir=$withval
@@ -497,14 +633,6 @@ AC_ARG_WITH(pid-dir,
     ]
 )
 
-# make sure the pid directory exists
-if test ! -d $piddir ; then    
-    piddir=`eval echo ${sysconfdir}`
-    case $piddir in
-         NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;;
-    esac
-fi
-
 AC_DEFINE_UNQUOTED(_PATH_BACULA_PIDDIR, "$piddir")
 AC_SUBST(piddir)
 
@@ -514,7 +642,7 @@ AC_SUBST(piddir)
 # ------------------------------------
 subsysdir=/var/run/subsys
 AC_ARG_WITH(subsys-dir,
-    [  --with-subsys-dir=PATH   Specify location of Bacula subsys file],
+    [  --with-subsys-dir=PATH   specify location of Bacula subsys file],
     [
        if test "x$withval" != "xno" ; then     
            subsysdir=$withval
@@ -522,14 +650,6 @@ AC_ARG_WITH(subsys-dir,
     ]
 )
 
-# make sure the pid directory exists
-if test ! -d $subsysdir ; then    
-    subsysdir=`eval echo ${sysconfdir}`
-    case $subsysdir in
-       NONE/*) subsysdir=`echo $subsysdir | sed "s~NONE~$ac_default_prefix~"` ;;
-    esac
-fi
-
 AC_SUBST(subsysdir)
 
 
@@ -539,7 +659,7 @@ AC_SUBST(subsysdir)
 # ------------------------------------
 baseport=9101
 AC_ARG_WITH(baseport,
-    [  --with-baseport=PORT    Specify base port address for daemons],
+    [  --with-baseport=PORT             specify base port address for daemons],
     [
        if test "x$withval" != "xno" ; then     
             baseport=$withval
@@ -562,7 +682,7 @@ AC_SUBST(sd_port)
 # ------------------------------------------
 dir_password=
 AC_ARG_WITH(dir-password,
-   [  --with-dir-password=PASSWORD Specify Director's password],
+   [  --with-dir-password=PASSWORD   specify Director's password],
    [
        if test "x$withval" != "xno" ; then     
           dir_password=$withval
@@ -572,7 +692,8 @@ AC_ARG_WITH(dir-password,
 
 if test "x$dir_password" = "x" ; then
    if test "x$OPENSSL" = "xnone" ; then
-      key=`date | uuencode 1 | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" abcdefghijklmnopqrst | awk '{getline} {print} {exit}'`
+#     key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" abcdefghijklmnopqrst | awk '{getline} {print} {exit}'`
+      key=`autoconf/randpass 33`
    else
       key=`openssl rand -base64 33`
    fi
@@ -581,7 +702,7 @@ fi
 
 fd_password=
 AC_ARG_WITH(fd-password,
-   [  --with-fd-password=PASSWORD Specify Client's password],
+   [  --with-fd-password=PASSWORD    specify Client's password],
    [
        if test "x$withval" != "xno" ; then     
           fd_password=$withval
@@ -591,7 +712,8 @@ AC_ARG_WITH(fd-password,
 
 if test "x$fd_password" = "x" ; then
    if test "x$OPENSSL" = "xnone" ; then
-      key=`date | uuencode 1 | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" tsrqponmlkjihgfedcba | awk '{getline} {print} {exit}'`
+#     key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" tsrqponmlkjihgfedcba | awk '{getline} {print} {exit}'`
+      key=`autoconf/randpass 37`
    else
       key=`openssl rand -base64 33`
    fi
@@ -600,7 +722,7 @@ fi
 
 sd_password=
 AC_ARG_WITH(sd-password,
-   [  --with-sd-password=PASSWORD Specify Storage daemon's password],
+   [  --with-sd-password=PASSWORD    specify Storage daemon's password],
    [
        if test "x$withval" != "xno" ; then     
           sd_password=$withval
@@ -610,7 +732,8 @@ AC_ARG_WITH(sd-password,
 
 if test "x$sd_password" = "x" ; then
    if test "x$OPENSSL" = "xnone" ; then
-      key=`date | uuencode 1 | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" 123456789uvwxyzabcdef | awk '{getline} {print} {exit}'`
+#     key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" 123456789uvwxyzabcdef | awk '{getline} {print} {exit}'`
+      key=`autoconf/randpass 41`
    else
       key=`openssl rand -base64 33`
    fi
@@ -623,7 +746,78 @@ AC_SUBST(fd_password)
 AC_SUBST(sd_password)
 
 
+#
+# Handle users and groups for each daemon
+#
+dir_user=
+AC_ARG_WITH(dir_user,
+    [  --with-dir-user=USER             specify user for Director daemon],
+    [
+       if test "x$withval" != "x" ; then       
+            dir_user=$withval
+       fi
+    ]
+)
+
+dir_group=
+AC_ARG_WITH(dir_group,
+    [  --with-dir-group=GROUP           specify group for Director daemon],
+    [
+       if test "x$withval" != "x" ; then       
+            dir_group=$withval
+       fi
+    ]
+)
+
+sd_user=
+AC_ARG_WITH(sd_user,
+    [  --with-sd-user=USER              specify user for Storage daemon],
+    [
+       if test "x$withval" != "x" ; then       
+            sd_user=$withval
+       fi
+    ]
+)
+
+sd_group=
+AC_ARG_WITH(sd_group,
+    [  --with-sd-group=GROUP            specify group for Storage daemon],
+    [
+       if test "x$withval" != "x" ; then       
+            sd_group=$withval
+       fi
+    ]
+)
+
+fd_user=
+AC_ARG_WITH(fd_user,
+    [  --with-fd-user=USER              specify user for File daemon],
+    [
+       if test "x$withval" != "x" ; then       
+            fd_user=$withval
+       fi
+    ]
+)
+
+fd_group=
+AC_ARG_WITH(fd_group,
+    [  --with-fd-group=GROUP            specify group for File daemon],
+    [
+       if test "x$withval" != "x" ; then       
+            fd_group=$withval
+       fi
+    ]
+)
+
+
+
 
+AC_SUBST(dir_user)
+AC_SUBST(dir_group)
+AC_SUBST(sd_user)
+AC_SUBST(sd_group)
+AC_SUBST(fd_user)
+AC_SUBST(fd_group)
 
 # ------------------------------------------------
 # Bacula check for various SQL database engines
@@ -646,7 +840,7 @@ dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
 dnl#
 if test -z "$CFLAGS"; then
     if test -z "$CCOPTS"; then
-       CCOPTS='-O'
+       CCOPTS='-g -O2'
 dnl>   if test "x$GCC" = xyes; then
 dnl>       if test x$system = xLinux; then
 dnl>           CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
@@ -659,9 +853,10 @@ fi
 
 dnl A few others 
 AC_EXEEXT
-dnl # AC_SYS_LARGEFILE must modify aclocal.m4
-dnl LARGE_FILE_SUPPORT
-  
+
+dnl See if we can use 64 bit file addresses
+largefile_support="no"
+AC_BAC_LARGEFILE
 
 
 AC_PATH_XTRA
@@ -673,10 +868,12 @@ AC_CHECK_HEADERS( \
        assert.h \
        fcntl.h \
        grp.h \
+       pwd.h \
        libc.h \
        limits.h \
        stdarg.h \
        stdlib.h \
+       stdint.h \
        string.h \
        termios.h \
        unistd.h \
@@ -685,6 +882,11 @@ AC_CHECK_HEADERS( \
        sys/select.h \
        sys/sockio.h \
        sys/time.h \
+       sys/socket.h \
+       arpa/nameser.h \
+       resolv.h \
+       mtio.h \
+       sys/mtio.h \
 )
 AC_HEADER_STDC
 AC_HEADER_MAJOR
@@ -696,16 +898,38 @@ AC_STRUCT_ST_BLKSIZE
 AC_STRUCT_ST_BLOCKS
 AC_STRUCT_TIMEZONE
 
-# It seems that that many machines where <utime.h> seems to be
-# broken just require something like -D_XXX_SOURCE, where XXX might
-# be POSIX, POSIX_C, ALL, HPUX or whatever, depending on the machine.
-
-AC_CACHE_CHECK(for utime.h, tar_cv_header_utime_h,
+dnl# --------------------------------------------------------------------------
+dnl# Check for utime.h structure 
+dnl# --------------------------------------------------------------------------
+AC_CACHE_CHECK(for utime.h, ba_cv_header_utime_h,
   [AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <utime.h>], [struct utimbuf foo],
-  tar_cv_header_utime_h=yes, tar_cv_header_utime_h=no)])
-test $tar_cv_header_utime_h = yes && AC_DEFINE(HAVE_UTIME_H)
+  ba_cv_header_utime_h=yes, ba_cv_header_utime_h=no)])
+test $ba_cv_header_utime_h = yes && AC_DEFINE(HAVE_UTIME_H)
+
+dnl# --------------------------------------------------------------------------
+dnl# Check for socklen_t
+dnl# --------------------------------------------------------------------------
+AC_CACHE_CHECK(for socklen_t, ba_cv_header_socklen_t,
+  [AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>],
+  [socklen_t x],
+  ba_cv_header_socklen_t=yes, ba_cv_header_socklen_t=no)])
+test $ba_cv_header_socklen_t = yes && AC_DEFINE(HAVE_SOCKLEN_T)
+
+dnl# --------------------------------------------------------------------------
+dnl# Check for bigendian
+dnl# --------------------------------------------------------------------------
+AC_CACHE_CHECK([for bigendian], ba_cv_bigendian,
+  [AC_TRY_RUN(
+    [main(){long a=1L; char *p=(char *)&a; exit(*p);}],
+    [ba_cv_bigendian=yes], 
+    [ba_cv_bigendian=no], 
+    [ba_cv_bigendian=no])])
+test $ba_cv_bigendian = yes && AC_DEFINE(HAVE_BIGENDIAN)
+
 
 AC_C_CONST
 
@@ -917,6 +1141,7 @@ AC_CHECK_FUNCS( \
        getcwd \
        gethostname \
        getpid \
+       gettimeofday \
        setpgid \
        setpgrp \
        setsid \
@@ -930,12 +1155,23 @@ AC_CHECK_FUNCS( \
 )
 
 AC_CHECK_FUNCS(fchdir, [AC_DEFINE(HAVE_FCHDIR)])
+AC_CHECK_FUNCS(strtoll, [AC_DEFINE(HAVE_STRTOLL)])
+
+AC_CHECK_FUNCS(chflags) 
 
-AC_CHECK_FUNCS(snprintf vsnprintf)
+AC_CHECK_FUNCS(snprintf vsnprintf gethostid getdomainname)
 
-AC_CHECK_FUNCS(localtime_r, [AC_DEFINE(HAVE_LOCALTIME_R)])
+dnl# --------------------------------------------------------------------------
+dnl# CHECKING FOR THREAD SAFE FUNCTIONS
+dnl# --------------------------------------------------------------------------
+AC_CHECK_FUNCS(localtime_r readdir_r strerror_r gethostbyname_r)
+
+# If resolver functions are not in libc check for -lnsl or -lresolv.
+AC_CHECK_FUNC(gethostbyname_r,
+    AC_MSG_RESULT(using libc's resolver),
+    AC_CHECK_LIB(nsl,gethostbyname_r)
+    AC_CHECK_LIB(resolv,gethostbyname_r))
 
-AC_CHECK_FUNCS(readdir_r, [AC_DEFINE(HAVE_READDIR_R)])
 
 # Find where sockets are (especially for Solaris)
 AC_CHECK_FUNC(socket,
@@ -944,12 +1180,7 @@ AC_CHECK_FUNC(socket,
     AC_CHECK_LIB(socket,socket)
     AC_CHECK_LIB(inet,socket))
 
-# If resolver functions are not in libc check for -lnsl or -lresolv.
-AC_CHECK_FUNC(gethostbyname,
-    AC_MSG_RESULT(using libc's resolver),
-    AC_CHECK_LIB(nsl,gethostbyname)
-    AC_CHECK_LIB(resolv,gethostbyname))
-
+AC_CHECK_FUNCS(inet_pton, [AC_DEFINE(HAVE_INET_PTON)])
 
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
@@ -965,6 +1196,8 @@ AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])
 
 
 AC_CHECK_LIB(sun, getpwnam)
+
+AC_CHECK_HEADERS(zlib.h)
 AC_CHECK_LIB(z, deflate, [FDLIBS="-lz"])
 have_zlib=no
 if test x$FDLIBS = x-lz; then
@@ -988,7 +1221,7 @@ AC_DEFINE(FDLIBS)
 
 CFLAGS=${CFLAGS--O}
 LDFLAGS=${LDFLAGS--O}
-LIBS="${LIBS} ${SQL_LFLAGS}"
+DB_LIBS="${SQL_LFLAGS}"
 
 CPPFLAGS="$CPPFLAGS"
 AC_SUBST(DEBUG)
@@ -999,8 +1232,11 @@ AC_SUBST(LDFLAGS)
 AC_SUBST(X_CFLAGS)
 AC_SUBST(LIBS)
 AC_SUBST(DLIB)
+AC_SUBST(DB_LIBS)
 AC_SUBST(X_LIBS)
 AC_SUBST(X_EXTRA_LIBS)
+AC_SUBST(WCFLAGS)
+AC_SUBST(WLDFLAGS)
 
 dnl# extra configurable objects
 OBJLIST=
@@ -1009,6 +1245,9 @@ AC_SUBST(OBJLIST)
 lld="lld"
 llu="llu"
 
+WCFLAGS=
+WLDFLAGS=
+
 #
 # Finally we set appropriate distribution specific
 #  variables and defaults
@@ -1017,8 +1256,15 @@ llu="llu"
 PFILES="platforms/Makefile"
 PSCMD="ps -e"
 WIN32=
-hostname=`hostname`
+hostname=`uname -n`
 case "$DISTNAME" in
+aix)
+       DISTVER=`uname -r`
+       PSCMD="ps -e -o pid,comm"
+       PFILES="${PFILES} \
+          platforms/aix/Makefile"
+       TAPEDRIVE="/dev/rmt0.1" 
+  ;;     
 alpha)
        DISTVER=`uname -r`
        PTHREAD_LIB="-lpthread -lexc"
@@ -1033,20 +1279,34 @@ alpha)
   ;;
 bsdi)
        DISTVER=`uname -a |awk '{print $3}'`
-       TAPEDRIVE="/dev/nrst0"
-  ;;
-caldera)
-       DISTVER=`cat /etc/.issue | grep Version | cut -f 2 -d ' '`
-       TAPEDRIVE="/dev/nrst0"
-       PSCMD="ps -e -o pid,command"
+       TAPEDRIVE="/dev/nrmt0"
+       PTHREAD_LIB="-pthread"
+       CFLAGS="${CFLAGS} -pthread"
+       PSCMD="ps -x -o pid,command"
+       lld="qd"
+       llu="qu"
+       PFILES="${PFILES} \
+           platforms/bsdi/Makefile \
+           platforms/bsdi/bacula-fd \
+           platforms/bsdi/bacula-sd \
+           platforms/bsdi/bacula-dir"
        hostname=`hostname -s`
+       largefile_support="yes"
   ;;
 cygwin)
        DISTVER=`uname -a |awk '{print $3}'`
        TAPEDRIVE="/dev/nrst0"
        WIN32=win32
-       CFLAGS="${CFLAGS} -mwindows"
-       LDFLAGS="${LDFLAGS} -mwindows"
+       WCFLAGS="-mwindows"
+       WLDFLAGS="-mwindows"
+  ;;
+darwin)
+       DISTVER=`uname -r`
+       TAPEDRIVE="/dev/nst0"
+       PSCMD="ps -e -o pid,command"
+       hostname=`hostname -s`
+       PFILES="${PFILES} \
+          platforms/darwin/Makefile"
   ;;
 debian)
        DISTVER=`cat /etc/debian_version`
@@ -1056,11 +1316,14 @@ debian)
   ;;
 freebsd)
        DISTVER=`uname -a |awk '{print $3}'`
-       PTHREAD_LIB="-pthread"
-       CFLAGS="${CFLAGS} -pthread"
+       VER=`echo $DISTVER | cut -c 1`
+       if test x$VER = x4 ; then
+          PTHREAD_LIB="-pthread"
+          CFLAGS="${CFLAGS} -pthread"
+       fi
        lld="qd"
        llu="qu"
-       TAPEDRIVE="/dev/nrst0"
+       TAPEDRIVE="/dev/nrsa0"
        PSCMD="ps -x -o pid,command"
        PFILES="${PFILES} \
            platforms/freebsd/Makefile \
@@ -1068,17 +1331,30 @@ freebsd)
            platforms/freebsd/bacula-sd \
            platforms/freebsd/bacula-dir"
        hostname=`hostname -s`
+       largefile_support="yes"
   ;;
 hpux)
        DISTVER=`uname -r`
        TAPEDRIVE="/dev/rmt/0hnb"
   ;;
+irix)
+       DISTVER=`uname -r`
+       TAPEDRIVE="/dev/rmt/0cbn"
+       PSCMD="ps -e -o pid,comm"
+       PFILES="${PFILES} \
+           platforms/irix/Makefile \
+           platforms/irix/bacula-fd \
+           platforms/irix/bacula-sd \
+           platforms/irix/bacula-dir"
+  ;;
 netbsd)
        DISTVER=`uname -a |awk '{print $3}'`
        lld="qd"
        llu="qu"
        TAPEDRIVE="/dev/nrst0"
        PSCMD="ps -a -o pid,command"
+       PTHREAD_LIB="-pthread"
+       CFLAGS="${CFLAGS} -pthread"
   ;;
 openbsd)
        DISTVER=`uname -a |awk '{print $3}'`
@@ -1086,19 +1362,54 @@ openbsd)
        llu="qu"
        TAPEDRIVE="/dev/nrst0"
        PSCMD="ps -a -o pid,command"
+       PTHREAD_LIB="-pthread"
+       CFLAGS="${CFLAGS} -pthread"
+       PFILES="${PFILES} \
+           platforms/openbsd/Makefile \
+           platforms/openbsd/bacula-fd \
+           platforms/openbsd/bacula-sd \
+           platforms/openbsd/bacula-dir"
   ;;
 redhat)
        DISTVER=`cat /etc/redhat-release | grep release |\
-                               cut -f 5 -d ' '`
+          cut -f 5 -d ' '`
        TAPEDRIVE="/dev/nst0"
        PSCMD="ps -e -o pid,command"
        PFILES="${PFILES} \
            platforms/redhat/Makefile \
            platforms/redhat/bacula-fd \
            platforms/redhat/bacula-sd \
-           platforms/redhat/bacula-dir"
+           platforms/redhat/bacula-dir \
+           platforms/redhat/bacula.spec \
+           "
+       hostname=`hostname -s`
+  ;;
+mandrake)
+       DISTVER=`cat /etc/mandrake-release | grep release |\
+          cut -f 5 -d ' '`
+       TAPEDRIVE="/dev/nst0"
+       PSCMD="ps -e -o pid,command"
+       PFILES="${PFILES} \
+           platforms/mandrake/Makefile \
+           platforms/mandrake/bacula-fd \
+           platforms/mandrake/bacula-sd \
+           platforms/mandrake/bacula-dir \
+           platforms/mandrake/bacula.spec \
+           "
+       hostname=`hostname -s`
+  ;;
+gentoo)
+       DISTVER=`awk '/version / {print $5}' < /etc/gentoo-release`
+       TAPEDRIVE="/dev/nst0"
+       PSCMD="ps -e -o pid,command"
+       PFILES="${PFILES} \
+           platforms/gentoo/Makefile \
+           platforms/gentoo/bacula-fd \
+           platforms/gentoo/bacula-sd \
+           platforms/gentoo/bacula-dir"
        hostname=`hostname -s`
   ;;
+
 slackware)
        DISTVER=`cat /etc/slackware-version`
        TAPEDRIVE="/dev/nst0"
@@ -1106,7 +1417,7 @@ slackware)
        hostname=`hostname -s`
   ;;
 solaris)
-       DISTVER=Solaris
+       DISTVER=`uname -r`
        TAPEDRIVE="/dev/rmt/0cbn"
        PSCMD="ps -e -o pid,comm"
        PFILES="${PFILES} \
@@ -1114,13 +1425,21 @@ solaris)
            platforms/solaris/bacula-fd \
            platforms/solaris/bacula-sd \
            platforms/solaris/bacula-dir"
+       if test x$DISTVER = x5.6 ; then
+           AC_DEFINE(HAVE_OLD_SOCKOPT)
+       fi
   ;;
 suse)
        DISTVER=`cat /etc/SuSE-release |grep VERSION|\
-                               cut -f 3 -d ' '`
+           cut -f 3 -d ' '`
        TAPEDRIVE="/dev/nst0"
        PSCMD="ps -e -o pid,command"
        hostname=`hostname -s`
+       PFILES="${PFILES} \
+           platforms/suse/Makefile \
+           platforms/suse/bacula-fd \
+           platforms/suse/bacula-sd \
+           platforms/suse/bacula-dir"
   ;;
 suse5)
        DISTNAME=suse
@@ -1128,6 +1447,11 @@ suse5)
        TAPEDRIVE="/dev/nst0"
        PSCMD="ps -e -o pid,command"
        hostname=`hostname -s`
+       PFILES="${PFILES} \
+           platforms/suse/Makefile \
+           platforms/suse/bacula-fd \
+           platforms/suse/bacula-sd \
+           platforms/suse/bacula-dir"
   ;;
 unknown)
        DISTVER=unknown
@@ -1140,7 +1464,6 @@ esac
 
 AC_SUBST(hostname)
 
-
 LIBS="$PTHREAD_LIB $LIBS"
 
 AC_DEFINE_UNQUOTED(lld, "$lld")
@@ -1151,26 +1474,54 @@ AC_SUBST(WIN32)
 AC_SUBST(DISTNAME)
 AC_SUBST(DISTVER)
 
-
 dnl# common parts of the Makefile
 MCOMMON=./autoconf/Make.common
 AC_SUBST_FILE(MCOMMON)
 
+dnl# Insanity check
+if test "x${subsysdir}" = "x${sbindir}" ; then
+   echo " "
+   echo " "
+   echo "You have set both --sbindir and --with-subsys-dir"
+   echo "  equal to: ${subsysdir} "
+   echo "This is not permitted. Please reconfigure."
+   echo " "
+   echo "Aborting configuration ..."
+   echo " "
+   echo " "
+   exit 1
+fi 
+
 AC_OUTPUT([autoconf/Make.common \
           Makefile \
-          startmysql \
-          stopmysql \
-          btraceback \
-          startit \
-          stopit \
-          bacula \
-          fd \
+          rescue/Makefile \
+          rescue/linux/Makefile \
+          rescue/freebsd/Makefile \
+          rescue/solaris/Makefile \
+          scripts/startmysql \
+          scripts/stopmysql \
+          scripts/btraceback \
+          scripts/startit \
+          scripts/stopit \
+          scripts/console \
+          scripts/gconsole \
+          scripts/bacula \
+          scripts/fd \
+          scripts/Makefile \
+          scripts/logrotate \
+          scripts/bacula.desktop.gnome1 \
+          scripts/bacula.desktop.gnome2 \
+          scripts/mtx-changer \
           doc/Makefile \
           src/Makefile \
+          src/host.h \
           src/console/Makefile \
           src/console/console.conf \
           src/gnome-console/Makefile \
           src/gnome-console/gnome-console.conf \
+          src/gnome2-console/Makefile \
+          src/gnome2-console/gnome-console.conf \
+          src/tconsole/Makefile \
           src/dird/Makefile \
           src/dird/bacula-dir.conf \
           src/lib/Makefile \
@@ -1180,71 +1531,133 @@ AC_OUTPUT([autoconf/Make.common \
           src/filed/bacula-fd.conf \
           src/filed/win32/Makefile \
           src/cats/Makefile \
+          src/cats/make_catalog_backup \
+          src/cats/delete_catalog_backup \
           src/cats/make_mysql_tables \
           src/cats/drop_mysql_tables \
+          src/cats/update_mysql_tables \
           src/cats/create_mysql_database \
           src/cats/grant_mysql_privileges \
           src/cats/make_sqlite_tables \
           src/cats/drop_sqlite_tables \
+          src/cats/update_sqlite_tables \
           src/cats/create_sqlite_database \
           src/cats/sqlite \
+          src/cats/mysql \
           src/cats/create_bdb_database \
           src/cats/make_bdb_tables \
           src/cats/drop_bdb_tables \
+          src/cats/make_bacula_tables \
+          src/cats/drop_bacula_tables \
+          src/cats/update_bacula_tables \
           src/findlib/Makefile \
+          src/tools/Makefile \
           $PFILES ],  
          [(echo "Doing make of dependencies"; make depend;) ]
 )
 
-chmod 755 startmysql stopmysql bacula startit stopit btraceback
-cp -f startit stopit btraceback btraceback.gdb src/console
-cp -f startit stopit btraceback btraceback.gdb src/dird
-cp -f startit stopit btraceback btraceback.gdb src/filed
-cp -f startit stopit btraceback btraceback.gdb src/lib
-cp -f startit stopit btraceback btraceback.gdb src/stored
+cd scripts
+chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer
+chmod 755 console gconsole mtx-changer
+cd ..
 chmod 755 src/cats/make_mysql_tables src/cats/drop_mysql_tables
 chmod 755 src/cats/make_test_tables src/cats/drop_test_tables
-chmod 755 src/cats/create_mysql_database
+chmod 755 src/cats/create_mysql_database 
+chmod 755 src/cats/make_catalog_backup src/cats/delete_catalog_backup
 chmod 755 src/cats/grant_mysql_privileges
 chmod 755 src/cats/make_sqlite_tables src/cats/drop_sqlite_tables 
+chmod 755 src/cats/update_sqlite_tables
+chmod 755 src/cats/make_bacula_tables src/cats/drop_bacula_tables 
+chmod 755 src/cats/update_mysql_tables
+chmod 755 src/cats/update_bacula_tables src/cats/update_mysql_tables
 chmod 755 src/cats/create_sqlite_database
 chmod 755 src/cats/sqlite
 chmod 755 src/cats/make_bdb_tables src/cats/drop_bdb_tables 
 chmod 755 src/cats/create_bdb_database
 
+if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then
+   largefile_support="yes"
+fi
+
+#
+# A whole lot of hand springs to get the compiler version.
+#  This is because gcc changed the output in version 3.0
+#
+CCVERSION=`${CC} --version | tr '\n' ' ' | cut -f 3 -d ' '`
+if test "x${CCVERSION}" = "x" ; then
+  CCVERSION=`${CC} --version | tr '\n' ' ' | cut -f 1 -d ' '`
+fi
+CXXVERSION=`${CXX} --version | tr '\n' ' ' | cut -f 3 -d ' '`
+if test x"${CXXVERSION}" = x ; then
+  CXXVERSION=`${CXX} --version | tr '\n' ' ' | cut -f 1 -d ' '`
+fi
+
+if test "x${subsysdir}" = "x${sbindir}" ; then
+   echo " "
+   echo " "
+   echo "You have set --sbindir and --with-subsys-dir"
+   echo "  both equal to: ${subsysdir} "
+   echo "  This is not permitted. Please reconfigure."
+   echo "Aborting configuration ..."
+   echo " "
+   echo " "
+   exit 1
+fi 
+
 echo "
 Configuration on `date`:
 
-  Host:                      ${DISTNAME} ${DISTVER}
+  Host:                      $host -- ${DISTNAME} ${DISTVER}
   Bacula version:            ${VERSION} (${DATE})
   Source code location:       ${srcdir}
   Install binaries:          ${sbindir}
   Install config files:       ${sysconfdir}
-  C Compiler:                ${CC}
-  C++ Compiler:              ${CXX}
-  Compiler flags:            ${CFLAGS} 
-  Linker flags:              ${LDFLAGS}
+  Scripts directory:         ${scriptdir}
+  Working directory:         ${working_dir}
+  PID directory:             ${piddir}
+  Subsys directory:          ${subsysdir}
+  C Compiler:                ${CC} ${CCVERSION}
+  C++ Compiler:              ${CXX} ${CXXVERSION}
+  Compiler flags:            ${WCFLAGS} ${CFLAGS} 
+  Linker flags:              ${WLDFLAGS} ${LDFLAGS}
   Libraries:                 ${LIBS}
-  Database found:            ${have_db}
+  Statically Linked Tools:    ${support_static_tools}
+  Statically Linked FD:       ${support_static_fd}
+  Statically Linked SD:       ${support_static_sd}
+  Statically Linked DIR:      ${support_static_dir}
+  Statically Linked CONS:     ${support_static_cons}
   Database type:             ${db_name}
+  Database lib:              ${DB_LIBS}
 
   Job Output Email:          ${job_email}
   Traceback Email:           ${dump_email}
   SMTP Host Address:         ${smtp_host}
-  Director Port              ${dir_port}
-  File daemon Port           ${fd_port}
-  Storage daemon Port        ${sd_port}
-  Working directory          ${working_dir}
+
+  Director Port:             ${dir_port}
+  File daemon Port:          ${fd_port}
+  Storage daemon Port:       ${sd_port}
+
+  Director User:           ${dir_user}
+  Director Group:          ${dir_group}
+  Storage Daemon User:     ${dir_user}
+  Storage DaemonGroup:     ${dir_group}
+  File Daemon User:        ${dir_user}
+  File Daemon Group:       ${dir_group}
+
   SQL binaries Directory      ${SQL_BINDIR}
 
+  Large file support:        $largefile_support
   readline support:          ${got_readline} ${PRTREADLINE_SRC}
-  cweb support:              ${got_cweb} ${CWEB_SRC}
   TCP Wrappers support:       ${TCPW_MSG}
   ZLIB support:              ${have_zlib}
   enable-smartalloc:         ${support_smartalloc} 
-  enable-gnome:              ${support_gnome}
-  gmp support:               ${got_gmp} ${GMP_SRC}
+  enable-gnome:              ${support_gnome} ${gnome_version}
+  client-only:               ${build_client_only}
 
   " > config.out
 
 cat config.out
+
+# old stuff
+# cweb support:              ${got_cweb} ${CWEB_SRC}
+# gmp support:               ${got_gmp} ${GMP_SRC}