X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fautoconf%2Fconfigure.in;h=6a0494752d6930701e30146664226b901ede5208;hb=5d6096f1f4b5fb7642a8121d6113d4ca81ed8941;hp=0fb1dda81d63b77a579a232f060af2b48b3b4e26;hpb=0ff10bcd72d63c79d458b66a74e4f707a25c7a39;p=bacula%2Fbacula diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 0fb1dda81d..6a0494752d 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -2,6 +2,8 @@ dnl dnl dnl Process this file with autoconf to produce a configure script. dnl +dnl require a recent autoconf +AC_PREREQ(2.61) AC_INIT(src/version.h) BUILD_DIR=`pwd` cd .. @@ -10,7 +12,7 @@ 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) +AC_CONFIG_HEADERS(src/config.h:autoconf/config.h.in) dnl minimal Win32 stuff for "make clean" WIN32BUILDDIR=${BUILD_DIR}/src/win32 @@ -20,10 +22,6 @@ AC_SUBST(WIN32BUILDDIR) AC_SUBST(WIN32MAINDIR) AC_SUBST(WIN32TOPDIR) -dnl require a recent autoconf -AC_PREREQ(2.61) - - dnl search for true and false programs. AC_PATH_PROGS(TRUEPRG, true, :) AC_PATH_PROGS(FALSEPRG, false, :) @@ -43,8 +41,47 @@ AC_SUBST(DATE)dnl AC_SUBST(LSMDATE)dnl AC_SUBST(BACULA)dnl AC_SUBST(post_host)dnl + +dnl src/lib +LIBBAC_LT_CURRENT=`sed -n -e 's/^.*LIBBAC_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBAC_LT_REVISION=`sed -n -e 's/^.*LIBBAC_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBAC_LT_AGE=`sed -n -e 's/^.*LIBBAC_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACCFG_LT_CURRENT=`sed -n -e 's/^.*LIBBACCFG_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACCFG_LT_REVISION=`sed -n -e 's/^.*LIBBACCFG_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACCFG_LT_AGE=`sed -n -e 's/^.*LIBBACCFG_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACPY_LT_CURRENT=`sed -n -e 's/^.*LIBBACPY_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACPY_LT_REVISION=`sed -n -e 's/^.*LIBBACPY_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACPY_LT_AGE=`sed -n -e 's/^.*LIBBACPY_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` + +AC_SUBST(LIBBAC_LT_CURRENT)dnl +AC_SUBST(LIBBAC_LT_REVISION)dnl +AC_SUBST(LIBBAC_LT_AGE)dnl +AC_SUBST(LIBBACCFG_LT_CURRENT)dnl +AC_SUBST(LIBBACCFG_LT_REVISION)dnl +AC_SUBST(LIBBACCFG_LT_AGE)dnl +AC_SUBST(LIBBACPY_LT_CURRENT)dnl +AC_SUBST(LIBBACPY_LT_REVISION)dnl +AC_SUBST(LIBBACPY_LT_AGE)dnl + +dnl src/cats +LIBBACSQL_LT_CURRENT=`sed -n -e 's/^.*LIBBACSQL_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACSQL_LT_REVISION=`sed -n -e 's/^.*LIBBACSQL_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACSQL_LT_AGE=`sed -n -e 's/^.*LIBBACSQL_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` +AC_SUBST(LIBBACSQL_LT_CURRENT)dnl +AC_SUBST(LIBBACSQL_LT_REVISION)dnl +AC_SUBST(LIBBACSQL_LT_AGE)dnl + +dnl src/findlib +LIBBACFIND_LT_CURRENT=`sed -n -e 's/^.*LIBBACFIND_LT_CURRENT *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACFIND_LT_REVISION=`sed -n -e 's/^.*LIBBACFIND_LT_REVISION *\(.*\)$/\1/p' ${srcdir}/src/version.h` +LIBBACFIND_LT_AGE=`sed -n -e 's/^.*LIBBACFIND_LT_AGE *\(.*\)$/\1/p' ${srcdir}/src/version.h` +AC_SUBST(LIBBACFIND_LT_CURRENT)dnl +AC_SUBST(LIBBACFIND_LT_REVISION)dnl +AC_SUBST(LIBBACFIND_LT_AGE)dnl + echo "configuring for ${BACULA} $VERSION ($DATE)" + dnl ------------------------------------------------------- dnl Check for compiler. dnl ------------------------------------------------------ @@ -92,7 +129,6 @@ 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(QMAKE, qmake, none) -AC_PATH_PROG(QMAKEQT4, qmake-qt4, none) AC_PATH_PROG(GMAKE, gmake, none) 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 @@ -781,45 +817,33 @@ if test x$support_ipv6 = xyes; then AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support]) fi +TERM_LIB="" +AC_CHECK_HEADER(curses.h, + [ AC_CHECK_LIB(ncurses, tgetent, + [ TERM_LIB="-lncurses" ], + [ AC_CHECK_LIB(termcap, tgetent, [ TERM_LIB="-ltermcap" ]) + ]) + ], + [ AC_CHECK_HEADERS(curses.h) + AC_CHECK_HEADER(term.h, + [ AC_CHECK_LIB(curses, tgetent, + [ TERM_LIB="-lcurses" ] ) + ]) + ]) + + got_conio="no" if test x$support_conio = xyes; then - AC_CHECK_HEADER(termcap.h, - [ AC_CHECK_LIB(termcap, tgetent, - [ CONS_LIBS="-ltermcap" - CONS_OBJ="conio.o" - CONS_SRC="conio.c" - got_conio="yes" - support_readline=no - AC_DEFINE(HAVE_CONIO, 1, [Set if Bacula conio support enabled]) - ], - [ AC_CHECK_LIB(ncurses, tgetent, - [ CONS_LIBS="-lncurses" + if test x$TERM_LIB != x; then + CONS_LIBS=$TERM_LIB CONS_OBJ="conio.o" CONS_SRC="conio.c" got_conio="yes" support_readline=no AC_DEFINE(HAVE_CONIO, 1, [Set if Bacula conio support enabled]) - ]) - ]) - ], - [ - AC_CHECK_HEADERS(curses.h) - AC_CHECK_HEADER(term.h, - [ AC_CHECK_LIB(curses, tgetent, - [ CONS_LIBS="-lcurses" - CONS_OBJ="conio.o" - CONS_SRC="conio.c" - got_conio="yes" - 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 -#endif -]) - ]) + else + echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " "], + fi fi @@ -835,6 +859,9 @@ AC_ARG_ENABLE(readline, fi ] ) +if test x$TERM_LIB = x ; then + support_readline=no +fi got_readline="no" READLINE_SRC= @@ -861,7 +888,7 @@ if test x$support_readline = xyes; then AC_CHECK_HEADER(${with_readline}/readline.h, [ AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support]) - CONS_LIBS="-lreadline -lhistory -ltermcap" + CONS_LIBS="-lreadline -lhistory $TERM_LIB" got_readline="yes" ], [ echo " " @@ -878,7 +905,7 @@ if test x$support_readline = xyes; then AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support]) got_readline="yes" CONS_INC="-I/usr/include/readline" - CONS_LIBS="-lreadline -ltermcap" + CONS_LIBS="-lreadline $TERM_LIB" ], [ dnl Did not find standard library, so try Bacula's default AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h, @@ -886,7 +913,7 @@ if test x$support_readline = xyes; then AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support]) got_readline="yes" CONS_INC="-I${TOP_DIR}/depkgs/readline" - CONS_LIBS="-lreadline -lhistory -ltermcap" + CONS_LIBS="-lreadline -lhistory $TERM_LIB" CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline" PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline" ], [ @@ -1119,6 +1146,7 @@ if test "x$with_openssl_directory" != "xno"; then support_crypto="yes" ], [ support_tls="no" + support_crypto="no" ] ) @@ -1177,6 +1205,12 @@ if test "$support_tls" = "no"; then OPENSSL_LIBS="" OPENSSL_INC="" fi +if test "$support_crypto" = "no"; then + OPENSSL_LIBS="" + OPENSSL_INC="" +else + AC_CHECK_LIB(ssl, EVP_PKEY_encrypt_old, AC_DEFINE(HAVE_OPENSSLv1, 1, [Set if have OpenSSL version 1.x])) +fi AC_MSG_RESULT([$support_tls]) AC_SUBST(OPENSSL_LIBS) @@ -1665,9 +1699,9 @@ AC_SUBST(fd_group) dnl dnl allow setting default executable permissions dnl -SBINPERM=0754 +SBINPERM=0750 AC_ARG_WITH(sbin-perm, - AC_HELP_STRING([--with-sbin-perm=MODE], [specify permissions for sbin binaries @<:@default=0754@:>@]), + AC_HELP_STRING([--with-sbin-perm=MODE], [specify permissions for sbin binaries @<:@default=0750@:>@]), [ if test "x$withval" != "x" ; then SBINPERM=$withval @@ -1748,6 +1782,7 @@ if test x$DB_TYPE = xdbi; then if test $DB_PROG = sqlite3; then A=`test -f $SQL_LIB && nm $DB_PROG_LIB | grep pthread_mutex_lock` pkg=$? + AC_CHECK_LIB(sqlite3, sqlite3_threadsafe, AC_DEFINE(HAVE_SQLITE3_THREADSAFE, 1, [Set if have sqlite3_threadsafe])) fi if test $pkg = 0; then @@ -1897,7 +1932,7 @@ AC_CACHE_CHECK(for ioctl_req_t, ba_cv_header_ioctl_req_t, ], [ ba_cv_header_ioctl_req_t=yes ], [ - ba_cv_header_ioct_req_t_t=no + ba_cv_header_ioctl_req_t=no ] ) ] @@ -2837,7 +2872,6 @@ mandrake) platforms/mandrake/bacula-fd \ platforms/mandrake/bacula-sd \ platforms/mandrake/bacula-dir \ - platforms/mandrake/bacula.spec \ " ;; gentoo) @@ -2874,7 +2908,7 @@ solaris) if test x$DISTVER = x5.6 ; then AC_DEFINE(HAVE_OLD_SOCKOPT) fi - LIBS="$LIBS -lresolv" + LIBS="$LIBS -lresolv -lrt" ;; suse) DISTVER=`cat /etc/SuSE-release |grep VERSION|\ @@ -2886,8 +2920,7 @@ suse) platforms/suse/bacula-fd \ platforms/suse/bacula-sd \ platforms/suse/bacula-dir \ - platforms/suse/bacula \ - platforms/suse/bacula.spec" + platforms/suse/bacula" ;; suse5) DISTNAME=suse @@ -2998,6 +3031,7 @@ AC_OUTPUT([autoconf/Make.common \ src/filed/Makefile \ src/filed/bacula-fd.conf \ src/cats/Makefile \ + src/cats/make_catalog_backup.pl \ src/cats/make_catalog_backup \ src/cats/delete_catalog_backup \ src/cats/create_postgresql_database \ @@ -3026,12 +3060,6 @@ AC_OUTPUT([autoconf/Make.common \ src/cats/drop_ingres_database \ src/cats/sqlite \ src/cats/mysql \ - src/cats/create_bdb_database \ - src/cats/update_bdb_tables \ - src/cats/make_bdb_tables \ - src/cats/grant_bdb_privileges \ - src/cats/drop_bdb_tables \ - src/cats/drop_bdb_database \ src/cats/create_bacula_database \ src/cats/update_bacula_tables \ src/cats/grant_bacula_privileges \ @@ -3057,20 +3085,16 @@ AC_OUTPUT([autoconf/Make.common \ ) if test "${support_bat}" = "yes" ; then - if test "x$QMAKE" = "xnone" && test "x$QMAKEQT4" = "xnone"; then - AC_MSG_ERROR([Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation]) + if test "x$QMAKE" = "xnone"; then + AC_MSG_ERROR([Could not find qmake $PATH. Check your Qt installation]) fi QMAKEBIN="qmake" - - if test "x$QMAKEQT4" != "xnone"; then - QMAKEBIN=qmake-qt4 - fi - cd src/qt-console echo "Creating bat Makefile" touch bat chmod 755 bat + rm -f Makefile $QMAKEBIN ${MAKE:-make} clean cd ${BUILD_DIR} @@ -3091,7 +3115,7 @@ cd ${BUILD_DIR} cd scripts chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer -chmod 755 dvd-handler dvd-simulator breload make_catalog_backup.pl +chmod 755 dvd-handler dvd-simulator chmod 755 bconsole gconsole mtx-changer devel_bacula logrotate cd .. @@ -3120,7 +3144,7 @@ chmod 755 $c/create_ingres_database $c/update_ingres_tables $c/make_ingres_tabl chmod 755 $c/grant_ingres_privileges $c/drop_ingres_tables $c/drop_ingres_database -chmod 755 $c/make_catalog_backup $c/delete_catalog_backup +chmod 755 $c/make_catalog_backup $c/delete_catalog_backup $c/make_catalog_backup.pl chmod 755 $c/sqlite chmod 755 $c/mysql