]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/autoconf/configure.in
Change key directory to /etc/bacula/pubkeys
[bacula/bacula] / bacula / autoconf / configure.in
index 5aea1cf66580c6d9f4bcf04e5ede024ccc8e9684..b61da9e8b90f6a9b51e9c9df59637f2690864739 100644 (file)
@@ -8,6 +8,7 @@ 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)
 
@@ -40,8 +41,11 @@ 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
@@ -64,11 +68,12 @@ 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(DF, df, df)
+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_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
@@ -192,6 +197,7 @@ support_conio=yes
 support_gnome=no
 support_wx_console=no
 support_tls=no
+support_crypto=no
 gnome_version=
 wx_version=
 support_static_tools=no
@@ -603,25 +609,41 @@ AC_ARG_WITH(python,
   PYTHON_LIBS=
   if test "$withval" != "no"; then
      if test "$withval" = "yes"; then
-       for python_root in /usr /usr/local; do
+       for python_root in /usr /usr/local /usr/sfw; do
          if test -f $python_root/include/python2.2/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.2
-            PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.2"
+            if test -d $python_root/lib64/python2.2/config; then
+               PYTHON_LIBS="-L$python_root/lib64/python2.2/config -lpython2.2"
+            else
+               PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.2"
+            fi
             break
          elif test -f $python_root/include/python2.3/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.3
-            PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.3"
+            if test -d $python_root/lib64/python2.3/config; then
+               PYTHON_LIBS="-L$python_root/lib64/python2.3/config -lpython2.3"
+            else
+               PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.3"
+            fi
             break
          elif test -f $python_root/include/python2.4/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.4
-            PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.4"
+            if test -d $python_root/lib64/python2.4/config; then
+               PYTHON_LIBS="-L$python_root/lib64/python2.4/config -lpython2.4"
+            else
+               PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.4"
+            fi
             break
          fi
        done
        if test x$PYTHON_INCDIR = x; then
          if test -f $prefix/include/Python.h; then
             PYTHON_INCDIR=-I$prefix/include
-            PYTHON_LIBS="-L$prefix/lib/config -lpython"
+            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)
@@ -633,10 +655,18 @@ AC_ARG_WITH(python,
           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"
+          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
-          PYTHON_LIBS="-L$withval/lib/python/config -lpython"
+          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)
@@ -750,19 +780,34 @@ if test "x$with_openssl_directory" != "x"; then
 
        AC_TRY_LINK([ #include <openssl/ssl.h> ],
                [ CRYPTO_set_id_callback(NULL); ],
-               [ support_tls="yes" ],
+               [
+                       support_tls="yes"
+                       support_crypto="yes"
+               ],
                [ support_tls="no" ]
        )
 
+       AC_TRY_LINK([ #include <openssl/evp.h> ],
+               [ EVP_sha512(); ],
+               [ ac_cv_openssl_sha2="yes" ],
+               [ ac_cv_openssl_sha2="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])
+               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
 else
        support_tls="no"
+       support_crypto="no"
        OPENSSL_LIBS=""
        OPENSSL_INC=""
 fi
@@ -1239,6 +1284,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
 
@@ -1271,6 +1328,8 @@ AC_TRY_CPP([#include <sys/mount.h>
 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# --------------------------------------------------------------------------
@@ -1554,8 +1613,6 @@ 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"])
 
 
@@ -1569,10 +1626,15 @@ if test x$FDLIBS = x-lz; then
   have_zlib=yes
 fi
 
+#
+# Check for ACL libraries
+#
 have_acl=no
 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(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)
@@ -1581,11 +1643,11 @@ 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)
@@ -1593,10 +1655,15 @@ 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)
@@ -1633,6 +1700,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`
@@ -1692,8 +1762,8 @@ 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"
@@ -1770,7 +1840,6 @@ redhat)
            platforms/redhat/bacula-dir \
            platforms/redhat/bacula.spec \
            "
-       hostname=`hostname -s`
   ;;
 mandrake)
        DISTVER=`cat /etc/mandrake-release | grep release |\
@@ -1887,6 +1956,7 @@ fi
 
 AC_OUTPUT([autoconf/Make.common \
           Makefile \
+          manpages/Makefile \
           scripts/startmysql \
           scripts/stopmysql \
           scripts/btraceback \
@@ -1895,6 +1965,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 \
@@ -1906,11 +1979,14 @@ AC_OUTPUT([autoconf/Make.common \
           scripts/bacula.desktop.gnome2.xsu \
           scripts/gnome-console.console_apps \
           scripts/mtx-changer \
-          scripts/dvd-writepart \
-          scripts/dvd-freespace \
+          scripts/disk-changer \
+          scripts/dvd-handler \
           scripts/bacula-tray-monitor.desktop \
           scripts/logwatch/Makefile \
           scripts/logwatch/logfile.bacula.conf \
+          scripts/wxconsole.console_apps \
+          scripts/wxconsole.desktop.consolehelper \
+          scripts/wxconsole.desktop.xsu \
           src/Makefile \
           src/host.h \
           src/console/Makefile \
@@ -1928,7 +2004,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 \
@@ -1971,13 +2046,8 @@ AC_OUTPUT([autoconf/Make.common \
           src/cats/drop_bacula_tables \
           src/cats/drop_bacula_database \
           src/findlib/Makefile \
+          src/pygtk-console/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 \
           po/Makefile.in \
           $PFILES ],  
          [(echo "Doing make of dependencies"; ${MAKE:-make} depend;) ]
@@ -1985,7 +2055,7 @@ AC_OUTPUT([autoconf/Make.common \
 
 cd scripts
 chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer
-chmod 755 dvd-writepart dvd-freespace
+chmod 755 dvd-handler
 chmod 755 bconsole gconsole mtx-changer devel_bacula logrotate
 cd ..
 
@@ -2003,6 +2073,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
 
@@ -2102,6 +2175,7 @@ Configuration on `date`:
   readline support:          ${got_readline} ${PRTREADLINE_SRC}
   TCP Wrappers support:       ${TCPW_MSG} ${WRAPLIBS}
   TLS support:               ${support_tls}
+  Encryption support:        ${support_crypto} 
   ZLIB support:              ${have_zlib}
   enable-smartalloc:         ${support_smartalloc} 
   enable-gnome:              ${support_gnome} ${gnome_version}