]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/autoconf/configure.in
- DVD writing/reading seems to be mostly working.
[bacula/bacula] / bacula / autoconf / configure.in
index 71fac94f322d776c79d5c330d4732454809a1dd6..d03826333090ad4bebb12d42c3c86d82bc5f864e 100644 (file)
@@ -40,10 +40,13 @@ AC_PROG_CXX
 AC_PROG_CC_C_O                 dnl Determine if C compiler support -c -o.
 AC_PROG_GCC_TRADITIONAL        dnl Determine if ioctl() need -traditional.
 
-if test "x$CC" = xgcc
-then
+if test "x$CC" = xgcc; then
    AC_DEFINE(HAVE_GCC)
 fi
+AC_PATH_PROG(CXX, $CXX, $CXX)
+if test ! -e $CXX; then
+   AC_MSG_ERROR(Unable to find C++ compiler)
+fi
 
 dnl -------------------------------------------------------
 dnl# Check for programs.
@@ -54,7 +57,6 @@ AC_PATH_PROG(MV, mv, mv)
 AC_PATH_PROG(RM, rm, rm)
 AC_PATH_PROG(CP, cp, cp)
 AC_PATH_PROG(SED, sed, sed)
-AC_PATH_PROG(AWK, awk, awk)
 AC_PATH_PROG(ECHO, echo, echo)
 AC_PATH_PROG(CMP, cmp, cmp)
 AC_PATH_PROG(TBL, tbl, tbl)
@@ -62,9 +64,33 @@ AC_PATH_PROG(AR, ar, ar)
 dnl AC_PATH_PROG(RANLIB, ranlib, ranlib)
 AC_PATH_PROG(OPENSSL, openssl, none)
 AC_PATH_PROG(MTX, mtx, mtx)
+AC_PATH_PROG(MKISOFS, mkisofs, mkisofs)
+AC_PATH_PROG(PYTHON, python, python)
+AC_PATH_PROG(GROWISOFS, growisofs, growisofs)
+AC_PATH_PROG(DVDRWMEDIAINFO, dvd+rw-mediainfo, dvd+rw-mediainfo)
 AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config)
-AC_PATH_PROG(WXCONFIG, wx-config, wx-config)
-AC_PATH_PROG(CDRECORD, cdrecord) 
+AC_ARG_VAR(WXCONFIG, [wx-config command. On some systems, you must set it to wx-config-2.6 to use wxWidgets 2.6.])
+if test "x$WXCONFIG" = x; then
+  WXCONFIG=wx-config
+fi
+AC_PATH_PROG(WXCONFIG, ${WXCONFIG}, ${WXCONFIG})
+AC_ARG_VAR(WXFLAGS, [Parameters to pass to wx-config (e.g. --unicode=no).])
+AC_PATH_PROG(CDRECORD, cdrecord, cdrecord)
+AC_PATH_PROG(PIDOF, pidof, pidof)
+AC_PROG_AWK
+# Some AWK programs fail, so test it and warn the user
+if echo xfoo | $AWK 'BEGIN { prog=ARGV[1]; ARGC=1 } 
+      { if ((prog == $2) || (("(" prog ")") == $2) ||
+          (("[" prog "]") == $2) ||
+          ((prog ":") == $2)) { print $1 ; exit 0 } }' xfoo>/dev/null; then :;
+else
+  AC_MSG_ERROR([!!!!!!!!! WARNING !!!!!!!!!!!!!!
+   The regex engine of $AWK is too broken to be used you 
+   might want to install GNU AWK.
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!])
+fi
+THE_AWK=$AWK
+AC_PATH_PROG(AWK, $THE_AWK, $THE_AWK)
 
 test -n "$ARFLAG" || ARFLAGS="cr"
 AC_SUBST(ARFLAGS)
@@ -122,6 +148,14 @@ if test x$sbindir = x'${exec_prefix}/sbin' ; then
     sbindir=${exec_prefix}/sbin
 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
@@ -142,18 +176,22 @@ fi
 
 support_mysql=no
 support_sqlite=no
+support_sqlite3=no
 support_postgresql=no
 support_smartalloc=yes
 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
 support_static_dir=no
 support_static_cons=no
+support_python=no
 build_client_only=no
 cats=
 db_name=Internal
