X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=b3b697b29afbe82d0fe5c90510805b57a61450cf;hb=eccf96b1068ae4c357c5f1e7095839a5e033acc4;hp=18bf8e10c38f7de4381e09d461fe2283ed835899;hpb=33f4bd3fa6e5f9ea94bd4eac8c82baa1011ea2cc;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index 18bf8e10c3..b3b697b29a 100755 --- a/bacula/configure +++ b/bacula/configure @@ -801,6 +801,9 @@ host_alias target_alias BUILD_DIR TOP_DIR +WIN32BUILDDIR +WIN32MAINDIR +WIN32TOPDIR TRUEPRG FALSEPRG VERSION @@ -843,6 +846,7 @@ DVDRWFORMAT PKGCONFIG QMAKE QMAKEQT4 +GMAKE WXCONFIG WXFLAGS CDRECORD @@ -981,7 +985,11 @@ OPENSSL_LIBS OPENSSL_INC working_dir archivedir +basename +hostname scriptdir +bsrdir +logdir plugindir dump_email job_email @@ -1034,7 +1042,6 @@ WCFLAGS WLDFLAGS WRAPLIBS OBJLIST -hostname TAPEDRIVE PSCMD WIN32 @@ -1650,6 +1657,7 @@ Optional Features: --enable-tray-monitor enable build of Gnome tray monitor (compatible with KDE [default=no] --enable-smartalloc enable smartalloc debugging support [default=no] + --enable-lockmgr enable lock manager support [default=no] --enable-static-tools enable static tape tools [default=no] --enable-static-fd enable static File daemon [default=no] --enable-static-sd enable static Storage daemon [default=no] @@ -1689,7 +1697,11 @@ Optional Packages: --with-openssl[=DIR] Include OpenSSL support. DIR is the OpenSSL base --with-working-dir=PATH specify path of Bacula working directory --with-archivedir=PATH specify path of SD archive directory + --with-basename=RESNAME specify base resource name for daemons + --with-hostname=RESNAME specify host name for daemons --with-scriptdir=PATH specify path of Bacula scripts directory + --with-bsrdir=PATH specify path of Bacula bsrs directory + --with-logdir=PATH specify path of Bacula logs directory --with-plugindir=PATH specify path of Bacula plugins directory --with-dump-email=EMAIL dump email address --with-job-email=EMAIL job output email address @@ -2224,6 +2236,13 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ac_config_headers="$ac_config_headers src/config.h:autoconf/config.h.in" +WIN32BUILDDIR=${BUILD_DIR}/src/win32 +WIN32MAINDIR=${BUILD_DIR} +WIN32TOPDIR=${TOP_DIR} + + + + @@ -2325,7 +2344,7 @@ post_host= if test "x$BACULA" != x; then post_host=`echo -${BACULA} | tr 'A-Z ' 'a-z-'` fi -BACULA=${BACULA-Bacula} +BACULA=${BACULA:-Bacula} VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` DATE=`sed -n -e 's/^.* \t*BDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` LSMDATE=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` @@ -5085,6 +5104,47 @@ echo "${ECHO_T}no" >&6; } fi +# Extract the first word of "gmake", so it can be a program name with args. +set dummy gmake; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_GMAKE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GMAKE in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMAKE="$GMAKE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMAKE="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_GMAKE" && ac_cv_path_GMAKE="none" + ;; +esac +fi +GMAKE=$ac_cv_path_GMAKE +if test -n "$GMAKE"; then + { echo "$as_me:$LINENO: result: $GMAKE" >&5 +echo "${ECHO_T}$GMAKE" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$WXCONFIG" = x; then WXCONFIG=wx-config @@ -5935,13 +5995,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5938: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5998: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5941: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6001: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5944: output\"" >&5) + (eval echo "\"\$as_me:6004: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7162,7 +7222,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7165 "configure"' > conftest.$ac_ext + echo '#line 7225 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9377,11 +9437,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9380: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9440: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9384: \$? = $ac_status" >&5 + echo "$as_me:9444: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9716,11 +9776,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9719: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9779: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9723: \$? = $ac_status" >&5 + echo "$as_me:9783: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9821,11 +9881,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9824: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9884: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9828: \$? = $ac_status" >&5 + echo "$as_me:9888: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9876,11 +9936,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9879: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9939: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9883: \$? = $ac_status" >&5 + echo "$as_me:9943: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12632,7 +12692,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12635 "configure" +#line 12695 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12728,7 +12788,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12731 "configure" +#line 12791 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14740,11 +14800,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14743: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14803: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14747: \$? = $ac_status" >&5 + echo "$as_me:14807: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14839,11 +14899,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14842: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14902: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14846: \$? = $ac_status" >&5 + echo "$as_me:14906: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14891,11 +14951,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14894: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14954: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14898: \$? = $ac_status" >&5 + echo "$as_me:14958: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16348,6 +16408,9 @@ then elif test -f /etc/slackware-version then DISTNAME=slackware +elif test x$host_vendor = xapple +then + DISTNAME=osx elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin then DISTNAME=darwin @@ -18262,11 +18325,6 @@ _ACEOF -if test x${prefix} = xNONE ; then - if test `eval echo ${datarootdir}` = NONE/share ; then - datarootdir=/usr/share - fi -fi if test x${prefix} = xNONE ; then if test `eval echo ${sysconfdir}` = NONE/etc ; then @@ -18281,6 +18339,9 @@ if test x${prefix} = xNONE ; then includedir=/usr/include fi + if test `eval echo ${datarootdir}` = NONE/share ; then + datarootdir=/usr/share + fi prefix= fi @@ -18290,6 +18351,8 @@ fi sysconfdir=`eval echo ${sysconfdir}` datarootdir=`eval echo ${datarootdir}` +docdir=`eval echo ${docdir}` +htmldir=`eval echo ${htmldir}` libdir=`eval echo ${libdir}` includedir=`eval echo ${includedir}` localedir=`eval echo ${datarootdir}/locale` @@ -18311,6 +18374,15 @@ if test x$mandir = x'${prefix}/man' ; then mandir=/usr/share/man fi +if test x$htmldir = x${docdir} ; then + htmldir=`eval echo ${docdir}bacula/html` +fi + +if test x$docdir = x'/usr/share/doc/' ; then + docdir=`eval echo ${docdir}bacula` +fi + + for ac_prog in msgfmt do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -23956,6 +24028,7 @@ build_dird=yes build_stored=yes cats= db_type=Internal +support_lockmgr=no DB_TYPE=bdb @@ -24117,7 +24190,7 @@ if test x$support_wx_console = xyes; then - WX_DIR=src/wx-console + WX_DIR="src/wx-console" else echo " " echo "wx-config program not found. bwx-console disabled." @@ -24180,10 +24253,37 @@ _ACEOF fi +# Check whether --enable-lockmgr was given. +if test "${enable_lockmgr+set}" = set; then + enableval=$enable_lockmgr; + if test x$enableval = xyes; then + support_lockmgr=yes + fi + + +fi + + +if test x$support_lockmgr = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define _USE_LOCKMGR 1 +_ACEOF + +fi + + # Check whether --enable-static-tools was given. if test "${enable_static_tools+set}" = set; then enableval=$enable_static_tools; if test x$enableval = xyes; then + if test x$use_libtool = xyes; then + { { echo "$as_me:$LINENO: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&5 +echo "$as_me: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&2;} + { (exit 1); exit 1; }; } + fi support_static_tools=yes fi @@ -24201,6 +24301,13 @@ fi if test "${enable_static_fd+set}" = set; then enableval=$enable_static_fd; if test x$enableval = xyes; then + if test x$use_libtool = xyes; then + { { echo "$as_me:$LINENO: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&5 +echo "$as_me: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&2;} + { (exit 1); exit 1; }; } + fi support_static_fd=yes fi @@ -24218,6 +24325,13 @@ fi if test "${enable_static_sd+set}" = set; then enableval=$enable_static_sd; if test x$enableval = xyes; then + if test x$use_libtool = xyes; then + { { echo "$as_me:$LINENO: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&5 +echo "$as_me: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&2;} + { (exit 1); exit 1; }; } + fi support_static_sd=yes fi @@ -24235,6 +24349,13 @@ fi if test "${enable_static_dir+set}" = set; then enableval=$enable_static_dir; if test x$enableval = xyes; then + if test x$use_libtool = xyes; then + { { echo "$as_me:$LINENO: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&5 +echo "$as_me: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&2;} + { (exit 1); exit 1; }; } + fi support_static_dir=yes fi @@ -24252,6 +24373,13 @@ fi if test "${enable_static_cons+set}" = set; then enableval=$enable_static_cons; if test x$enableval = xyes; then + if test x$use_libtool = xyes; then + { { echo "$as_me:$LINENO: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&5 +echo "$as_me: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&2;} + { (exit 1); exit 1; }; } + fi support_static_cons=yes fi @@ -26118,38 +26246,46 @@ if test "${with_python+set}" = set; then PYTHON_LIBS= if test "$withval" != "no"; then if test "$withval" = "yes"; then - 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}" + if test -e /usr/bin/python-config ; then + PYTHON_INCDIR=`/usr/bin/python-config --includes` + PYTHON_LIBS=`/usr/bin/python-config --libs` + else + for python_root in /usr /usr/local /usr/sfw; do + for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; 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 - break - fi + done 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" + 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 - PYTHON_LIBS="-L$prefix/lib/config -lpython" - fi - else - { echo "$as_me:$LINENO: result: no" >&5 + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Unable to find Python.h in standard locations" >&5 + { { echo "$as_me:$LINENO: error: Unable to find Python.h in standard locations" >&5 echo "$as_me: error: Unable to find Python.h in standard locations" >&2;} { (exit 1); exit 1; }; } + fi fi fi else - if test -f $withval/Python.h; then + if test -e $withval/bin/python-config ; then + PYTHON_INCDIR=`$withval/bin/python-config --includes` + PYTHON_LIBS=`$withval/bin/python-config --libs` + elif test -f $withval/Python.h; then PYTHON_INCDIR=-I$withval PYTHON_LIBS="-L$withval/config -lpython" elif test -f $withval/include/Python.h; then @@ -27125,6 +27261,11 @@ else OPENSSL_INC="" fi +if test "$support_tls" = "no"; then + OPENSSL_LIBS="" + OPENSSL_INC="" +fi + { echo "$as_me:$LINENO: result: $support_tls" >&5 echo "${ECHO_T}$support_tls" >&6; } @@ -27229,7 +27370,7 @@ fi -archive_dir=/tmp +archivedir=/tmp # Check whether --with-archivedir was given. if test "${with_archivedir+set}" = set; then @@ -27244,6 +27385,40 @@ fi +basename=`hostname` + +# Check whether --with-basename was given. +if test "${with_basename+set}" = set; then + withval=$with_basename; + if test "x$withval" != "xno" ; then + basename=$withval + fi + + +fi + + + + +hostname=`uname -n | cut -d '.' -f 1` +if test x${hostname} = x ; then + hostname="localhost" +fi + +# Check whether --with-hostname was given. +if test "${with_hostname+set}" = set; then + withval=$with_hostname; + if test "x$withval" != "xno" ; then + hostname=$withval + fi + + +fi + + + + + scriptdir=`eval echo ${sysconfdir}` # Check whether --with-scriptdir was given. @@ -27259,10 +27434,42 @@ fi + +bsrdir=/tmp + +# Check whether --with-bsrdir was given. +if test "${with_bsrdir+set}" = set; then + withval=$with_bsrdir; + if test "x$withval" != "xno" ; then + bsrdir=$withval + fi + + +fi + + + + +logdir=/tmp + +# Check whether --with-logdir was given. +if test "${with_logdir+set}" = set; then + withval=$with_logdir; + if test "x$withval" != "xno" ; then + logdir=$withval + fi + + +fi + + + + + # ------------------------------------------ # Where to place plugindir (plugin files) # ------------------------------------------ -plugindir=`eval echo ${sysconfdir}` +plugindir=`eval echo ${libdir}` # Check whether --with-plugindir was given. if test "${with_plugindir+set}" = set; then @@ -28595,7 +28802,11 @@ echo "${ECHO_T}no" >&6; } echo "$as_me: error: Unable to find mysql in standard locations" >&2;} { (exit 1); exit 1; }; } fi - DB_PROG_LIB=$SQL_LIBDIR/libmysqlclient_r.a + if test -f $SQL_LIBDIR/libmysqlclient_r.so; then + DB_PROG_LIB=$SQL_LIBDIR/libmysqlclient_r.so + else + DB_PROG_LIB=$SQL_LIBDIR/libmysqlclient_r.a + fi ;; "postgresql") db_prog="postgresql" @@ -28635,7 +28846,11 @@ echo "${ECHO_T}no" >&6; } echo "$as_me: error: Unable to find psql in standard locations" >&2;} { (exit 1); exit 1; }; } fi - DB_PROG_LIB=$SQL_LIBDIR/libpq.a + if test -f $SQL_LIBDIR/libpq.so; then + DB_PROG_LIB=$SQL_LIBDIR/libpq.so + else + DB_PROG_LIB=$SQL_LIBDIR/libpq.a + fi ;; "sqlite") db_prog="sqlite" @@ -28667,7 +28882,11 @@ echo "${ECHO_T}no" >&6; } echo "$as_me: error: Unable to find sqlite in standard locations" >&2;} { (exit 1); exit 1; }; } fi - DB_PROG_LIB=$SQL_LIBDIR/libsqlite.a + if test -f $SQL_LIBDIR/libsqlite.so; then + DB_PROG_LIB=$SQL_LIBDIR/libsqlite.so + else + DB_PROG_LIB=$SQL_LIBDIR/libsqlite.a + fi ;; "sqlite3") db_prog="sqlite3" @@ -28699,7 +28918,11 @@ echo "${ECHO_T}no" >&6; } echo "$as_me: error: Unable to find sqlite in standard locations" >&2;} { (exit 1); exit 1; }; } fi - DB_PROG_LIB=$SQL_LIBDIR/libsqlite3.a + if test -f $SQL_LIBDIR/libsqlite3.so; then + DB_PROG_LIB=$SQL_LIBDIR/libsqlite3.so + else + DB_PROG_LIB=$SQL_LIBDIR/libsqlite3.a + fi ;; *) { echo "$as_me:$LINENO: result: no" >&5 @@ -30480,7 +30703,6 @@ fi - for ac_header in \ @@ -30509,7 +30731,6 @@ for ac_header in \ sys/time.h \ sys/types.h \ arpa/nameser.h \ - resolv.h \ mtio.h \ sys/mtio.h \ sys/tape.h \ @@ -32257,75 +32478,6 @@ test $ba_cv_header_socklen_t = yes && cat >>confdefs.h <<\_ACEOF _ACEOF -{ echo "$as_me:$LINENO: checking for bigendian" >&5 -echo $ECHO_N "checking for bigendian... $ECHO_C" >&6; } -if test "${ba_cv_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test "$cross_compiling" = yes; then - - ba_cv_bigendian=no - - -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - main(){long a=1L; char *p=(char *)&a; exit(*p);} - -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - ba_cv_bigendian=yes - -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) - - ba_cv_bigendian=no - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - - -fi -{ echo "$as_me:$LINENO: result: $ba_cv_bigendian" >&5 -echo "${ECHO_T}$ba_cv_bigendian" >&6; } -test $ba_cv_bigendian = yes && cat >>confdefs.h <<\_ACEOF -#define HAVE_BIGENDIAN 1 -_ACEOF - - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -33407,9 +33559,10 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for ino_t" >&5 -echo $ECHO_N "checking for ino_t... $ECHO_C" >&6; } -if test "${ac_cv_type_ino_t+set}" = set; then + + { echo "$as_me:$LINENO: checking for intptr_t" >&5 +echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6; } +if test "${ac_cv_type_intptr_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33419,7 +33572,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -typedef ino_t ac__type_new_; +typedef intptr_t ac__type_new_; int main () { @@ -33448,31 +33601,83 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_ino_t=yes + ac_cv_type_intptr_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_ino_t=no + ac_cv_type_intptr_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5 -echo "${ECHO_T}$ac_cv_type_ino_t" >&6; } -if test $ac_cv_type_ino_t = yes; then - : +{ echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5 +echo "${ECHO_T}$ac_cv_type_intptr_t" >&6; } +if test $ac_cv_type_intptr_t = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_INTPTR_T 1 +_ACEOF + else + for ac_type in 'int' 'long int' 'long long int'; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then cat >>confdefs.h <<_ACEOF -#define ino_t unsigned long +#define intptr_t $ac_type _ACEOF + ac_type= +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -{ echo "$as_me:$LINENO: checking for dev_t" >&5 -echo $ECHO_N "checking for dev_t... $ECHO_C" >&6; } -if test "${ac_cv_type_dev_t+set}" = set; then +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test -z "$ac_type" && break + done +fi + + + + { echo "$as_me:$LINENO: checking for uintptr_t" >&5 +echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6; } +if test "${ac_cv_type_uintptr_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33482,7 +33687,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -typedef dev_t ac__type_new_; +typedef uintptr_t ac__type_new_; int main () { @@ -33511,31 +33716,83 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_dev_t=yes + ac_cv_type_uintptr_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_dev_t=no + ac_cv_type_uintptr_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5 -echo "${ECHO_T}$ac_cv_type_dev_t" >&6; } -if test $ac_cv_type_dev_t = yes; then - : +{ echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5 +echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6; } +if test $ac_cv_type_uintptr_t = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_UINTPTR_T 1 +_ACEOF + else + for ac_type in 'unsigned int' 'unsigned long int' \ + 'unsigned long long int'; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then cat >>confdefs.h <<_ACEOF -#define dev_t unsigned long +#define uintptr_t $ac_type _ACEOF + ac_type= +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -{ echo "$as_me:$LINENO: checking for daddr_t" >&5 -echo $ECHO_N "checking for daddr_t... $ECHO_C" >&6; } -if test "${ac_cv_type_daddr_t+set}" = set; then +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test -z "$ac_type" && break + done +fi + + +{ echo "$as_me:$LINENO: checking for ino_t" >&5 +echo $ECHO_N "checking for ino_t... $ECHO_C" >&6; } +if test "${ac_cv_type_ino_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33545,7 +33802,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -typedef daddr_t ac__type_new_; +typedef ino_t ac__type_new_; int main () { @@ -33574,31 +33831,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_daddr_t=yes + ac_cv_type_ino_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_daddr_t=no + ac_cv_type_ino_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_daddr_t" >&5 -echo "${ECHO_T}$ac_cv_type_daddr_t" >&6; } -if test $ac_cv_type_daddr_t = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5 +echo "${ECHO_T}$ac_cv_type_ino_t" >&6; } +if test $ac_cv_type_ino_t = yes; then : else cat >>confdefs.h <<_ACEOF -#define daddr_t long +#define ino_t unsigned long _ACEOF fi -{ echo "$as_me:$LINENO: checking for major_t" >&5 -echo $ECHO_N "checking for major_t... $ECHO_C" >&6; } -if test "${ac_cv_type_major_t+set}" = set; then +{ echo "$as_me:$LINENO: checking for dev_t" >&5 +echo $ECHO_N "checking for dev_t... $ECHO_C" >&6; } +if test "${ac_cv_type_dev_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33608,7 +33865,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -typedef major_t ac__type_new_; +typedef dev_t ac__type_new_; int main () { @@ -33637,31 +33894,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_major_t=yes + ac_cv_type_dev_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_major_t=no + ac_cv_type_dev_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_major_t" >&5 -echo "${ECHO_T}$ac_cv_type_major_t" >&6; } -if test $ac_cv_type_major_t = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5 +echo "${ECHO_T}$ac_cv_type_dev_t" >&6; } +if test $ac_cv_type_dev_t = yes; then : else cat >>confdefs.h <<_ACEOF -#define major_t int +#define dev_t unsigned long _ACEOF fi -{ echo "$as_me:$LINENO: checking for minor_t" >&5 -echo $ECHO_N "checking for minor_t... $ECHO_C" >&6; } -if test "${ac_cv_type_minor_t+set}" = set; then +{ echo "$as_me:$LINENO: checking for daddr_t" >&5 +echo $ECHO_N "checking for daddr_t... $ECHO_C" >&6; } +if test "${ac_cv_type_daddr_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33671,7 +33928,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -typedef minor_t ac__type_new_; +typedef daddr_t ac__type_new_; int main () { @@ -33700,31 +33957,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_minor_t=yes + ac_cv_type_daddr_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_minor_t=no + ac_cv_type_daddr_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_minor_t" >&5 -echo "${ECHO_T}$ac_cv_type_minor_t" >&6; } -if test $ac_cv_type_minor_t = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_daddr_t" >&5 +echo "${ECHO_T}$ac_cv_type_daddr_t" >&6; } +if test $ac_cv_type_daddr_t = yes; then : else cat >>confdefs.h <<_ACEOF -#define minor_t int +#define daddr_t long _ACEOF fi -{ echo "$as_me:$LINENO: checking for ssize_t" >&5 -echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; } -if test "${ac_cv_type_ssize_t+set}" = set; then +{ echo "$as_me:$LINENO: checking for major_t" >&5 +echo $ECHO_N "checking for major_t... $ECHO_C" >&6; } +if test "${ac_cv_type_major_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33734,7 +33991,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -typedef ssize_t ac__type_new_; +typedef major_t ac__type_new_; int main () { @@ -33763,31 +34020,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_ssize_t=yes + ac_cv_type_major_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_ssize_t=no + ac_cv_type_major_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 -echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; } -if test $ac_cv_type_ssize_t = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_major_t" >&5 +echo "${ECHO_T}$ac_cv_type_major_t" >&6; } +if test $ac_cv_type_major_t = yes; then : else cat >>confdefs.h <<_ACEOF -#define ssize_t int +#define major_t int _ACEOF fi -{ echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5 -echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; } -if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then +{ echo "$as_me:$LINENO: checking for minor_t" >&5 +echo $ECHO_N "checking for minor_t... $ECHO_C" >&6; } +if test "${ac_cv_type_minor_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33797,12 +34054,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef minor_t ac__type_new_; int main () { -static struct stat ac_aggr; -if (ac_aggr.st_blocks) -return 0; +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } @@ -33824,24 +34083,48 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_member_struct_stat_st_blocks=yes + ac_cv_type_minor_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + ac_cv_type_minor_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_minor_t" >&5 +echo "${ECHO_T}$ac_cv_type_minor_t" >&6; } +if test $ac_cv_type_minor_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF +#define minor_t int +_ACEOF + +fi + +{ echo "$as_me:$LINENO: checking for ssize_t" >&5 +echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; } +if test "${ac_cv_type_ssize_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef ssize_t ac__type_new_; int main () { -static struct stat ac_aggr; -if (sizeof ac_aggr.st_blocks) -return 0; +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } @@ -33863,45 +34146,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_member_struct_stat_st_blocks=yes + ac_cv_type_ssize_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_member_struct_stat_st_blocks=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_type_ssize_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5 -echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6; } -if test $ac_cv_member_struct_stat_st_blocks = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 +echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; } +if test $ac_cv_type_ssize_t = yes; then + : +else cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLOCKS 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ST_BLOCKS 1 +#define ssize_t int _ACEOF -else - case " $LIBOBJS " in - *" fileblocks.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext" - ;; -esac - fi - -{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5 -echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; } -if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then +{ echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5 +echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; } +if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33915,7 +34184,7 @@ int main () { static struct stat ac_aggr; -if (ac_aggr.st_rdev) +if (ac_aggr.st_blocks) return 0; ; return 0; @@ -33938,7 +34207,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_member_struct_stat_st_rdev=yes + ac_cv_member_struct_stat_st_blocks=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -33954,7 +34223,7 @@ int main () { static struct stat ac_aggr; -if (sizeof ac_aggr.st_rdev) +if (sizeof ac_aggr.st_blocks) return 0; ; return 0; @@ -33977,12 +34246,12 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_member_struct_stat_st_rdev=yes + ac_cv_member_struct_stat_st_blocks=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_member_struct_stat_st_rdev=no + ac_cv_member_struct_stat_st_blocks=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -33990,25 +34259,32 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5 -echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; } -if test $ac_cv_member_struct_stat_st_rdev = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6; } +if test $ac_cv_member_struct_stat_st_blocks = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_RDEV 1 +#define HAVE_STRUCT_STAT_ST_BLOCKS 1 _ACEOF cat >>confdefs.h <<\_ACEOF -#define HAVE_ST_RDEV 1 +#define HAVE_ST_BLOCKS 1 _ACEOF +else + case " $LIBOBJS " in + *" fileblocks.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext" + ;; +esac + fi -{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 -echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; } -if test "${ac_cv_struct_tm+set}" = set; then +{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5 +echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; } +if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -34017,15 +34293,122 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include - +$ac_includes_default int main () { -struct tm tm; - int *p = &tm.tm_sec; - return !p; +static struct stat ac_aggr; +if (ac_aggr.st_rdev) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_stat_st_rdev=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static struct stat ac_aggr; +if (sizeof ac_aggr.st_rdev) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_struct_stat_st_rdev=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_struct_stat_st_rdev=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; } +if test $ac_cv_member_struct_stat_st_rdev = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_RDEV 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ST_RDEV 1 +_ACEOF + +fi + + +{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 +echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; } +if test "${ac_cv_struct_tm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include + +int +main () +{ +struct tm tm; + int *p = &tm.tm_sec; + return !p; ; return 0; } @@ -40221,11 +40604,13 @@ _ACEOF have_zlib=yes fi -support_acl=yes +support_acl=auto # Check whether --enable-acl was given. if test "${enable_acl+set}" = set; then enableval=$enable_acl; - if test x$enableval = xno; then + if test x$enableval = xyes; then + support_acl=yes + elif test x$enableval = xno; then support_acl=no fi @@ -40235,7 +40620,7 @@ fi have_acl=no have_extended_acl=no -if test x$support_acl = xyes; then +if test x$support_acl = xyes -o x$support_acl = xauto; then if test "${ac_cv_header_sys_acl_h+set}" = set; then { echo "$as_me:$LINENO: checking for sys/acl.h" >&5 echo $ECHO_N "checking for sys/acl.h... $ECHO_C" >&6; } @@ -40453,11 +40838,11 @@ fi echo "${ECHO_T}$ac_cv_func_acl_get_file" >&6; } if test $ac_cv_func_acl_get_file = yes; then - have_acl=yes + have_acl=yes else - { echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 + { echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 echo $ECHO_N "checking for acl_get_file in -lacl... $ECHO_C" >&6; } if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -40520,12 +40905,12 @@ fi echo "${ECHO_T}$ac_cv_lib_acl_acl_get_file" >&6; } if test $ac_cv_lib_acl_acl_get_file = yes; then - have_acl=yes; - FDLIBS="-lacl $FDLIBS" + have_acl=yes; + FDLIBS="-lacl $FDLIBS" else - { echo "$as_me:$LINENO: checking for acl_get_file in -lpacl" >&5 + { echo "$as_me:$LINENO: checking for acl_get_file in -lpacl" >&5 echo $ECHO_N "checking for acl_get_file in -lpacl... $ECHO_C" >&6; } if test "${ac_cv_lib_pacl_acl_get_file+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -40588,12 +40973,12 @@ fi echo "${ECHO_T}$ac_cv_lib_pacl_acl_get_file" >&6; } if test $ac_cv_lib_pacl_acl_get_file = yes; then - have_acl=yes; - FDLIBS="-lpacl $FDLIBS" + have_acl=yes; + FDLIBS="-lpacl $FDLIBS" else - { echo "$as_me:$LINENO: checking for acltotext in -lsec" >&5 + { echo "$as_me:$LINENO: checking for acltotext in -lsec" >&5 echo $ECHO_N "checking for acltotext in -lsec... $ECHO_C" >&6; } if test "${ac_cv_lib_sec_acltotext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -40656,10 +41041,10 @@ fi echo "${ECHO_T}$ac_cv_lib_sec_acltotext" >&6; } if test $ac_cv_lib_sec_acltotext = yes; then - have_acl=yes; - FDLIBS="-lsec $FDLIBS" + have_acl=yes; + FDLIBS="-lsec $FDLIBS" - { echo "$as_me:$LINENO: checking for acl_totext in -lsec" >&5 + { echo "$as_me:$LINENO: checking for acl_totext in -lsec" >&5 echo $ECHO_N "checking for acl_totext in -lsec... $ECHO_C" >&6; } if test "${ac_cv_lib_sec_acl_totext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -40722,7 +41107,7 @@ fi echo "${ECHO_T}$ac_cv_lib_sec_acl_totext" >&6; } if test $ac_cv_lib_sec_acl_totext = yes; then - have_extended_acl=yes + have_extended_acl=yes fi @@ -40743,27 +41128,40 @@ fi fi - if test $have_acl = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_ACL 1 + + if test x$support_acl = xyes -a $have_acl != yes; then + { { echo "$as_me:$LINENO: error: acl support explicitly enabled but no supported acl implementation found, + please either load the acl libraries or rerun configure without --enable-acl" >&5 +echo "$as_me: error: acl support explicitly enabled but no supported acl implementation found, + please either load the acl libraries or rerun configure without --enable-acl" >&2;} + { (exit 1); exit 1; }; } + else + if test $have_acl = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ACL _ACEOF - fi + fi - if test $have_extended_acl = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_EXTENDED_ACL 1 + if test $have_extended_acl = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTENDED_ACL _ACEOF + fi fi fi -support_xattr=yes +support_xattr=auto # Check whether --enable-xattr was given. if test "${enable_xattr+set}" = set; then enableval=$enable_xattr; - if test x$enableval = xno; then - support_acl=no + if test x$enableval = xyes; then + support_xattr=yes + elif test x$enableval = xno; then + support_xattr=no fi @@ -40771,7 +41169,7 @@ fi have_xattr=no -if test x$support_xattr = xyes; then +if test x$support_xattr = xyes -o x$support_xattr = xauto; then if test "${ac_cv_header_sys_xattr_h+set}" = set; then { echo "$as_me:$LINENO: checking for sys/xattr.h" >&5 echo $ECHO_N "checking for sys/xattr.h... $ECHO_C" >&6; } @@ -40999,22 +41397,32 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - have_xattr=yes - cat >>confdefs.h <<\_ACEOF -#define HAVE_LLISTXATTR 1 + have_xattr=yes + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LLISTXATTR _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_LGETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LGETXATTR _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_LSETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LSETXATTR _ACEOF -else +fi +done + + + # + # OSX specific + # + if test $have_xattr = no; then @@ -41108,17 +41516,20 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - have_xattr=yes - cat >>confdefs.h <<\_ACEOF -#define HAVE_LISTXATTR 1 + have_xattr=yes + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LLISTXATTR _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_GETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LGETXATTR _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_SETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LSETXATTR _ACEOF @@ -41126,17 +41537,628 @@ _ACEOF fi done + fi + + # + # Solaris specific + # + if test $have_xattr = no; then + if test "${ac_cv_header_sys_attr_h+set}" = set; then + { echo "$as_me:$LINENO: checking for sys/attr.h" >&5 +echo $ECHO_N "checking for sys/attr.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_attr_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_attr_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_attr_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking sys/attr.h usability" >&5 +echo $ECHO_N "checking sys/attr.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking sys/attr.h presence" >&5 +echo $ECHO_N "checking sys/attr.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: sys/attr.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sys/attr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/attr.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sys/attr.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sys/attr.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sys/attr.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/attr.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sys/attr.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/attr.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sys/attr.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/attr.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sys/attr.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/attr.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sys/attr.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/attr.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/attr.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for sys/attr.h" >&5 +echo $ECHO_N "checking for sys/attr.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_attr_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_sys_attr_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_attr_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_attr_h" >&6; } + +fi +if test $ac_cv_header_sys_attr_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SYS_ATTR_H 1 +_ACEOF + +fi + + + if test "${ac_cv_header_sys_nvpair_h+set}" = set; then + { echo "$as_me:$LINENO: checking for sys/nvpair.h" >&5 +echo $ECHO_N "checking for sys/nvpair.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_nvpair_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_nvpair_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_nvpair_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking sys/nvpair.h usability" >&5 +echo $ECHO_N "checking sys/nvpair.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking sys/nvpair.h presence" >&5 +echo $ECHO_N "checking sys/nvpair.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: sys/nvpair.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sys/nvpair.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/nvpair.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sys/nvpair.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sys/nvpair.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sys/nvpair.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/nvpair.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sys/nvpair.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/nvpair.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sys/nvpair.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/nvpair.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sys/nvpair.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/nvpair.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sys/nvpair.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/nvpair.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/nvpair.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for sys/nvpair.h" >&5 +echo $ECHO_N "checking for sys/nvpair.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_nvpair_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_sys_nvpair_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_nvpair_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_nvpair_h" >&6; } + +fi +if test $ac_cv_header_sys_nvpair_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SYS_NVPAIR_H 1 +_ACEOF + +fi + + + if test "${ac_cv_header_attr_h+set}" = set; then + { echo "$as_me:$LINENO: checking for attr.h" >&5 +echo $ECHO_N "checking for attr.h... $ECHO_C" >&6; } +if test "${ac_cv_header_attr_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_attr_h" >&5 +echo "${ECHO_T}$ac_cv_header_attr_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking attr.h usability" >&5 +echo $ECHO_N "checking attr.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking attr.h presence" >&5 +echo $ECHO_N "checking attr.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: attr.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: attr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: attr.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: attr.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: attr.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: attr.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: attr.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: attr.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: attr.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: attr.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: attr.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: attr.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: attr.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: attr.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: attr.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: attr.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for attr.h" >&5 +echo $ECHO_N "checking for attr.h... $ECHO_C" >&6; } +if test "${ac_cv_header_attr_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_attr_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_attr_h" >&5 +echo "${ECHO_T}$ac_cv_header_attr_h" >&6; } + +fi +if test $ac_cv_header_attr_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_ATTR_H 1 +_ACEOF + +fi + + + + + + + + +for ac_func in openat fstatat unlinkat fchownat futimesat +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + + have_xattr=yes + +cat >>confdefs.h <<\_ACEOF +#define HAVE_OPENAT +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FSTATAT +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_UNLINKAT +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FCHOWNAT +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FUTIMESAT +_ACEOF + fi done - if test $have_xattr = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR 1 + if test $have_xattr = yes; then + { echo "$as_me:$LINENO: checking for nvlist_next_nvpair in -lnvpair" >&5 +echo $ECHO_N "checking for nvlist_next_nvpair in -lnvpair... $ECHO_C" >&6; } +if test "${ac_cv_lib_nvpair_nvlist_next_nvpair+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnvpair $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char nvlist_next_nvpair (); +int +main () +{ +return nvlist_next_nvpair (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_nvpair_nvlist_next_nvpair=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_nvpair_nvlist_next_nvpair=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nvpair_nvlist_next_nvpair" >&5 +echo "${ECHO_T}$ac_cv_lib_nvpair_nvlist_next_nvpair" >&6; } +if test $ac_cv_lib_nvpair_nvlist_next_nvpair = yes; then + + FDLIBS="-lnvpair $FDLIBS" + + +fi + + fi + fi + + if test x$support_xattr = xyes -a $have_xattr != yes; then + { { echo "$as_me:$LINENO: error: xattr support explicitly enabled but no supported xattr implementation found, + please either load the xattr libraries or rerun configure without --enable-xatt" >&5 +echo "$as_me: error: xattr support explicitly enabled but no supported xattr implementation found, + please either load the xattr libraries or rerun configure without --enable-xatt" >&2;} + { (exit 1); exit 1; }; } + else + if test $have_xattr = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XATTR _ACEOF + fi fi fi @@ -41476,10 +42498,16 @@ PFILES="platforms/Makefile" PSCMD="ps -e" WIN32= MACOSX= + hostname=`uname -n | cut -d '.' -f 1` if test x${hostname} = x ; then hostname="localhost" fi +ping -c 1 $hostname 2>/dev/null 1>/dev/null +if test ! $? = 0; then + hostname="localhost" +fi + case "$DISTNAME" in aix) DISTVER=`uname -r` @@ -41530,11 +42558,15 @@ darwin) PFILES="${PFILES} \ platforms/darwin/Makefile" ;; +osx) + DISTVER=`uname -r` + TAPEDRIVE="/dev/nst0" + PSCMD="ps -e -o pid,command" + MACOSX=macosx + PFILES="${PFILES} \ + platforms/osx/Makefile" + ;; debian) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi if `test -f /etc/apt/sources.list && grep -q ubuntu /etc/apt/sources.list`; then DISTNAME="ubuntu" fi @@ -41568,10 +42600,6 @@ debian) fi ;; freebsd) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`uname -a |awk '{print $3}'` VER=`echo $DISTVER | cut -c 1` if test x$VER = x4 ; then @@ -41634,10 +42662,6 @@ openbsd) platforms/openbsd/bacula-dir" ;; redhat) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi if test -f /etc/whitebox-release ; then f=/etc/whitebox-release else @@ -41657,15 +42681,10 @@ redhat) platforms/redhat/Makefile \ platforms/redhat/bacula-fd \ platforms/redhat/bacula-sd \ - platforms/redhat/bacula-dir \ - platforms/redhat/bacula.spec \ + platforms/redhat/bacula-dir " ;; mandrake) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`cat /etc/mandrake-release | grep release |\ cut -f 5 -d ' '` TAPEDRIVE="/dev/nst0" @@ -41679,10 +42698,6 @@ mandrake) " ;; gentoo) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`awk '/version / {print $5}' < /etc/gentoo-release` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" @@ -41694,10 +42709,6 @@ gentoo) platforms/gentoo/bacula-dir" ;; slackware) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`cat /etc/slackware-version` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" @@ -41726,10 +42737,6 @@ _ACEOF LIBS="$LIBS -lresolv" ;; suse) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`cat /etc/SuSE-release |grep VERSION|\ cut -f 3 -d ' '` TAPEDRIVE="/dev/nst0" @@ -41743,10 +42750,6 @@ suse) platforms/suse/bacula.spec" ;; suse5) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTNAME=suse DISTVER=5.x TAPEDRIVE="/dev/nst0" @@ -41801,7 +42804,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi -ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit 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 scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper 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 scripts/dvd-simulator 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 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/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_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 src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" +ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit 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 scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper 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 scripts/dvd-simulator 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 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/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/qt-console/bat.conf src/qt-console/bat.pro src/qt-console/bat.pro.mingw32 src/qt-console/install_conf_file src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_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 src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_sqlite_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" ac_config_commands="$ac_config_commands default" @@ -42832,7 +43835,12 @@ do "src/plugins/fd/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/fd/Makefile" ;; "src/plugins/sd/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/sd/Makefile" ;; "src/plugins/dir/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dir/Makefile" ;; + "src/win32/Makefile.inc") CONFIG_FILES="$CONFIG_FILES src/win32/Makefile.inc" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "updatedb/update_mysql_tables_9_to_10") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_9_to_10" ;; + "updatedb/update_sqlite3_tables_9_to_10") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_9_to_10" ;; + "updatedb/update_postgresql_tables_9_to_10") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_9_to_10" ;; + "updatedb/update_sqlite_tables_9_to_10") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite_tables_9_to_10" ;; "updatedb/update_mysql_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_10_to_11" ;; "updatedb/update_sqlite3_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_10_to_11" ;; "updatedb/update_postgresql_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_10_to_11" ;; @@ -42945,6 +43953,9 @@ host_alias!$host_alias$ac_delim target_alias!$target_alias$ac_delim BUILD_DIR!$BUILD_DIR$ac_delim TOP_DIR!$TOP_DIR$ac_delim +WIN32BUILDDIR!$WIN32BUILDDIR$ac_delim +WIN32MAINDIR!$WIN32MAINDIR$ac_delim +WIN32TOPDIR!$WIN32TOPDIR$ac_delim TRUEPRG!$TRUEPRG$ac_delim FALSEPRG!$FALSEPRG$ac_delim VERSION!$VERSION$ac_delim @@ -42987,6 +43998,7 @@ DVDRWFORMAT!$DVDRWFORMAT$ac_delim PKGCONFIG!$PKGCONFIG$ac_delim QMAKE!$QMAKE$ac_delim QMAKEQT4!$QMAKEQT4$ac_delim +GMAKE!$GMAKE$ac_delim WXCONFIG!$WXCONFIG$ac_delim WXFLAGS!$WXFLAGS$ac_delim CDRECORD!$CDRECORD$ac_delim @@ -42996,10 +44008,6 @@ ARFLAGS!$ARFLAGS$ac_delim MAKE_SHELL!$MAKE_SHELL$ac_delim LOCAL_LIBS!$LOCAL_LIBS$ac_delim LOCAL_CFLAGS!$LOCAL_CFLAGS$ac_delim -LOCAL_LDFLAGS!$LOCAL_LDFLAGS$ac_delim -LOCAL_DEFS!$LOCAL_DEFS$ac_delim -LIBTOOL!$LIBTOOL$ac_delim -build!$build$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then @@ -43045,6 +44053,10 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +LOCAL_LDFLAGS!$LOCAL_LDFLAGS$ac_delim +LOCAL_DEFS!$LOCAL_DEFS$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +build!$build$ac_delim build_cpu!$build_cpu$ac_delim build_vendor!$build_vendor$ac_delim build_os!$build_os$ac_delim @@ -43138,10 +44150,6 @@ GNOME_LIBS!$GNOME_LIBS$ac_delim GNOME_DIR!$GNOME_DIR$ac_delim BAT_DIR!$BAT_DIR$ac_delim QWT_INC!$QWT_INC$ac_delim -QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim -QWT_LIB!$QWT_LIB$ac_delim -QWT!$QWT$ac_delim -WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43183,6 +44191,10 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim +QWT_LIB!$QWT_LIB$ac_delim +QWT!$QWT$ac_delim +WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim WX_DIR!$WX_DIR$ac_delim TRAY_MONITOR_CPPFLAGS!$TRAY_MONITOR_CPPFLAGS$ac_delim @@ -43211,7 +44223,11 @@ OPENSSL_LIBS!$OPENSSL_LIBS$ac_delim OPENSSL_INC!$OPENSSL_INC$ac_delim working_dir!$working_dir$ac_delim archivedir!$archivedir$ac_delim +basename!$basename$ac_delim +hostname!$hostname$ac_delim scriptdir!$scriptdir$ac_delim +bsrdir!$bsrdir$ac_delim +logdir!$logdir$ac_delim plugindir!$plugindir$ac_delim dump_email!$dump_email$ac_delim job_email!$job_email$ac_delim @@ -43264,7 +44280,6 @@ WCFLAGS!$WCFLAGS$ac_delim WLDFLAGS!$WLDFLAGS$ac_delim WRAPLIBS!$WRAPLIBS$ac_delim OBJLIST!$OBJLIST$ac_delim -hostname!$hostname$ac_delim TAPEDRIVE!$TAPEDRIVE$ac_delim PSCMD!$PSCMD$ac_delim WIN32!$WIN32$ac_delim @@ -43274,7 +44289,7 @@ DISTVER!$DISTVER$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -43293,7 +44308,7 @@ fi cat >>$CONFIG_STATUS <<_ACEOF cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b _ACEOF sed ' s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g @@ -43306,8 +44321,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g CEOF$ac_eof _ACEOF @@ -43555,7 +44568,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed 's/|#_!!_#|//g' >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && @@ -44628,8 +45641,9 @@ fi if test "${support_bat}" = "yes" ; then if test "x$QMAKE" = "xnone" && test "x$QMAKEQT4" = "xnone"; then - echo "Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation" - exit 1 + { { echo "$as_me:$LINENO: error: Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation" >&5 +echo "$as_me: error: Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation" >&2;} + { (exit 1); exit 1; }; } fi QMAKEBIN="qmake" @@ -44639,8 +45653,9 @@ if test "${support_bat}" = "yes" ; then fi cd src/qt-console - chmod 755 install_conf_file build-depkgs-qt-console echo "Creating bat Makefile" + touch bat + chmod 755 bat $QMAKEBIN make clean cd ${BUILD_DIR} @@ -44651,6 +45666,10 @@ if test X"$GCC" = "Xyes" ; then ${MAKE:-make} depend fi +cd src/qt-console +chmod 755 install_conf_file build-depkgs-qt-console +cd ${BUILD_DIR} + cd scripts chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer chmod 755 dvd-handler dvd-simulator @@ -44737,7 +45756,7 @@ Configuration on `date`: Subsys directory: ${subsysdir} Man directory: ${mandir} Data directory: ${datarootdir} - Plugin directory: ${plugindir} + Plugin directory: ${plugindir} C Compiler: ${CC} ${CCVERSION} C++ Compiler: ${CXX} ${CXXVERSION} Compiler flags: ${WCFLAGS} ${CFLAGS} @@ -44779,6 +45798,7 @@ Configuration on `date`: Encryption support: ${support_crypto} ZLIB support: ${have_zlib} enable-smartalloc: ${support_smartalloc} + enable-lockmgr: ${support_lockmgr} bat support: ${support_bat} ${QWT_LDFLAGS} enable-gnome: ${support_gnome} ${gnome_version} enable-bwx-console: ${support_wx_console} ${wx_version} @@ -44787,7 +45807,7 @@ Configuration on `date`: build-dird: ${build_dird} build-stored: ${build_stored} ACL support: ${have_acl} - XATTR support: ${have_xattr} + XATTR support: ${have_xattr} Python support: ${support_python} ${PYTHON_LIBS} Batch insert enabled: ${support_batch_insert}