dnl -------------------------------------------------------------------------
dnl If the user has not set --htmldir, we default to /usr/share/doc/bacula/html
dnl -------------------------------------------------------------------------
-if test x$htmldir = x${docdir} ; then
- htmldir=`eval echo ${docdir}bacula/html`
+if test x$htmldir = x'/usr/share/doc/bacula/' ; then
+ htmldir=`eval echo ${docdir}html`
fi
dnl -------------------------------------------------------------------------
-dnl If the user has not set --docdir, we default to /usr/share/doc/
+dnl If the user has not set --docdir, we default to /usr/share/doc/bacula
dnl -------------------------------------------------------------------------
if test x$docdir = x'/usr/share/doc/' ; then
docdir=`eval echo ${docdir}bacula`
dnl --------------------------------------------------------------------------
dnl -------------------------------------------
-dnl gnome (default off)
+dnl gnome -- no longer supported
dnl -------------------------------------------
AC_ARG_ENABLE(gnome,
AC_HELP_STRING([--enable-gnome], [enable build of bgnome-console GUI @<:@default=no@:>@]),
support_readline=no
AC_DEFINE(HAVE_CONIO, 1, [Set if Bacula conio support enabled])
else
- echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " "],
+ echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " "
fi
fi
]
)
+ AC_MSG_RESULT([$support_tls])
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])
else
support_tls="no"
support_crypto="no"
- OPENSSL_LIBS=""
- OPENSSL_INC=""
+ AC_MSG_RESULT([$support_tls])
fi
-AC_MSG_RESULT([$support_tls])
-if test "$support_tls" = "no"; then
- OPENSSL_LIBS=""
- OPENSSL_INC=""
-fi
-if test "$support_crypto" = "no"; then
+if test "$support_tls" = "no" -o "$support_crypto" = "no"; then
OPENSSL_LIBS=""
OPENSSL_INC=""
-fi
+fi
AC_SUBST(OPENSSL_LIBS)
AC_SUBST(OPENSSL_INC)
AC_CHECK_HEADER(sys/statvfs.h, [ AC_DEFINE(HAVE_SYS_STATVFS_H,1,[Defines if your system have the sys/statvfs.h header file])] , )
AC_LANG_PUSH(C++)
-AC_CHECK_HEADERS([cxxabi.h execinfo.h], [ AC_DEFINE(HAVE_BACKTRACE,1,[Defines if your system have the cxxabi.h and execinfo.h header files for backtrace()])] , )
+AC_CHECK_FUNCS(backtrace)
AC_LANG_POP(C++)
dnl --------------------------------------------------------------------------
scripts/bacula.desktop.gnome2.consolehelper \
scripts/bacula.desktop.gnome1.xsu \
scripts/bacula.desktop.gnome2.xsu \
- scripts/bgnome-console.console_apps \
scripts/mtx-changer \
scripts/disk-changer \
scripts/dvd-handler \
updatedb/update_mysql_tables_11_to_12 \
updatedb/update_sqlite3_tables_11_to_12 \
updatedb/update_postgresql_tables_11_to_12 \
+ updatedb/update_mysql_tables_12_to_14 \
+ updatedb/update_sqlite3_tables_12_to_14 \
+ updatedb/update_postgresql_tables_12_to_14 \
examples/nagios/check_bacula/Makefile \
$PFILES ],
[ ]
chmod 755 $c/sqlite
chmod 755 $c/mysql
+chmod 755 $c/install-default-backend
+
chmod 755 src/win32/build-depkgs-mingw32
if test "x$ac_cv_sys_largefile_CFLAGS" != "xno" ; then