@@ -208,11 +246,13 @@ AC_ARG_ENABLE(wx-console,
 
 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`
+
      AC_SUBST(WXCONS_CPPFLAGS)
      AC_SUBST(WXCONS_LDFLAGS)
      WX_DIR=src/wx-console
@@ -398,7 +438,7 @@ if test x$support_conio = xyes; then
        ])
      ],
      [
-         AC_CHECK_HEADERS(curses.h)
+        AC_CHECK_HEADERS(curses.h)
         AC_CHECK_HEADER(term.h,
               [ AC_CHECK_LIB(curses, tgetent, 
                 [ CONS_LIBS="-lcurses"
@@ -408,7 +448,7 @@ if test x$support_conio = xyes; then
                   support_readline=no
                   AC_DEFINE(HAVE_CONIO, 1, [Set if Bacula conio support enabled]) 
                 ])
-               ],
+              ],
               [ echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " "],
 [#if HAVE_CURSES_H
 #include <curses.h>
@@ -505,143 +545,72 @@ AC_CHECK_HEADERS(varargs.h)
 # End of readline/conio stuff
 # -----------------------------------------------------------------------
 
-# -------------------------------------------
-# 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="3,0,0"
-   fi
-fi
-AC_SUBST(CDSTL)
-
-
-# ---------------------------------------------------
-# 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 Python support
+#
+AC_MSG_CHECKING(for Python support)
+AC_ARG_WITH(python,
+[
+  --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.],
+[
+  PYTHON_INCDIR= 
+  PYTHON_LIBS=
+  if test "$withval" != "no"; then
+     if test "$withval" = "yes"; then
+       if test -f /usr/include/python2.2/Python.h; then
+          PYTHON_INCDIR=-I/usr/include/python2.2
+          PYTHON_LIBS="-L/usr/lib/python2.2/config -lpython2.2 -lutil -ldl"
+       elif test -f /usr/include/python2.3/Python.h; then
+          PYTHON_INCDIR=-I/usr/include/python2.3
+          PYTHON_LIBS="-L/usr/lib/python2.3/config -lpython2.3 -lutil -ldl"
+       elif test -f /usr/include/python2.4/Python.h; then
+          PYTHON_INCDIR=-I/usr/include/python2.4
+          PYTHON_LIBS="-L/usr/lib/python2.4/config -lpython2.4 -lutil -ldl"
+       elif test -f $prefix/include/Python.h; then
+          PYTHON_INCDIR=-I$prefix/include
+          PYTHON_LIBS="-L$prefix/lib/config -lpython -lutil -ldl"
+       else
+          AC_MSG_RESULT(no)
+          AC_MSG_ERROR(Unable to find Python.h in standard locations)
+       fi
+     else
+       if test -f $withval/Python.h; then
+          PYTHON_INCDIR=-I$withval
+          PYTHON_LIBS="-L$withval/config -lpython -lutil -ldl"
+       elif test -f $withval/include/Python.h; then
+          PYTHON_INCDIR=-I$withval/include
+          PYTHON_LIBS="-L$withval/lib/config -lpython -lutil -ldl"
+       else
+          AC_MSG_RESULT(no)
+          AC_MSG_ERROR(Invalid Python directory $withval - unable to find Python.h under $withval)
+       fi
+     fi
+     AC_DEFINE([HAVE_PYTHON], 1)
+     AC_MSG_RESULT(yes)
+     support_python=yes
 
+  else
+     AC_MSG_RESULT(no)
+  fi
+],[
+  AC_MSG_RESULT(no)
+])
+AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PYTHON_INCDIR)
+  
 
-# ---------------------------------------------------
-# 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
+# uses the socket library and some linkers are stupid.
+#
+AC_CHECK_FUNC(socket,
+    AC_MSG_RESULT(using libc's socket),
+    AC_CHECK_LIB(xnet,socket)
+    AC_CHECK_LIB(socket,socket)
+    AC_CHECK_LIB(inet,socket))
 
 
 # -----------------------------------------------------------
@@ -685,6 +654,56 @@ AC_ARG_WITH(tcp-wrappers,
   ]
 )
 
+# -----------------------------------------------------------
+# Check whether OpenSSL is available
+# -----------------------------------------------------------
+AC_MSG_CHECKING([for OpenSSL])
+dnl The following uses quadrigraphs:
+dnl '@<:@' = '['
+dnl '@:>@' = ']'
+AC_ARG_WITH(openssl,
+       AC_HELP_STRING([--with-openssl@<:@=DIR@:>@], [Include OpenSSL support. DIR is the OpenSSL base]),
+       [with_openssl_directory=${withval}])
+
+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"
+
+       AC_TRY_LINK([ #include <openssl/ssl.h> ],
+               [ CRYPTO_set_id_callback(NULL); ],
+               [ support_tls="yes" ],
+               [ support_tls="no" ]
+       )
+
+       LIBS="$saved_LIBS"
+       CFLAGS="$saved_CFLAGS"
+
+       if test "$support_tls" = "yes"; then
+               AC_DEFINE(HAVE_OPENSSL, 1, [Define if OpenSSL library is available])
+               AC_DEFINE(HAVE_TLS, 1, [Define if TLS support should be enabled])
+       fi
+else
+       support_tls="no"
+       OPENSSL_LIBS=""
+       OPENSSL_INC=""
+fi
+
+AC_MSG_RESULT([$support_tls])
+AC_SUBST(OPENSSL_LIBS)
+AC_SUBST(OPENSSL_INC)
+
+
+
 # ------------------------------------------
 # Where to place working dir
 # ------------------------------------------
@@ -950,6 +969,76 @@ AC_SUBST(mon_dir_password)
 AC_SUBST(mon_fd_password)
 AC_SUBST(mon_sd_password)
 
+# -------------------------------------------------------------------------
+#  Set variables for bimagemgr installation
+# -------------------------------------------------------------------------
+bimagemgr_cgidir=/var/www/cgi-bin
+AC_ARG_WITH(bimagemgr-cgidir,
+   [  --with-bimagemgr-cgidir=DIR   specify bimagemgr cgi-bin dir],
+   [
+       if test "x$withval" != "xno" ; then     
+          bimagemgr_cgidir=$withval
+       fi
+   ]
+)
+
+bimagemgr_docdir=/var/www/html
+AC_ARG_WITH(bimagemgr-docdir,
+   [  --with-bimagemgr-docdir=DIR   specify bimagemgr doc root dir],
+   [
+       if test "x$withval" != "xno" ; then     
+          bimagemgr_docdir=$withval
+       fi
+   ]
+)
+
+bimagemgr_binowner=root
+AC_ARG_WITH(bimagemgr-binowner,
+   [  --with-bimagemgr-binowner=USER   specify bimagemgr binary file owner],
+   [
+       if test "x$withval" != "xno" ; then     
+          bimagemgr_binowner=$withval
+       fi
+   ]
+)
+
+bimagemgr_bingroup=root
+AC_ARG_WITH(bimagemgr-bingroup,
+   [  --with-bimagemgr-bingroup=USER   specify bimagemgr binary file group],
+   [
+       if test "x$withval" != "xno" ; then     
+          bimagemgr_bingroup=$withval
+       fi
+   ]
+)
+
+bimagemgr_dataowner=apache
+AC_ARG_WITH(bimagemgr-dataowner,
+   [  --with-bimagemgr-dataowner=USER  specify bimagemgr data file owner],
+   [
+       if test "x$withval" != "xno" ; then     
+          bimagemgr_dataowner=$withval
+       fi
+   ]
+)
+
+bimagemgr_datagroup=apache
+AC_ARG_WITH(bimagemgr-datagroup,
+   [  --with-bimagemgr-datagroup=USER  specify bimagemgr data file group],
+   [
+       if test "x$withval" != "xno" ; then     
+          bimagemgr_datagroup=$withval
+       fi
+   ]
+)
+
+AC_SUBST(bimagemgr_cgidir)
+AC_SUBST(bimagemgr_docdir)
+AC_SUBST(bimagemgr_binowner)
+AC_SUBST(bimagemgr_bingroup)
+AC_SUBST(bimagemgr_dataowner)
+AC_SUBST(bimagemgr_datagroup)
+
 #
 # Handle users and groups for each daemon
 #
@@ -1045,6 +1134,8 @@ BA_CHECK_POSTGRESQL_DB
 
 BA_CHECK_MYSQL_DB
 
+BA_CHECK_SQLITE3_DB
+
 BA_CHECK_SQLITE_DB
 
 AC_SUBST(cats)
@@ -1408,7 +1499,7 @@ AC_CHECK_FUNCS(strtoll, [AC_DEFINE(HAVE_STRTOLL)])
 
 AC_CHECK_FUNCS(chflags) 
 
-AC_CHECK_FUNCS(snprintf vsnprintf gethostid getdomainname)
+AC_CHECK_FUNCS(snprintf vsnprintf gethostid fseeko)
 
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR THREAD SAFE FUNCTIONS
@@ -1422,12 +1513,6 @@ AC_CHECK_FUNC(gethostbyname_r,
     AC_CHECK_LIB(resolv,gethostbyname_r))
 
 
-# Find where sockets are (especially for Solaris)
-AC_CHECK_FUNC(socket,
-    AC_MSG_RESULT(using libc's socket),
-    AC_CHECK_LIB(xnet,socket)
-    AC_CHECK_LIB(socket,socket)
-    AC_CHECK_LIB(inet,socket))
 
 AC_CHECK_FUNCS(inet_pton, [AC_DEFINE(HAVE_INET_PTON)])
 AC_CHECK_FUNCS(inet_ntop, [AC_DEFINE(HAVE_INET_NTOP)])
@@ -1465,7 +1550,7 @@ AC_FUNC_ALLOCA
 AC_FUNC_GETMNTENT
 AC_FUNC_CLOSEDIR_VOID
 AC_FUNC_SETPGRP                      dnl check for BSD setpgrp.
-AC_FUNC_FNMATCH
+# AC_FUNC_FNMATCH    dnl use local version
 
 
 dnl# FreeBSD needs to link libxpg4
@@ -1568,7 +1653,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} \
@@ -1608,7 +1693,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 \
@@ -1621,6 +1706,8 @@ hpux)
        CFLAGS="$(CFLAGS) -D_XOPEN_SOURCE_EXTENDED=1"
        DISTVER=`uname -r`
        TAPEDRIVE="/dev/rmt/0hnb"
+       PTHREAD_LIB="-lpthread"
+       AC_DEFINE([_INCLUDE_LONGLONG])
   ;;
 irix)
        DISTVER=`uname -r`
@@ -1637,7 +1724,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"
   ;;
@@ -1646,7 +1733,7 @@ openbsd)
        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"
        PFILES="${PFILES} \
@@ -1699,6 +1786,7 @@ gentoo)
        PSCMD="ps -e -o pid,command"
        PFILES="${PFILES} \
            platforms/gentoo/Makefile \
+        platforms/gentoo/bacula-init \
            platforms/gentoo/bacula-fd \
            platforms/gentoo/bacula-sd \
            platforms/gentoo/bacula-dir"
@@ -1726,6 +1814,7 @@ solaris)
        if test x$DISTVER = x5.6 ; then
            AC_DEFINE(HAVE_OLD_SOCKOPT)
        fi
+       LIBS="$LIBS -lresolv"
   ;;
 suse)
        DISTVER=`cat /etc/SuSE-release |grep VERSION|\
@@ -1793,12 +1882,6 @@ fi
 
 AC_OUTPUT([autoconf/Make.common \
           Makefile \
-          rescue/Makefile \
-          rescue/linux/Makefile \
-          rescue/linux/floppy/Makefile \
-          rescue/linux/cdrom/Makefile \
-          rescue/freebsd/Makefile \
-          rescue/solaris/Makefile \
           scripts/startmysql \
           scripts/stopmysql \
           scripts/btraceback \
@@ -1818,7 +1901,11 @@ AC_OUTPUT([autoconf/Make.common \
           scripts/bacula.desktop.gnome2.xsu \
           scripts/gnome-console.console_apps \
           scripts/mtx-changer \
-          doc/Makefile \
+          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 \
@@ -1860,6 +1947,12 @@ AC_OUTPUT([autoconf/Make.common \
           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 \
@@ -1881,12 +1974,16 @@ AC_OUTPUT([autoconf/Make.common \
           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 ],  
          [(echo "Doing make of dependencies"; ${MAKE:-make} depend;) ]
 )
 
 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 ..
 
@@ -1945,7 +2042,7 @@ if test "x${db_name}" = "xInternal" ; then
    echo " "
    echo " "
    echo "You have not specified either --enable-client-only or one of the"
-   echo "  supported databases: MySQL, PostgreSQL, or SQLite".
+   echo "  supported databases: MySQL, PostgreSQL, SQLite3 or SQLite."
    echo "  This is not permitted. Please reconfigure."
    echo " "
    echo "Aborting the configuration ..."
@@ -1966,6 +2063,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} 
@@ -2000,18 +2098,16 @@ 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}
+  Python support:            ${support_python} ${PYTHON_LIBS}
 
   " > config.out
 
 cat config.out
-
-# old stuff
-# cweb support:              ${got_cweb} ${CWEB_SRC}
-  # gmp support:                     ${got_gmp} ${GMP_SRC}