X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fautoconf%2Fconfigure.in;h=7044b0257b822d897db29921bd85af6b42c0681a;hb=aeffd73445e2f27dc34021a9546d98e7b61eb5fb;hp=c0ef4202f0cad79892733332890a226161b54c4a;hpb=e5505952053c5ba25af0d2ddafa1d516aa98cd07;p=bacula%2Fbacula diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index c0ef4202f0..7044b0257b 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -8,11 +8,12 @@ cd .. TOP_DIR=`pwd` cd ${BUILD_DIR} AC_SUBST(BUILD_DIR) +AC_SUBST(TOP_DIR) 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.13) +AC_PREREQ(2.59) dnl search for true and false programs. @@ -40,9 +41,15 @@ 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 +BASECC=`basename $CC` +have_gcc=no +if test "x$BASECC" = xgcc; then AC_DEFINE(HAVE_GCC) + have_gcc=yes +fi +AC_PATH_PROG(CXX, $CXX, $CXX) +if test ! -e $CXX; then + AC_MSG_ERROR(Unable to find C++ compiler) fi dnl ------------------------------------------------------- @@ -61,12 +68,19 @@ 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(DD, dd, dd) 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(DVDRWFORMAT, dvd+rw-format, dvd+rw-format) AC_PATH_PROG(PKGCONFIG, pkg-config, pkg-config) -AC_PATH_PROG(WXCONFIG, wx-config, wx-config) +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 @@ -95,8 +109,6 @@ AC_SUBST(LOCAL_CFLAGS) AC_SUBST(LOCAL_LDFLAGS) AC_SUBST(LOCAL_DEFS) - - dnl -------------------------------------------------- dnl Bacula OP Sys determination (see aclocal.m4) dnl -------------------------------------------------- @@ -107,10 +119,16 @@ dnl Bacula OPSys Distribution determination (see aclocal.m4) # ---------------------------------------------------------- BA_CHECK_OPSYS_DISTNAME -# ----------------------------------------------------------- -dnl Check for gnome stuff for gnome-console -# ---------------------------------------------------------- -AM_ACLOCAL_INCLUDE(gnome-macros) +# -------------------------------------------------- +# Suppport for gettext (translations) +# By default, $datadir is ${prefix}/share +# -------------------------------------------------- +AM_GNU_GETTEXT([external]) +if test x${prefix} = xNONE ; then + if test `eval echo ${datadir}` = NONE/share ; then + datadir=/usr/share + fi +fi # ------------------------------------------------------------------ # If the user has not set --prefix, we set our default to nothing. @@ -125,6 +143,10 @@ if test x${prefix} = xNONE ; then prefix= fi sysconfdir=`eval echo ${sysconfdir}` +datadir=`eval echo ${datadir}` +localedir=`eval echo ${datadir}/locale` +AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir") +AC_DEFINE_UNQUOTED(SYSCONFDIR, "$sysconfdir") # ------------------------------------------------------------------------- # If the user has not set --exec-prefix, we default to ${prefix} @@ -140,6 +162,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 @@ -154,7 +184,7 @@ then USE_NLS=no USE_INCLUDED_LIBINTL=no #else -# AM_GNU_GETTEXT + AM_GNU_GETTEXT fi @@ -166,8 +196,12 @@ support_smartalloc=yes support_readline=yes support_conio=yes support_gnome=no +support_bat=no support_wx_console=no +support_tls=no +support_crypto=no gnome_version= +wx_version= support_static_tools=no support_static_fd=no support_static_sd=no @@ -175,9 +209,11 @@ support_static_dir=no support_static_cons=no support_python=no build_client_only=no +build_dird=yes +build_stored=yes cats= -db_name=Internal -DB_NAME=bdb +db_type=Internal +DB_TYPE=bdb dnl# -------------------------------------------------------------------------- dnl# CHECKING COMMAND LINE OPTIONS @@ -187,7 +223,7 @@ dnl# -------------------------------------------------------------------------- # gnome (default off) # ------------------------------------------- AC_ARG_ENABLE(gnome, - [ --enable-gnome enable build of gnome-console GUI [disabled]], + [ --enable-gnome enable build of bgnome-console GUI [disabled]], [if test x$enableval = xyes; then support_gnome=yes fi]) @@ -208,37 +244,112 @@ if test x$support_gnome = xyes; then 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" + AC_MSG_ERROR(Unable to find Gnome 2 installation) fi fi AC_SUBST(GNOME_DIR) +# ------------------------------------------- +# bat (default off) +# ------------------------------------------- +AC_ARG_ENABLE(bat, + [ --enable-bat enable build of bat Qt4 GUI [disabled]], + [if test x$enableval = xyes; then + AC_DEFINE(HAVE_BAT, 1, [Set if Bacula bat Qt4 GUI support enabled]) + support_bat=yes + fi]) + +BAT_DIR= +if test x$support_bat = xyes; then + abc=`$PKGCONFIG --atleast-version=4.2 QtGui` + pkg=$? + if test $pkg = 0; then + BAT_DIR=src/qt-console + else + AC_MSG_ERROR(Unable to find Qt4 installation needed by bat) + fi +fi + +# +# If bat is enabled, we need the qwt library +got_qwt=no +QWT_INC= +QWT_LDFLAGS= +if test x$support_bat = xyes; then + AC_MSG_CHECKING(for qwt support) + AC_ARG_WITH(qwt, + [ --with-qwt@<:@=DIR@:>@ specify qwt library directory], + [ + case "$with_qwt" in + no) + ;; + yes|*) + if test -f ${with_qwt}/include/qwt.h; then + QWT_INC="${with_qwt}/include" + QWT_LDFLAGS="-L${with_qwt}/lib" + fi + ;; + esac + ] + ) +# +# Search in standard places, or --with-qwt not specified +# + if test x$QWT_INC = x; then + for root in /usr /usr/local; do + for ver in qwt qwt5; do + if test -f ${root}/include/${ver}/qwt.h; then + QWT_INC="${root}/include/${ver}" + if test -d ${root}/lib64/; then + QWT_LDFLAGS="-L${root}/lib64" + else + QWT_LDFLAGS="-L${root}/lib" + fi + got_qwt=yes + break; + fi + done + done + fi + if test x$QWT_INC = x; then + AC_MSG_RESULT(no) + AC_MSG_ERROR(Unable to find qwt package needed by bat) + BAT_DIR= + support_bat=no + else + AC_MSG_RESULT(yes) + fi +fi + +AC_SUBST(BAT_DIR) +AC_SUBST(QWT_INC) +AC_SUBST(QWT_LDFLAGS) + # ------------------------------------------- -# wx-console (default off) +# bwx-console (default off) # ------------------------------------------- -AC_ARG_ENABLE(wx-console, - [ --enable-wx-console enable build of wxWidgets console [disabled]], +AC_ARG_ENABLE(bwx-console, + [ --enable-bwx-console enable build of wxWidgets console [disabled]], [if test x$enableval = xyes; then support_wx_console=yes 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` + AC_SUBST(WXCONS_CPPFLAGS) AC_SUBST(WXCONS_LDFLAGS) WX_DIR=src/wx-console else echo " " - echo "wx-config program not found. wx-console disabled." + echo "wx-config program not found. bwx-console disabled." echo " " support_wx_console=no fi @@ -268,7 +379,7 @@ if test x$support_tray_monitor = xyes; then abc=`$PKGCONFIG --atleast-version=2.4 gtk+-2.0` pkg=$? if test $pkg = 0; then - AC_DEFINE(HAVE_GTK_2_4) + AC_DEFINE(HAVE_GTK_2_4) fi fi fi @@ -361,8 +472,8 @@ STATIC_GNOME_CONS= STATIC_WX_CONS= if test x$support_static_cons = xyes; then STATIC_CONS="static-bconsole" - STATIC_GNOME_CONS="static-gnome-console" - STATIC_WX_CONS="static-wx-console" + STATIC_GNOME_CONS="static-bgnome-console" + STATIC_WX_CONS="static-bwx-console" fi AC_SUBST(STATIC_CONS) AC_SUBST(STATIC_GNOME_CONS) @@ -374,9 +485,9 @@ AC_SUBST(STATIC_WX_CONS) AC_ARG_ENABLE(client-only, [ --enable-client-only build client (File daemon) only [disabled]], [if test x$enableval = xyes; then - build_client_only=yes - db_name=None - DB_NAME=none + build_client_only=yes + db_type=None + DB_TYPE=none fi]) if test x$build_client_only = xno; then ALL_DIRS="subdirs" @@ -385,16 +496,77 @@ else fi AC_SUBST(ALL_DIRS) +# ------------------------------------------- +# director (default on) +# ------------------------------------------- +AC_ARG_ENABLE(build-dird, + [ --enable-build-dird enable building of dird (Director) [enabled]], + [if test x$enableval = xno; then + build_dird=no + fi]) +if test x$build_dird = xyes; then + DIRD_DIR="src/dird" + DIR_TOOLS="DIRTOOLS" +else + DIRD_DIR="" + DIR_TOOLS="NODIRTOOLS" +fi +AC_SUBST(DIRD_DIR) +AC_SUBST(DIR_TOOLS) + +# ------------------------------------------- +# stored (default on) +# ------------------------------------------- +AC_ARG_ENABLE(build-stored, + [ --enable-build-stored enable building of stored (Storage daemon) [enabled]], + [if test x$enableval = xno; then + build_stored=no + fi]) +if test x$build_stored = xyes; then + STORED_DIR="src/stored" +else + STORED_DIR="" +fi +AC_SUBST(STORED_DIR) + # --------------------------------------------------- # Check for conio (Bacula readline substitute)( # --------------------------------------------------- # this allows you to turn it completely off -AC_ARG_ENABLE(conio, - [ --disable-conio disable conio support [enabled] +AC_ARG_ENABLE(conio, + [ --disable-conio disable conio support [enabled] + ], + [if test x$enableval = xno; then + support_conio=no + fi] +) + + +# --------------------------------------------------- +# Check for IPv6 support +# --------------------------------------------------- +# this allows you to turn it completely off +support_ipv6=yes +AC_ARG_ENABLE(ipv6, + [ --enable-ipv6 enable ipv6 support [enabled] ], [if test x$enableval = xno; then - support_conio=no - fi]) + support_ipv6=no + fi] +) + +if test x$support_ipv6 = xyes; then + AC_TRY_LINK([ #include +#include +#include ], [struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;], + [support_ipv6=yes], [support_ipv6=no]) +fi + +if test x$support_ipv6 = xyes; then + AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support]) +fi + + got_conio="no" if test x$support_conio = xyes; then @@ -453,20 +625,24 @@ 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_LDFLAGS="-L$with_readline" + if test -f ${with_readline}/readline.h; then + CONS_INC="-I${with_readline}" + CONS_LDFLAGS="-L$with_readline" + elif test -f ${with_readline}/include/readline/readline.h; then + CONS_INC="-I${with_readline}/include/readline" + CONS_LDFLAGS="-L${with_readline}/lib" + with_readline="${with_readline}/include/readline" else with_readline="/usr/include/readline" fi AC_CHECK_HEADER(${with_readline}/readline.h, [ AC_DEFINE(HAVE_READLINE) - CONS_LIBS="-lreadline -ltermcap" + CONS_LIBS="-lreadline -lhistory -ltermcap" got_readline="yes" ], [ echo " " @@ -518,7 +694,7 @@ MAKE_SHELL=/bin/sh AC_SUBST(MAKE_SHELL) AC_HEADER_STAT AC_HEADER_DIRENT -AC_CHECK_FUNCS(strcasecmp select setenv putenv tcgetattr setlocale lstat lchown) +AC_CHECK_FUNCS(strcasecmp select setenv putenv tcgetattr lstat lchown) AC_CHECK_FUNCS(nanosleep nl_langinfo) AC_CHECK_HEADERS(varargs.h) @@ -531,7 +707,7 @@ AC_CHECK_HEADERS(varargs.h) AC_MSG_CHECKING(for Python support) AC_ARG_WITH(python, [ - --with-python[=DIR] Include Python support. DIR is the Python base + --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.], [ @@ -539,29 +715,50 @@ AC_ARG_WITH(python, 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 + for python_root in /usr /usr/local /usr/sfw; do + for ver in python2.2 python2.3 python2.4 python2.5; do + if test -f $python_root/include/${ver}/Python.h; then + PYTHON_INCDIR=-I$python_root/include/${ver} + if test -d $python_root/lib64/${ver}/config; then + PYTHON_LIBS="-L$python_root/lib64/${ver}/config -l${ver}" + else + PYTHON_LIBS="-L$python_root/lib/${ver}/config -l${ver}" + fi + break + fi + done + done + if test x$PYTHON_INCDIR = x; then + if test -f $prefix/include/Python.h; then + PYTHON_INCDIR=-I$prefix/include + if test -d $prefix/lib64/config; then + PYTHON_LIBS="-L$prefix/lib64/config -lpython" + else + PYTHON_LIBS="-L$prefix/lib/config -lpython" + fi + else AC_MSG_RESULT(no) AC_MSG_ERROR(Unable to find Python.h in standard locations) + fi fi else if test -f $withval/Python.h; then PYTHON_INCDIR=-I$withval - PYTHON_LIBS="-L$withval/config -lpython -lutil -ldl" + PYTHON_LIBS="-L$withval/config -lpython" elif test -f $withval/include/Python.h; then PYTHON_INCDIR=-I$withval/include - PYTHON_LIBS="-L$withval/lib/config -lpython -lutil -ldl" + if test -d $withval/lib64/config; then + PYTHON_LIBS="-L$withval/lib64/config -lpython" + else + PYTHON_LIBS="-L$withval/lib/config -lpython" + fi + elif test -f $withval/include/python/Python.h; then + PYTHON_INCDIR=-I$withval/include/python + if test -d $withval/lib64/python/config; then + PYTHON_LIBS="-L$withval/lib64/python/config -lpython" + else + PYTHON_LIBS="-L$withval/lib/python/config -lpython" + fi else AC_MSG_RESULT(no) AC_MSG_ERROR(Invalid Python directory $withval - unable to find Python.h under $withval) @@ -570,7 +767,12 @@ AC_ARG_WITH(python, AC_DEFINE([HAVE_PYTHON], 1) AC_MSG_RESULT(yes) support_python=yes - + AC_MSG_NOTICE(checking for more Python libs) + saved_LIBS="$LIBS"; LIBS= + AC_SEARCH_LIBS(shm_open, [rt]) + AC_CHECK_LIB(util, openpty) + PYTHON_LIBS="$PYTHON_LIBS $LIBS" + LIBS="$saved_LIBS" else AC_MSG_RESULT(no) fi @@ -579,150 +781,6 @@ AC_ARG_WITH(python, ]) AC_SUBST(PYTHON_LIBS) AC_SUBST(PYTHON_INCDIR) - - -# ------------------------------------------- -# 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 -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 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) @@ -740,15 +798,18 @@ AC_CHECK_FUNC(socket, # Check whether user wants TCP wrappers support (default off) # ----------------------------------------------------------- TCPW_MSG="no" +WRAPLIBS="" 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="$saved_LIBS -lwrap" AC_MSG_CHECKING(for libwrap) + AC_SEARCH_LIBS(nanosleep, [rt]) AC_TRY_LINK( - [ #include + [ #include + #include int deny_severity = 0; int allow_severity = 0; struct request_info *req; ], @@ -757,10 +818,14 @@ AC_ARG_WITH(tcp-wrappers, AC_MSG_RESULT(yes) AC_DEFINE(HAVE_LIBWRAP) TCPW_MSG="yes" + LIBS="$saved_LIBS" + WRAPLIBS="-lwrap" ], [ LIBS="$saved_LIBS -lwrap -lnsl" + WRAPLIBS="$saved_LIBS -lwrap -lnsl" AC_TRY_LINK( - [ #include + [ #include + #include int deny_severity = 0; int allow_severity = 0; struct request_info *req; ], @@ -769,6 +834,8 @@ AC_ARG_WITH(tcp-wrappers, AC_MSG_RESULT(yes) AC_DEFINE(HAVE_LIBWRAP) TCPW_MSG="yes" + LIBS="$saved_LIBS" + WRAPLIBS="-lwrap" ], [AC_MSG_ERROR([*** libwrap missing]) ] ] ) @@ -777,6 +844,92 @@ 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 ], + [ CRYPTO_set_id_callback(NULL); ], + [ + support_tls="yes" + support_crypto="yes" + ], + [ support_tls="no" ] + ) + + AC_TRY_LINK([ #include ], + [ EVP_sha512(); ], + [ ac_cv_openssl_sha2="yes" ], + [ ac_cv_openssl_sha2="no" ] + ) + + # Solaris disables greater than 128+ bit encryption in their OpenSSL + # implementation, presumably for export reasons. If 192bit AES + # is available, we assume that we're running with a 'non-export' + # openssl library. + AC_TRY_LINK([ #include ], + [ EVP_aes_192_cbc(); ], + [ ac_cv_openssl_export="no" ], + [ ac_cv_openssl_export="yes" ] + ) + + 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]) + AC_DEFINE(HAVE_CRYPTO, 1, [Define if encryption support should be enabled]) + fi + + if test "$ac_cv_openssl_sha2" = "yes"; then + AC_DEFINE(HAVE_SHA2, 1, [Define if the SHA-2 family of digest algorithms is available]) + fi + + if test "$ac_cv_openssl_export" = "yes"; then + AC_DEFINE(HAVE_OPENSSL_EXPORT_LIBRARY, 1, [Define if the OpenSSL library is export-contrained to 128bit ciphers]) + fi +else + support_tls="no" + support_crypto="no" + OPENSSL_LIBS="" + OPENSSL_INC="" +fi + +AC_MSG_RESULT([$support_tls]) +AC_SUBST(OPENSSL_LIBS) +AC_SUBST(OPENSSL_INC) + + +# ----------------------------------------------------------- +# Python and OpenSSL are using dlopen +# ----------------------------------------------------------- + +if test "$support_python" = "yes" -o "$support_tls" = "yes"; then + AC_SEARCH_LIBS(dlopen, [dl]) +fi + # ------------------------------------------ # Where to place working dir # ------------------------------------------ @@ -876,6 +1029,13 @@ AC_SUBST(piddir) # Where to place subsys "lock file" # ------------------------------------ subsysdir=/var/run/subsys +if test -d /var/run/subsys; then + subsysdir=/var/run/subsys +elif test -d /var/lock/subsys; then + subsysdir=/var/lock/subsys +else + subsysdir=/var/run/subsys +fi AC_ARG_WITH(subsys-dir, [ --with-subsys-dir=PATH specify location of Bacula subsys file], [ @@ -927,7 +1087,6 @@ AC_ARG_WITH(dir-password, if test "x$dir_password" = "x" ; then if test "x$OPENSSL" = "xnone" ; then -# key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" abcdefghijklmnopqrst | awk '{getline} {print} {exit}'` key=`autoconf/randpass 33` else key=`openssl rand -base64 33` @@ -947,7 +1106,6 @@ AC_ARG_WITH(fd-password, if test "x$fd_password" = "x" ; then if test "x$OPENSSL" = "xnone" ; then -# key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" tsrqponmlkjihgfedcba | awk '{getline} {print} {exit}'` key=`autoconf/randpass 37` else key=`openssl rand -base64 33` @@ -967,7 +1125,6 @@ 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=`autoconf/randpass 41` else key=`openssl rand -base64 33` @@ -987,7 +1144,6 @@ AC_ARG_WITH(mon-dir-password, if test "x$mon_dir_password" = "x" ; then if test "x$OPENSSL" = "xnone" ; then -# key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" abcdefghijklmnopqrst | awk '{getline} {print} {exit}'` key=`autoconf/randpass 33` else key=`openssl rand -base64 33` @@ -1007,7 +1163,6 @@ AC_ARG_WITH(mon-fd-password, if test "x$mon_fd_password" = "x" ; then if test "x$OPENSSL" = "xnone" ; then -# key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" tsrqponmlkjihgfedcba | awk '{getline} {print} {exit}'` key=`autoconf/randpass 37` else key=`openssl rand -base64 33` @@ -1027,7 +1182,6 @@ AC_ARG_WITH(mon-sd-password, if test "x$mon_sd_password" = "x" ; then if test "x$OPENSSL" = "xnone" ; then -# key=`date | uuencode /dev/stdout | tr "\"@\\\`\\ \\=\\,\\(\\)\\#\\.\\!\\-$'" 123456789uvwxyzabcdef | awk '{getline} {print} {exit}'` key=`autoconf/randpass 41` else key=`openssl rand -base64 33` @@ -1042,75 +1196,31 @@ 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 - ] +# +# Pickup any database name +# +db_name=bacula +AC_ARG_WITH(db_name, + [ --with-db-name=DBNAME specify database name (default bacula)], + [ + if test "x$withval" != "x" ; then + db_name=$withval + fi + ] ) +AC_SUBST(db_name) -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 - ] +db_user=bacula +AC_ARG_WITH(db_user, + [ --with-db-user=UNAME specify database user (default bacula)], + [ + if test "x$withval" != "x" ; then + db_user=$withval + fi + ] ) +AC_SUBST(db_user) -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 @@ -1175,9 +1285,6 @@ AC_ARG_WITH(fd_group, ] ) - - - AC_SUBST(dir_user) AC_SUBST(dir_group) AC_SUBST(sd_user) @@ -1203,6 +1310,7 @@ AC_SUBST(SBINPERM) # ------------------------------------------------ # Bacula check for various SQL database engines # ------------------------------------------------ +SQL_LIB= BA_CHECK_POSTGRESQL_DB BA_CHECK_MYSQL_DB @@ -1212,7 +1320,29 @@ BA_CHECK_SQLITE3_DB BA_CHECK_SQLITE_DB AC_SUBST(cats) -AC_SUBST(DB_NAME) +AC_SUBST(DB_TYPE) + +# ------------------------------------------- +# enable batch attribute DB insert (default on) +# ------------------------------------------- +support_batch_insert=no +A=`nm $SQL_LIB | grep pthread_mutex_lock` +pkg=$? +if test $pkg = 0; then + support_batch_insert=yes + AC_ARG_ENABLE(batch-insert, + [ --enable-batch-insert enable the DB batch insert code [disabled]], + [if test x$enableval = xno; then + support_batch_insert=no + else + support_batch_insert=yes + fi]) +fi + +if test $support_batch_insert = yes ; then + AC_DEFINE(HAVE_BATCH_FILE_INSERT, 1, [Set if DB batch insert code enabled]) +fi + AC_DEFINE(PROTOTYPES) @@ -1311,6 +1441,18 @@ AC_CACHE_CHECK([for bigendian], ba_cv_bigendian, [ba_cv_bigendian=no])]) test $ba_cv_bigendian = yes && AC_DEFINE(HAVE_BIGENDIAN) +dnl# -------------------------------------------------------------------------- +dnl# Check for typeof() +dnl# -------------------------------------------------------------------------- +AC_LANG_PUSH(C++) +AC_CACHE_CHECK(for typeof, ba_cv_have_typeof, + [AC_TRY_RUN( + [main(){char *a = 0; a = (typeof a)a;}], + [ba_cv_have_typeof=yes], + [ba_cv_have_typeof=no], + [ba_cv_have_typeof=no])]) +test $ba_cv_have_typeof = yes && AC_DEFINE([HAVE_TYPEOF], 1, [Defind to 1 if compiler has typeof]) +AC_LANG_POP(C++) AC_C_CONST @@ -1343,6 +1485,8 @@ AC_TRY_CPP([#include fi AC_MSG_RESULT($fstype) +AC_CHECK_HEADER(sys/statvfs.h, [ AC_DEFINE(HAVE_SYS_STATVFS_H,1,[Defines if your system have the sys/statvfs.h header file])] , ) + dnl# -------------------------------------------------------------------------- dnl# CHECKING FOR TYPEDEFS, STRUCTURES, AND COMPILER CHARACTERISTICS. dnl# -------------------------------------------------------------------------- @@ -1569,15 +1713,12 @@ AC_CHECK_FUNCS( \ AC_CHECK_FUNCS(fchdir, [AC_DEFINE(HAVE_FCHDIR)]) AC_CHECK_FUNCS(strtoll, [AC_DEFINE(HAVE_STRTOLL)]) +AC_CHECK_FUNCS(posix_fadvise) +AC_CHECK_FUNCS(fdatasync) AC_CHECK_FUNCS(chflags) -AC_CHECK_FUNCS(snprintf vsnprintf gethostid) -if test "$DISTNAME" = "hpux" ; then - echo "*** getdomainname check is disabled for hpux" -else - AC_CHECK_FUNCS(getdomainname) -fi +AC_CHECK_FUNCS(snprintf vsnprintf gethostid fseeko) dnl# -------------------------------------------------------------------------- dnl# CHECKING FOR THREAD SAFE FUNCTIONS @@ -1608,18 +1749,6 @@ AC_CACHE_CHECK(for struct sockaddr has a sa_len field, ac_cv_struct_sockaddr_sa_ fi -dnl Check for IPv6 support -AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support, -[AC_TRY_LINK([ #include -#include -#include ], [struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = - 0;], - [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])]) - -if test "$ac_cv_ipv6_support" = yes; then - AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support]) -fi - AC_FUNC_STRFTIME @@ -1631,8 +1760,7 @@ AC_FUNC_SETPGRP dnl check for BSD setpgrp. # AC_FUNC_FNMATCH dnl use local version -dnl# FreeBSD needs to link libxpg4 -AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"]) +AC_CHECK_LIB(intl, gettext, [LIBS="$LIBS -lintl"]) AC_CHECK_LIB(sun, getpwnam) @@ -1645,22 +1773,28 @@ if test x$FDLIBS = x-lz; then have_zlib=yes fi -AC_CHECK_HEADER(sys/acl.h) -AC_CHECK_LIB(acl, acl_get_file, [FDLIBS="-lacl $FDLIBS"]) +# +# Check for ACL libraries +# have_acl=no -if test $ac_cv_lib_acl_acl_get_file = yes; then +AC_CHECK_HEADER(sys/acl.h) +AC_CHECK_FUNC(acl_get_file, [have_acl=yes], + [AC_CHECK_LIB(acl, acl_get_file, [have_acl=yes; FDLIBS="-lacl $FDLIBS"], + [AC_CHECK_LIB(sec, acltotext, [have_acl=yes; FDLIBS="-lsec $FDLIBS"])] + )] +) +if test $have_acl = yes; then AC_DEFINE(HAVE_ACL) - have_acl=yes fi dnl Check for pthread libraries PTHREAD_LIB="" AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread", - [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads", - [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r", - [AC_CHECK_FUNC(pthread_create)] - )] - )] + [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads", + [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r", + [AC_CHECK_FUNC(pthread_create)] + )] + )] ) AC_SUBST(FDLIBS) @@ -1668,16 +1802,22 @@ AC_DEFINE(FDLIBS) CFLAGS=${CFLAGS--O} + +if test x$have_gcc = xyes ; then + CPPFLAGS="$CPPFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" + CFLAGS="$CFLAGS -fno-strict-aliasing -fno-exceptions -fno-rtti" +fi LDFLAGS=${LDFLAGS--O} DB_LIBS="${SQL_LFLAGS}" - CPPFLAGS="$CPPFLAGS" +CFLAGS="$CFLAGS" AC_SUBST(DEBUG) AC_SUBST(DINCLUDE) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(X_CFLAGS) +AC_SUBST(DEFS) AC_SUBST(LIBS) AC_SUBST(DLIB) AC_SUBST(DB_LIBS) @@ -1685,6 +1825,7 @@ AC_SUBST(X_LIBS) AC_SUBST(X_EXTRA_LIBS) AC_SUBST(WCFLAGS) AC_SUBST(WLDFLAGS) +AC_SUBST(WRAPLIBS) dnl# extra configurable objects OBJLIST= @@ -1706,6 +1847,9 @@ PSCMD="ps -e" WIN32= MACOSX= hostname=`uname -n | cut -d '.' -f 1` +if test x${hostname} = x ; then + hostname="localhost" +fi case "$DISTNAME" in aix) DISTVER=`uname -r` @@ -1731,7 +1875,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} \ @@ -1765,13 +1909,13 @@ freebsd) DISTVER=`uname -a |awk '{print $3}'` VER=`echo $DISTVER | cut -c 1` if test x$VER = x4 ; then - PTHREAD_LIB="-pthread" - CFLAGS="${CFLAGS} -pthread" + PTHREAD_LIB="${PTHREAD_LIBS:--pthread}" + CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS:--pthread}" fi 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 \ @@ -1780,8 +1924,8 @@ freebsd) largefile_support="yes" ;; hpux) - PSCMD="UNIX95=1 ps -e -o pid,comm" - CFLAGS="$(CFLAGS) -D_XOPEN_SOURCE_EXTENDED=1" + PSCMD="UNIX95=1; ps -e -o pid,comm" + CFLAGS="${CFLAGS} -D_XOPEN_SOURCE_EXTENDED=1" DISTVER=`uname -r` TAPEDRIVE="/dev/rmt/0hnb" PTHREAD_LIB="-lpthread" @@ -1802,7 +1946,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" ;; @@ -1843,7 +1987,6 @@ redhat) platforms/redhat/bacula-dir \ platforms/redhat/bacula.spec \ " - hostname=`hostname -s` ;; mandrake) DISTVER=`cat /etc/mandrake-release | grep release |\ @@ -1892,6 +2035,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|\ @@ -1959,13 +2103,7 @@ fi AC_OUTPUT([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 \ + manpages/Makefile \ scripts/startmysql \ scripts/stopmysql \ scripts/btraceback \ @@ -1974,6 +2112,9 @@ AC_OUTPUT([autoconf/Make.common \ scripts/bconsole \ scripts/gconsole \ scripts/bacula \ + scripts/bacula-ctl-dir \ + scripts/bacula-ctl-fd \ + scripts/bacula-ctl-sd \ scripts/devel_bacula \ scripts/Makefile \ scripts/logrotate \ @@ -1983,24 +2124,32 @@ AC_OUTPUT([autoconf/Make.common \ scripts/bacula.desktop.gnome2.consolehelper \ scripts/bacula.desktop.gnome1.xsu \ scripts/bacula.desktop.gnome2.xsu \ - scripts/gnome-console.console_apps \ + scripts/bgnome-console.console_apps \ scripts/mtx-changer \ - scripts/dvd-writepart \ - scripts/dvd-freespace \ + scripts/disk-changer \ + scripts/dvd-handler \ + scripts/dvd-simulator \ scripts/bacula-tray-monitor.desktop \ scripts/logwatch/Makefile \ scripts/logwatch/logfile.bacula.conf \ - doc/Makefile \ + scripts/wxconsole.console_apps \ + scripts/wxconsole.desktop.consolehelper \ + scripts/wxconsole.desktop.xsu \ + scripts/bat.desktop \ + scripts/bat.desktop.xsu \ + scripts/bat.desktop.consolehelper \ + scripts/bat.console_apps \ 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/gnome2-console/bgnome-console.conf \ + src/qt-console/bat.conf \ + src/qt-console/bat.pro \ + src/qt-console/install_conf_file \ src/wx-console/Makefile \ - src/wx-console/wx-console.conf \ + src/wx-console/bwx-console.conf \ src/tray-monitor/Makefile \ src/tray-monitor/tray-monitor.conf \ src/dird/Makefile \ @@ -2010,7 +2159,6 @@ AC_OUTPUT([autoconf/Make.common \ 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 \ @@ -2054,20 +2202,25 @@ AC_OUTPUT([autoconf/Make.common \ 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 \ + po/Makefile.in \ $PFILES ], - [(echo "Doing make of dependencies"; ${MAKE:-make} depend;) ] + [ ] ) +if test "${support_bat}" = "yes" ; then + cd src/qt-console + chmod 755 install_conf_file build-depkgs-qt-console + echo "Creating bat Makefile" + qmake + cd ${BUILD_DIR} +fi + +echo "Doing make of dependencies" +${MAKE:-make} depend + cd scripts chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer +chmod 755 dvd-handler dvd-simulator chmod 755 bconsole gconsole mtx-changer devel_bacula logrotate cd .. @@ -2085,6 +2238,9 @@ chmod 755 $c/grant_mysql_privileges $c/drop_mysql_tables $c/drop_mysql_dat chmod 755 $c/create_sqlite_database $c/update_sqlite_tables $c/make_sqlite_tables chmod 755 $c/grant_sqlite_privileges $c/drop_sqlite_tables $c/drop_sqlite_database +chmod 755 $c/create_sqlite3_database $c/update_sqlite3_tables $c/make_sqlite3_tables +chmod 755 $c/grant_sqlite3_privileges $c/drop_sqlite3_tables $c/drop_sqlite3_database + chmod 755 $c/create_postgresql_database $c/update_postgresql_tables $c/make_postgresql_tables chmod 755 $c/grant_postgresql_privileges $c/drop_postgresql_tables $c/drop_postgresql_database @@ -2092,6 +2248,10 @@ chmod 755 $c/make_catalog_backup $c/delete_catalog_backup chmod 755 $c/sqlite chmod 755 $c/mysql +chmod 755 src/win32/build-depkgs-mingw32 + + + if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then largefile_support="yes" fi @@ -2122,7 +2282,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi -if test "x${db_name}" = "xInternal" ; then +if test "x${db_type}" = "xInternal" ; then echo " " echo " " echo "You have not specified either --enable-client-only or one of the" @@ -2147,6 +2307,8 @@ Configuration on `date`: Working directory: ${working_dir} PID directory: ${piddir} Subsys directory: ${subsysdir} + Man directory: ${mandir} + Data directory: ${datadir} C Compiler: ${CC} ${CCVERSION} C++ Compiler: ${CXX} ${CXXVERSION} Compiler flags: ${WCFLAGS} ${CFLAGS} @@ -2157,8 +2319,10 @@ Configuration on `date`: Statically Linked SD: ${support_static_sd} Statically Linked DIR: ${support_static_dir} Statically Linked CONS: ${support_static_cons} - Database type: ${db_name} + Database type: ${db_type} Database lib: ${DB_LIBS} + Database name: ${db_name} + Database user: ${db_user} Job Output Email: ${job_email} Traceback Email: ${dump_email} @@ -2180,20 +2344,22 @@ Configuration on `date`: Large file support: $largefile_support Bacula conio support: ${got_conio} ${CONS_LIBS} readline support: ${got_readline} ${PRTREADLINE_SRC} - TCP Wrappers support: ${TCPW_MSG} + TCP Wrappers support: ${TCPW_MSG} ${WRAPLIBS} + TLS support: ${support_tls} + Encryption support: ${support_crypto} ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} + bat support: ${support_bat} ${QWT_LDFLAGS} enable-gnome: ${support_gnome} ${gnome_version} - enable-wx-console: ${support_wx_console} + enable-bwx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} client-only: ${build_client_only} + build-dird: ${build_dird} + build-stored: ${build_stored} ACL support: ${have_acl} Python support: ${support_python} ${PYTHON_LIBS} + Batch insert enabled: ${support_batch_insert} " > config.out cat config.out - -# old stuff -# cweb support: ${got_cweb} ${CWEB_SRC} -# gmp support: ${got_gmp} ${GMP_SRC}