]> 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 4a97c54dcbf287704a96a57dca0f96ee21cf57c8..d47e0d82d474d0c1c7d29b3203a9a9bbc9be2ea5 100644 (file)
@@ -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)
@@ -166,8 +168,25 @@ AC_ARG_ENABLE(gnome,
 
 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)
 
@@ -255,10 +274,13 @@ AC_ARG_ENABLE(static-cons,
    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)
@@ -296,14 +318,13 @@ if test x$support_readline = xyes; then
        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"   
             ],
@@ -315,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
@@ -346,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
 # -----------------------------------------------------------------------
@@ -494,7 +510,7 @@ AC_ARG_WITH(tcp-wrappers,
   [
     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>
@@ -506,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
   ]
@@ -604,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)
 
@@ -629,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)
 
 
@@ -720,7 +733,7 @@ AC_ARG_WITH(sd-password,
 if test "x$sd_password" = "x" ; then
    if test "x$OPENSSL" = "xnone" ; then
 #     key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" 123456789uvwxyzabcdef | awk '{getline} {print} {exit}'`
-      key=`autocnf/randpass 41`
+      key=`autoconf/randpass 41`
    else
       key=`openssl rand -base64 33`
    fi
@@ -733,8 +746,79 @@ 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
 # ------------------------------------------------
@@ -772,7 +856,7 @@ AC_EXEEXT
 
 dnl See if we can use 64 bit file addresses
 largefile_support="no"
-AC_SYS_LARGEFILE
+AC_BAC_LARGEFILE
 
 
 AC_PATH_XTRA
@@ -784,6 +868,7 @@ AC_CHECK_HEADERS( \
        assert.h \
        fcntl.h \
        grp.h \
+       pwd.h \
        libc.h \
        limits.h \
        stdarg.h \
@@ -797,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
@@ -811,12 +901,23 @@ AC_STRUCT_TIMEZONE
 dnl# --------------------------------------------------------------------------
 dnl# Check for utime.h structure 
 dnl# --------------------------------------------------------------------------
-AC_CACHE_CHECK(for utime.h, tar_cv_header_utime_h,
+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
@@ -1054,6 +1155,9 @@ 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 gethostid getdomainname)
 
@@ -1131,6 +1235,8 @@ 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=
@@ -1139,6 +1245,9 @@ AC_SUBST(OBJLIST)
 lld="lld"
 llu="llu"
 
+WCFLAGS=
+WLDFLAGS=
+
 #
 # Finally we set appropriate distribution specific
 #  variables and defaults
@@ -1147,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"
@@ -1163,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`
@@ -1186,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 \
@@ -1208,7 +1341,6 @@ irix)
        DISTVER=`uname -r`
        TAPEDRIVE="/dev/rmt/0cbn"
        PSCMD="ps -e -o pid,comm"
-       hostname=`/usr/bsd/hostname -s`
        PFILES="${PFILES} \
            platforms/irix/Makefile \
            platforms/irix/bacula-fd \
@@ -1240,14 +1372,30 @@ openbsd)
   ;;
 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)
@@ -1269,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} \
@@ -1277,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
@@ -1291,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
@@ -1303,7 +1464,6 @@ esac
 
 AC_SUBST(hostname)
 
-
 LIBS="$PTHREAD_LIB $LIBS"
 
 AC_DEFINE_UNQUOTED(lld, "$lld")
@@ -1314,11 +1474,24 @@ 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 \
           rescue/Makefile \
@@ -1336,12 +1509,18 @@ AC_OUTPUT([autoconf/Make.common \
           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 \
@@ -1349,20 +1528,19 @@ AC_OUTPUT([autoconf/Make.common \
           src/stored/Makefile \
           src/stored/bacula-sd.conf \
           src/filed/Makefile \
-          src/filed/host.h \
           src/filed/bacula-fd.conf \
           src/filed/win32/Makefile \
           src/cats/Makefile \
           src/cats/make_catalog_backup \
           src/cats/delete_catalog_backup \
-          src/cats/alter_mysql_tables \
           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/alter_sqlite_tables \
           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 \
@@ -1371,6 +1549,7 @@ AC_OUTPUT([autoconf/Make.common \
           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 ],  
@@ -1379,18 +1558,19 @@ AC_OUTPUT([autoconf/Make.common \
 
 cd scripts
 chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer
-chmod 755 console gconsole
+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/make_catalog_backup src/cats/delete_catalog_backup
-chmod 755 src/cats/alter_mysql_tables
 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/alter_sqlite_tables
 chmod 755 src/cats/sqlite
 chmod 755 src/cats/make_bdb_tables src/cats/drop_bdb_tables 
 chmod 755 src/cats/create_bdb_database
@@ -1399,6 +1579,30 @@ 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`:
@@ -1408,12 +1612,14 @@ Configuration on `date`:
   Source code location:       ${srcdir}
   Install binaries:          ${sbindir}
   Install config files:       ${sysconfdir}
-  Scripts directory          ${scriptdir}
-  Working directory          ${working_dir}
-  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}
   Statically Linked Tools:    ${support_static_tools}
   Statically Linked FD:       ${support_static_fd}
@@ -1426,9 +1632,18 @@ Configuration on `date`:
   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}
+
+  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
@@ -1436,7 +1651,7 @@ Configuration on `date`:
   TCP Wrappers support:       ${TCPW_MSG}
   ZLIB support:              ${have_zlib}
   enable-smartalloc:         ${support_smartalloc} 
-  enable-gnome:              ${support_gnome}
+  enable-gnome:              ${support_gnome} ${gnome_version}
   client-only:               ${build_client_only}
 
   " > config.out