X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=8f8a2f5f998085d04eb829fc53b926945145f511;hb=8694fe83738792584b6c7c1a42a6225159dbf998;hp=b52c27f6332d5d175dcbfadf7798ad4c3146e3cf;hpb=0ba68235f44d545a0b6edf42c03a1e3a85fdde4d;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index b52c27f633..8f8a2f5f99 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 @@ -808,6 +811,12 @@ DATE LSMDATE BACULA post_host +BDB_VERSION +LIBBAC_LT_RELEASE +LIBBACCFG_LT_RELEASE +LIBBACPY_LT_RELEASE +LIBBACSQL_LT_RELEASE +LIBBACFIND_LT_RELEASE CC CFLAGS LDFLAGS @@ -842,7 +851,7 @@ DVDRWMEDIAINFO DVDRWFORMAT PKGCONFIG QMAKE -QMAKEQT4 +GMAKE WXCONFIG WXFLAGS CDRECORD @@ -886,6 +895,7 @@ LIBTOOL_INSTALL_TARGET LIBTOOL_UNINSTALL_TARGET LIBTOOL_CLEAN_TARGET QMAKE_LIBTOOL +FD_PLUGIN_DIR INCLUDE_INSTALL_TARGET INCLUDE_UNINSTALL_TARGET HAVE_SUN_OS_TRUE @@ -942,11 +952,6 @@ INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX -GNOME_INCLUDEDIR -GNOMEUI_LIBS -GNOME_LIBDIR -GNOME_LIBS -GNOME_DIR BAT_DIR QWT_INC QWT_LDFLAGS @@ -981,7 +986,11 @@ OPENSSL_LIBS OPENSSL_INC working_dir archivedir +basename +hostname scriptdir +bsrdir +logdir plugindir dump_email job_email @@ -1025,6 +1034,10 @@ X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS +ZLIBS +AFS_CFLAGS +AFS_LIBS +CAP_LIBS FDLIBS DEBUG DINCLUDE @@ -1034,7 +1047,6 @@ WCFLAGS WLDFLAGS WRAPLIBS OBJLIST -hostname TAPEDRIVE PSCMD WIN32 @@ -1665,6 +1677,7 @@ Optional Features: --disable-readline disable readline support [default=yes] --enable-batch-insert enable the DB batch insert code [default=no] --disable-largefile omit support for large files + --disable-afs disable afs support [default=auto] --disable-acl disable acl support [default=auto] --disable-xattr disable xattr support [default=auto] @@ -1680,7 +1693,6 @@ Optional Packages: --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir --with-included-gettext use the GNU gettext library included here - --with-qwt[=DIR] specify qwt library directory --with-readline[=DIR] specify readline library directory --with-python[=DIR] Include Python support. DIR is the Python base install directory, default is to search through a @@ -1690,7 +1702,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 @@ -1721,7 +1737,7 @@ Optional Packages: --with-sd-group=GROUP specify group for Storage daemon --with-fd-user=USER specify user for File daemon --with-fd-group=GROUP specify group for File daemon - --with-sbin-perm=MODE specify permissions for sbin binaries [default=0754] + --with-sbin-perm=MODE specify permissions for sbin binaries [default=0750] --with-postgresql[=DIR] Include PostgreSQL support. DIR is the PostgreSQL base install directory, [default=/usr/local/pgsql] --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base install @@ -1731,12 +1747,12 @@ Optional Packages: Include MySQL support. DIR is the MySQL base install directory, default is to search through a number of common places for the MySQL files. + --with-ingres[=DIR] Include Ingres support. DIR is the Ingres base + install directory, default is to search through a + number of common places for the Ingres files. --with-sqlite3[=DIR] Include SQLite3 support. DIR is the SQLite3 base install directory, default is to search through a number of common places for the SQLite3 files. - --with-sqlite[=DIR] Include SQLite support. DIR is the SQLite base - install directory, default is to search through a - number of common places for the SQLite files. --with-dbi[=DIR] Include DBI support. DIR is the DBD base install directory, default is to search through a number of common places for the DBI files. @@ -1745,6 +1761,7 @@ Optional Packages: like Mysql, Postgresql, others. Default is to not configure any driver. --with-x use the X Window System + --with-afsdir[=DIR] Directory holding AFS includes/libs Some influential environment variables: CC C compiler command @@ -2225,6 +2242,10 @@ 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} + @@ -2326,13 +2347,35 @@ 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` +BDB_VERSION=`sed -n -e 's/^.*BDB_VERSION \(.*\)$/\1/p' ${srcdir}/src/cats/cats.h` + +LIBBAC_LT_RELEASE=`sed -n -e 's/^#.*LIBBAC_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +LIBBACCFG_LT_RELEASE=`sed -n -e 's/^#.*LIBBACCFG_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +LIBBACPY_LT_RELEASE=`sed -n -e 's/^#.*LIBBACPY_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` + +LIBBAC_LT_RELEASE=${LIBBAC_LT_RELEASE:-$VERSION} +LIBBACCFG_LT_RELEASE=${LIBBACCFG_LT_RELEASE:-$VERSION} +LIBBACPY_LT_RELEASE=${LIBBACPY_LT_RELEASE:-$VERSION} + + +LIBBACSQL_LT_RELEASE=`sed -n -e 's/^#.*LIBBACSQL_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` + +LIBBACSQL_LT_RELEASE=${LIBBACSQL_LT_RELEASE:-$VERSION} + + +LIBBACFIND_LT_RELEASE=`sed -n -e 's/^#.*LIBBACFIND_LT_RELEASE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` + +LIBBACFIND_LT_RELEASE=${LIBBACFIND_LT_RELEASE:-$VERSION} + + echo "configuring for ${BACULA} $VERSION ($DATE)" + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5045,16 +5088,16 @@ echo "${ECHO_T}no" >&6; } fi -# Extract the first word of "qmake-qt4", so it can be a program name with args. -set dummy qmake-qt4; ac_word=$2 +# 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_QMAKEQT4+set}" = set; then +if test "${ac_cv_path_GMAKE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $QMAKEQT4 in + case $GMAKE in [\\/]* | ?:[\\/]*) - ac_cv_path_QMAKEQT4="$QMAKEQT4" # Let the user override the test with a path. + ac_cv_path_GMAKE="$GMAKE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5064,7 +5107,7 @@ do 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_QMAKEQT4="$as_dir/$ac_word$ac_exec_ext" + 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 @@ -5072,14 +5115,14 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_QMAKEQT4" && ac_cv_path_QMAKEQT4="none" + test -z "$ac_cv_path_GMAKE" && ac_cv_path_GMAKE="none" ;; esac fi -QMAKEQT4=$ac_cv_path_QMAKEQT4 -if test -n "$QMAKEQT4"; then - { echo "$as_me:$LINENO: result: $QMAKEQT4" >&5 -echo "${ECHO_T}$QMAKEQT4" >&6; } +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; } @@ -5327,6 +5370,7 @@ MAKE_SHELL=/bin/sh +use_libtool=yes # Check whether --enable-libtool was given. if test "${enable_libtool+set}" = set; then enableval=$enable_libtool; @@ -5936,13 +5980,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:5939: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5983: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5942: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5986: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5945: output\"" >&5) + (eval echo "\"\$as_me:5989: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7163,7 +7207,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7166 "configure"' > conftest.$ac_ext + echo '#line 7210 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9378,11 +9422,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:9381: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9425: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9385: \$? = $ac_status" >&5 + echo "$as_me:9429: \$? = $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. @@ -9717,11 +9761,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:9720: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9764: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9724: \$? = $ac_status" >&5 + echo "$as_me:9768: \$? = $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. @@ -9822,11 +9866,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:9825: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9869: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9829: \$? = $ac_status" >&5 + echo "$as_me:9873: \$? = $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 @@ -9877,11 +9921,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:9880: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9924: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9884: \$? = $ac_status" >&5 + echo "$as_me:9928: \$? = $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 @@ -12633,7 +12677,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12636 "configure" +#line 12680 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12729,7 +12773,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12732 "configure" +#line 12776 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14741,11 +14785,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:14744: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14788: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14748: \$? = $ac_status" >&5 + echo "$as_me:14792: \$? = $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. @@ -14840,11 +14884,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:14843: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14887: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14847: \$? = $ac_status" >&5 + echo "$as_me:14891: \$? = $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 @@ -14892,11 +14936,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:14895: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14939: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14899: \$? = $ac_status" >&5 + echo "$as_me:14943: \$? = $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 @@ -15883,6 +15927,8 @@ if test x$use_libtool != xno; then LIBTOOL_UNINSTALL_TARGET="libtool-uninstall" LIBTOOL_CLEAN_TARGET="libtool-clean" QMAKE_LIBTOOL="${BUILD_DIR}/libtool" + FD_PLUGIN_DIR="src/plugins/fd" + have_plugins=yes else DEFAULT_OBJECT_TYPE=".o" DEFAULT_ARCHIVE_TYPE=".a" @@ -15892,6 +15938,8 @@ else LIBTOOL_UNINSTALL_TARGET="" LIBTOOL_CLEAN_TARGET="" QMAKE_LIBTOOL="# ${BUILD_DIR}/libtool" + FD_PLUGIN_DIR="" + have_plugins=no fi @@ -15903,6 +15951,7 @@ fi + # Check whether --enable-includes was given. if test "${enable_includes+set}" = set; then enableval=$enable_includes; @@ -16349,12 +16398,18 @@ 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 elif test -f /etc/engarde-version then DISTNAME=engarde +elif test -f /etc/arch-release +then + DISTNAME=archlinux elif test "$CYGWIN" = yes then DISTNAME=cygwin @@ -18263,25 +18318,39 @@ _ACEOF -if test x${prefix} = xNONE ; then - if test `eval echo ${datarootdir}` = NONE/share ; then - datarootdir=/usr/share - fi -fi +os_name=`uname -s 2>/dev/null` if test x${prefix} = xNONE ; then if test `eval echo ${sysconfdir}` = NONE/etc ; then sysconfdir=/etc/bacula fi if test `eval echo ${libdir}` = NONE/lib ; then - libdir=/usr/lib + case ${os_name} in + Linux) + os_processor=`uname -p 2>/dev/null` + case ${os_processor} in + x86_64) + libdir=/usr/lib64 + ;; + *) + libdir=/usr/lib + ;; + esac + ;; + *) + libdir=/usr/lib + ;; + esac fi if test `eval echo ${includedir}` = NONE/include ; then includedir=/usr/include fi + if test `eval echo ${datarootdir}` = NONE/share ; then + datarootdir=/usr/share + fi prefix= fi @@ -18291,6 +18360,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` @@ -18312,6 +18383,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. @@ -23934,6 +24014,7 @@ support_mysql=no support_sqlite=no support_sqlite3=no support_postgresql=no +support_ingres=no support_dbi=no support_smartalloc=yes support_readline=yes @@ -23974,26 +24055,14 @@ fi GNOME_DIR= if test x$support_gnome = xyes; then - abc=`$PKGCONFIG --exists libgnomeui-2.0` - pkg=$? - if test $pkg = 0; then - GNOME_INCLUDEDIR=`$PKGCONFIG --cflags-only-I libgnomeui-2.0` - GNOMEUI_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0` - GNOME_LIBDIR=`$PKGCONFIG --libs libgnomeui-2.0` - GNOME_LIBS=`$PKGCONFIG --libs-only-l libgnomeui-2.0` - - - - - GNOME_DIR=src/gnome2-console - gnome_version="Version 2.x" - else - { { echo "$as_me:$LINENO: error: Unable to find Gnome 2 installation" >&5 -echo "$as_me: error: Unable to find Gnome 2 installation" >&2;} + { { echo "$as_me:$LINENO: error: bgnome-console no longer supported" >&5 +echo "$as_me: error: bgnome-console no longer supported" >&2;} + { (exit 1); exit 1; }; } + { { echo "$as_me:$LINENO: error: --enable-gnome option no longer supported" >&5 +echo "$as_me: error: --enable-gnome option no longer supported" >&2;} { (exit 1); exit 1; }; } - fi fi - +# AC_SUBST(GNOME_DIR) # Check whether --enable-bat was given. if test "${enable_bat+set}" = set; then @@ -24030,67 +24099,8 @@ QWT_LDFLAGS= QWT_LIB= QWT= no_qwt=no -if test x$support_bat = xyes; then - { echo "$as_me:$LINENO: checking for qwt support" >&5 -echo $ECHO_N "checking for qwt support... $ECHO_C" >&6; } - -# Check whether --with-qwt was given. -if test "${with_qwt+set}" = set; then - withval=$with_qwt; - case "$with_qwt" in - no) - no_qwt=yes - ;; - yes|*) - if test -f ${with_qwt}/include/qwt.h; then - QWT_INC="${with_qwt}/include" - QWT_LDFLAGS="-L${with_qwt}/lib" - QWT_LIB="-lqwt" - QWT="qwt" - fi - ;; - esac - - -fi - if test $no_qwt = no; then - if test x$QWT_INC = x; then - for root in /usr /usr/local; do - for ver in qwt qwt5 qwt-qt4; do - if test -f ${root}/include/${ver}/qwt.h; then - QWT_INC="${root}/include/${ver}" - if test -d ${root}/lib64/; then - QWT_LDFLAGS="-L${root}/lib64" - elif test -d ${root}/lib/64/; then - QWT_LDFLAGS="-L${root}/64" - else - QWT_LDFLAGS="-L${root}/lib" - fi - QWT_LIB="-lqwt" - QWT="qwt" - got_qwt=yes - break; - fi - done - done - fi - fi - if test x$QWT_INC = x; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - else - -cat >>confdefs.h <<\_ACEOF -#define HAVE_QWT 1 -_ACEOF - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - fi -fi - @@ -24119,7 +24129,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." @@ -24206,6 +24216,13 @@ fi 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 @@ -24223,6 +24240,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 @@ -24240,6 +24264,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 @@ -24257,6 +24288,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 @@ -24274,6 +24312,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 @@ -24429,20 +24474,19 @@ _ACEOF fi -got_conio="no" -if test x$support_conio = xyes; then - if test "${ac_cv_header_termcap_h+set}" = set; then - { echo "$as_me:$LINENO: checking for termcap.h" >&5 -echo $ECHO_N "checking for termcap.h... $ECHO_C" >&6; } -if test "${ac_cv_header_termcap_h+set}" = set; then +TERM_LIB="" +if test "${ac_cv_header_curses_h+set}" = set; then + { echo "$as_me:$LINENO: checking for curses.h" >&5 +echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; } +if test "${ac_cv_header_curses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_termcap_h" >&5 -echo "${ECHO_T}$ac_cv_header_termcap_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 +echo "${ECHO_T}$ac_cv_header_curses_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking termcap.h usability" >&5 -echo $ECHO_N "checking termcap.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking curses.h usability" >&5 +echo $ECHO_N "checking curses.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24450,7 +24494,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -24482,15 +24526,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking termcap.h presence" >&5 -echo $ECHO_N "checking termcap.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking curses.h presence" >&5 +echo $ECHO_N "checking curses.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 +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -24523,47 +24567,47 @@ 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: termcap.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: termcap.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: termcap.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: termcap.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: termcap.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: termcap.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: termcap.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: termcap.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: termcap.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: termcap.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: termcap.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: termcap.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: termcap.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: termcap.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: termcap.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: termcap.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: curses.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: curses.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for termcap.h" >&5 -echo $ECHO_N "checking for termcap.h... $ECHO_C" >&6; } -if test "${ac_cv_header_termcap_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for curses.h" >&5 +echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; } +if test "${ac_cv_header_curses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_termcap_h=$ac_header_preproc + ac_cv_header_curses_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_termcap_h" >&5 -echo "${ECHO_T}$ac_cv_header_termcap_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5 +echo "${ECHO_T}$ac_cv_header_curses_h" >&6; } fi -if test $ac_cv_header_termcap_h = yes; then - { echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5 -echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6; } -if test "${ac_cv_lib_termcap_tgetent+set}" = set; then +if test $ac_cv_header_curses_h = yes; then + { echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 +echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6; } +if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ltermcap $LIBS" +LIBS="-lncurses $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24604,40 +24648,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_termcap_tgetent=yes + ac_cv_lib_ncurses_tgetent=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_termcap_tgetent=no + ac_cv_lib_ncurses_tgetent=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_termcap_tgetent" >&5 -echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6; } -if test $ac_cv_lib_termcap_tgetent = yes; then - CONS_LIBS="-ltermcap" - CONS_OBJ="conio.o" - CONS_SRC="conio.c" - got_conio="yes" - support_readline=no - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CONIO 1 -_ACEOF - - +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5 +echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6; } +if test $ac_cv_lib_ncurses_tgetent = yes; then + TERM_LIB="-lncurses" else - { echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 -echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6; } -if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then + { echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5 +echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6; } +if test "${ac_cv_lib_termcap_tgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lncurses $LIBS" +LIBS="-ltermcap $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24678,32 +24712,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_ncurses_tgetent=yes + ac_cv_lib_termcap_tgetent=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_ncurses_tgetent=no + ac_cv_lib_termcap_tgetent=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_ncurses_tgetent" >&5 -echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6; } -if test $ac_cv_lib_ncurses_tgetent = yes; then - CONS_LIBS="-lncurses" - CONS_OBJ="conio.o" - CONS_SRC="conio.c" - got_conio="yes" - support_readline=no - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CONIO 1 -_ACEOF - - +{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5 +echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6; } +if test $ac_cv_lib_termcap_tgetent = yes; then + TERM_LIB="-ltermcap" fi @@ -24712,7 +24736,6 @@ fi else - for ac_header in curses.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -24852,190 +24875,18 @@ fi done - { echo "$as_me:$LINENO: checking for term.h" >&5 + if test "${ac_cv_header_term_h+set}" = set; then + { echo "$as_me:$LINENO: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6; } if test "${ac_cv_header_term_h+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. */ -#if HAVE_CURSES_H -#include -#endif - - -#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_cv_header_term_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_term_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ac_cv_header_term_h" >&5 echo "${ECHO_T}$ac_cv_header_term_h" >&6; } -if test $ac_cv_header_term_h = yes; then - { echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5 -echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6; } -if test "${ac_cv_lib_curses_tgetent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcurses $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 tgetent (); -int -main () -{ -return tgetent (); - ; - 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_curses_tgetent=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_curses_tgetent=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_curses_tgetent" >&5 -echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6; } -if test $ac_cv_lib_curses_tgetent = yes; then - CONS_LIBS="-lcurses" - CONS_OBJ="conio.o" - CONS_SRC="conio.c" - got_conio="yes" - support_readline=no - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CONIO 1 -_ACEOF - - -fi - - -else - echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " " -fi - - - -fi - - -fi - - -# Check whether --enable-readline was given. -if test "${enable_readline+set}" = set; then - enableval=$enable_readline; - if test x$enableval = xno; then - support_readline=no - fi - - -fi - - -got_readline="no" -READLINE_SRC= -if test x$support_readline = xyes; then - -# Check whether --with-readline was given. -if test "${with_readline+set}" = set; then - withval=$with_readline; - case "$with_readline" in - no) - : - ;; - yes|*) - if test -f ${with_readline}/readline.h; then - CONS_INC="-I${with_readline}" - CONS_LDFLAGS="-L$with_readline" - elif test -f ${with_readline}/include/readline/readline.h; then - CONS_INC="-I${with_readline}/include/readline" - CONS_LDFLAGS="-L${with_readline}/lib" - with_readline="${with_readline}/include/readline" - else - with_readline="/usr/include/readline" - fi - - as_ac_Header=`echo "ac_cv_header_${with_readline}/readline.h" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for ${with_readline}/readline.h" >&5 -echo $ECHO_N "checking for ${with_readline}/readline.h... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking ${with_readline}/readline.h usability" >&5 -echo $ECHO_N "checking ${with_readline}/readline.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking term.h usability" >&5 +echo $ECHO_N "checking term.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25043,7 +24894,266 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <${with_readline}/readline.h> +#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 term.h presence" >&5 +echo $ECHO_N "checking term.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: term.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: term.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: term.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: term.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: term.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: term.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: term.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: term.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: term.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: term.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: term.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for term.h" >&5 +echo $ECHO_N "checking for term.h... $ECHO_C" >&6; } +if test "${ac_cv_header_term_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_term_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_term_h" >&5 +echo "${ECHO_T}$ac_cv_header_term_h" >&6; } + +fi +if test $ac_cv_header_term_h = yes; then + { echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5 +echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6; } +if test "${ac_cv_lib_curses_tgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcurses $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 tgetent (); +int +main () +{ +return tgetent (); + ; + 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_curses_tgetent=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_curses_tgetent=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_curses_tgetent" >&5 +echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6; } +if test $ac_cv_lib_curses_tgetent = yes; then + TERM_LIB="-lcurses" +fi + + +fi + + + +fi + + + + +got_conio="no" +if test x$support_conio = xyes; then + if test x$TERM_LIB != x; then + CONS_LIBS=$TERM_LIB + CONS_OBJ="conio.o" + CONS_SRC="conio.c" + got_conio="yes" + support_readline=no + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CONIO 1 +_ACEOF + + else + echo " "; echo "Required libraries not found. CONIO turned off ..."; echo " "], + fi +fi + + +# Check whether --enable-readline was given. +if test "${enable_readline+set}" = set; then + enableval=$enable_readline; + if test x$enableval = xno; then + support_readline=no + fi + + +fi + +if test x$TERM_LIB = x ; then + support_readline=no +fi + +got_readline="no" +READLINE_SRC= +if test x$support_readline = xyes; then + +# Check whether --with-readline was given. +if test "${with_readline+set}" = set; then + withval=$with_readline; + case "$with_readline" in + no) + : + ;; + yes|*) + if test -f ${with_readline}/readline.h; then + CONS_INC="-I${with_readline}" + CONS_LDFLAGS="-L$with_readline" + elif test -f ${with_readline}/include/readline/readline.h; then + CONS_INC="-I${with_readline}/include/readline" + CONS_LDFLAGS="-L${with_readline}/lib" + with_readline="${with_readline}/include/readline" + else + with_readline="/usr/include/readline" + fi + + as_ac_Header=`echo "ac_cv_header_${with_readline}/readline.h" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for ${with_readline}/readline.h" >&5 +echo $ECHO_N "checking for ${with_readline}/readline.h... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking ${with_readline}/readline.h usability" >&5 +echo $ECHO_N "checking ${with_readline}/readline.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 <${with_readline}/readline.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -25157,7 +25267,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_READLINE 1 _ACEOF - CONS_LIBS="-lreadline -lhistory -ltermcap" + CONS_LIBS="-lreadline -lhistory $TERM_LIB" got_readline="yes" else @@ -25309,7 +25419,7 @@ _ACEOF got_readline="yes" CONS_INC="-I/usr/include/readline" - CONS_LIBS="-lreadline -ltermcap" + CONS_LIBS="-lreadline $TERM_LIB" else @@ -25450,7 +25560,7 @@ _ACEOF got_readline="yes" CONS_INC="-I${TOP_DIR}/depkgs/readline" - CONS_LIBS="-lreadline -lhistory -ltermcap" + CONS_LIBS="-lreadline -lhistory $TERM_LIB" CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline" PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline" @@ -26140,38 +26250,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 @@ -26689,8 +26807,6 @@ if test "${with_tcp_wrappers+set}" = set; then if test "x$withval" != "xno" ; then saved_LIBS="$LIBS" LIBS="$saved_LIBS -lwrap" - { echo "$as_me:$LINENO: checking for libwrap" >&5 -echo $ECHO_N "checking for libwrap... $ECHO_C" >&6; } { echo "$as_me:$LINENO: checking for library containing nanosleep" >&5 echo $ECHO_N "checking for library containing nanosleep... $ECHO_C" >&6; } if test "${ac_cv_search_nanosleep+set}" = set; then @@ -26774,6 +26890,8 @@ if test "$ac_res" != no; then fi + { echo "$as_me:$LINENO: checking for libwrap" >&5 +echo $ECHO_N "checking for libwrap... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26991,6 +27109,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 support_tls="no" + support_crypto="no" fi @@ -27104,9 +27223,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - LIBS="${saved_LIBS}" - CFLAGS="${saved_CFLAGS}" - if test "$support_tls" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -27140,16 +27256,100 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi + + if test "$support_crypto" = "yes"; then + { echo "$as_me:$LINENO: checking for EVP_PKEY_encrypt_old in -lssl" >&5 +echo $ECHO_N "checking for EVP_PKEY_encrypt_old in -lssl... $ECHO_C" >&6; } +if test "${ac_cv_lib_ssl_EVP_PKEY_encrypt_old+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lssl $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 EVP_PKEY_encrypt_old (); +int +main () +{ +return EVP_PKEY_encrypt_old (); + ; + 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_ssl_EVP_PKEY_encrypt_old=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_ssl_EVP_PKEY_encrypt_old=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_ssl_EVP_PKEY_encrypt_old" >&5 +echo "${ECHO_T}$ac_cv_lib_ssl_EVP_PKEY_encrypt_old" >&6; } +if test $ac_cv_lib_ssl_EVP_PKEY_encrypt_old = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_OPENSSLv1 1 +_ACEOF + +fi + + fi + + LIBS="${saved_LIBS}" + CFLAGS="${saved_CFLAGS}" else support_tls="no" support_crypto="no" OPENSSL_LIBS="" OPENSSL_INC="" fi - { echo "$as_me:$LINENO: result: $support_tls" >&5 echo "${ECHO_T}$support_tls" >&6; } +if test "$support_tls" = "no"; then + OPENSSL_LIBS="" + OPENSSL_INC="" +fi +if test "$support_crypto" = "no"; then + OPENSSL_LIBS="" + OPENSSL_INC="" +fi + + { echo "$as_me:$LINENO: checking for library containing dlopen" >&5 @@ -27251,7 +27451,7 @@ fi -archive_dir=/tmp +archivedir=/tmp # Check whether --with-archivedir was given. if test "${with_archivedir+set}" = set; then @@ -27266,6 +27466,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. @@ -27281,10 +27515,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 @@ -27690,7 +27956,7 @@ fi -SBINPERM=0754 +SBINPERM=0750 # Check whether --with-sbin-perm was given. if test "${with_sbin_perm+set}" = set; then @@ -27786,6 +28052,12 @@ echo "${ECHO_T}no" >&6; } echo "$as_me: error: Invalid PostgreSQL directory $withval - unable to find libpq-fe.h under $withval" >&2;} { (exit 1); exit 1; }; } fi + cat >>confdefs.h <<\_ACEOF +#define HAVE_POSTGRESQL 1 +_ACEOF + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } POSTGRESQL_LFLAGS="-L$POSTGRESQL_LIBDIR -lpq" { echo "$as_me:$LINENO: checking for crypt" >&5 echo $ECHO_N "checking for crypt... $ECHO_C" >&6; } @@ -27943,12 +28215,6 @@ fi SQL_BINDIR=$POSTGRESQL_BINDIR SQL_LIB=$POSTGRESQL_LIBDIR/libpq.a - cat >>confdefs.h <<\_ACEOF -#define HAVE_POSTGRESQL 1 -_ACEOF - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } db_found=yes support_postgresql=yes db_type=PostgreSQL @@ -28084,7 +28350,8 @@ _ACEOF SQL_BINDIR=$MYSQL_BINDIR SQL_LIB=$MYSQL_LIBDIR/libmysqlclient_r.a - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_MYSQL 1 _ACEOF @@ -28220,81 +28487,57 @@ fi db_found=no -{ echo "$as_me:$LINENO: checking for SQLite3 support" >&5 -echo $ECHO_N "checking for SQLite3 support... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for Ingres support" >&5 +echo $ECHO_N "checking for Ingres support... $ECHO_C" >&6; } -# Check whether --with-sqlite3 was given. -if test "${with_sqlite3+set}" = set; then - withval=$with_sqlite3; +# Check whether --with-ingres was given. +if test "${with_ingres+set}" = set; then + withval=$with_ingres; if test "$withval" != "no"; then if test "$withval" = "yes"; then - if test -f /usr/local/include/sqlite3.h; then - SQLITE_INCDIR=/usr/local/include - if test -d /usr/local/lib64; then - SQLITE_LIBDIR=/usr/local/lib64 - else - SQLITE_LIBDIR=/usr/local/lib - fi - SQLITE_BINDIR=/usr/local/bin - elif test -f /usr/include/sqlite3.h; then - SQLITE_INCDIR=/usr/include - if test -d /usr/lib64; then - SQLITE_LIBDIR=/usr/lib64 - else - SQLITE_LIBDIR=/usr/lib - fi - SQLITE_BINDIR=/usr/bin - elif test -f $prefix/include/sqlite3.h; then - SQLITE_INCDIR=$prefix/include - if test -d $prefix/lib64; then - SQLITE_LIBDIR=$prefix/lib64 - else - SQLITE_LIBDIR=$prefix/lib - fi - SQLITE_BINDIR=$prefix/bin + if test -f ${II_SYSTEM}/files/eqdefc.h; then + INGRES_INCDIR=${II_SYSTEM}/files + INGRES_LIBDIR=${II_SYSTEM}/lib + INGRES_BINDIR=${II_SYSTEM}/bin + elif test -f ${II_SYSTEM}/ingres/files/eqdefc.h; then + INGRES_INCDIR=${II_SYSTEM}/ingres/files + INGRES_LIBDIR=${II_SYSTEM}/ingres/lib + INGRES_BINDIR=${II_SYSTEM}/ingres/bin else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Unable to find sqlite3.h in standard locations" >&5 -echo "$as_me: error: Unable to find sqlite3.h in standard locations" >&2;} + { { echo "$as_me:$LINENO: error: Unable to find eqdefc.h in standard locations" >&5 +echo "$as_me: error: Unable to find eqdefc.h in standard locations" >&2;} { (exit 1); exit 1; }; } fi else - if test -f $withval/sqlite3.h; then - SQLITE_INCDIR=$withval - SQLITE_LIBDIR=$withval - SQLITE_BINDIR=$withval - elif test -f $withval/include/sqlite3.h; then - SQLITE_INCDIR=$withval/include - if test -d $withval/lib64; then - SQLITE_LIBDIR=$withval/lib64 - else - SQLITE_LIBDIR=$withval/lib - fi - SQLITE_BINDIR=$withval/bin + if test -f $withval/files/eqdefc.h; then + INGRES_INCDIR=$withval/files + INGRES_LIBDIR=$withval/lib + INGRES_BINDIR=$withval/bin else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Invalid SQLite3 directory $withval - unable to find sqlite3.h under $withval" >&5 -echo "$as_me: error: Invalid SQLite3 directory $withval - unable to find sqlite3.h under $withval" >&2;} + { { echo "$as_me:$LINENO: error: Invalid Ingres directory $withval - unable to find Ingres headers under $withval" >&5 +echo "$as_me: error: Invalid Ingres directory $withval - unable to find Ingres headers under $withval" >&2;} { (exit 1); exit 1; }; } fi fi - SQL_INCLUDE=-I$SQLITE_INCDIR - SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite3" - SQL_BINDIR=$SQLITE_BINDIR - SQL_LIB=$SQLITE_LIBDIR/libsqlite3.a + SQL_INCLUDE=-I$INGRES_INCDIR + SQL_LFLAGS="-L$INGRES_LIBDIR -lq.1 -lcompat.1 -lframe.1" + SQL_BINDIR=$INGRES_BINDIR + SQL_LIB=$INGRES_LIBDIR/libingres.a - cat >>confdefs.h <<\_ACEOF -#define HAVE_SQLITE3 1 +cat >>confdefs.h <<\_ACEOF +#define HAVE_INGRES 1 _ACEOF { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } db_found=yes - support_sqlite3=yes - db_type=SQLite3 - DB_TYPE=sqlite3 + support_ingres=yes + db_type=Ingres + DB_TYPE=ingres else { echo "$as_me:$LINENO: result: no" >&5 @@ -28316,15 +28559,15 @@ fi db_found=no -{ echo "$as_me:$LINENO: checking for SQLite support" >&5 -echo $ECHO_N "checking for SQLite support... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for SQLite3 support" >&5 +echo $ECHO_N "checking for SQLite3 support... $ECHO_C" >&6; } -# Check whether --with-sqlite was given. -if test "${with_sqlite+set}" = set; then - withval=$with_sqlite; +# Check whether --with-sqlite3 was given. +if test "${with_sqlite3+set}" = set; then + withval=$with_sqlite3; if test "$withval" != "no"; then if test "$withval" = "yes"; then - if test -f /usr/local/include/sqlite.h; then + if test -f /usr/local/include/sqlite3.h; then SQLITE_INCDIR=/usr/local/include if test -d /usr/local/lib64; then SQLITE_LIBDIR=/usr/local/lib64 @@ -28332,7 +28575,7 @@ if test "${with_sqlite+set}" = set; then SQLITE_LIBDIR=/usr/local/lib fi SQLITE_BINDIR=/usr/local/bin - elif test -f /usr/include/sqlite.h; then + elif test -f /usr/include/sqlite3.h; then SQLITE_INCDIR=/usr/include if test -d /usr/lib64; then SQLITE_LIBDIR=/usr/lib64 @@ -28340,7 +28583,7 @@ if test "${with_sqlite+set}" = set; then SQLITE_LIBDIR=/usr/lib fi SQLITE_BINDIR=/usr/bin - elif test -f $prefix/include/sqlite.h; then + elif test -f $prefix/include/sqlite3.h; then SQLITE_INCDIR=$prefix/include if test -d $prefix/lib64; then SQLITE_LIBDIR=$prefix/lib64 @@ -28351,16 +28594,16 @@ if test "${with_sqlite+set}" = set; then else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Unable to find sqlite.h in standard locations" >&5 -echo "$as_me: error: Unable to find sqlite.h in standard locations" >&2;} + { { echo "$as_me:$LINENO: error: Unable to find sqlite3.h in standard locations" >&5 +echo "$as_me: error: Unable to find sqlite3.h in standard locations" >&2;} { (exit 1); exit 1; }; } fi else - if test -f $withval/sqlite.h; then + if test -f $withval/sqlite3.h; then SQLITE_INCDIR=$withval SQLITE_LIBDIR=$withval SQLITE_BINDIR=$withval - elif test -f $withval/include/sqlite.h; then + elif test -f $withval/include/sqlite3.h; then SQLITE_INCDIR=$withval/include if test -d $withval/lib64; then SQLITE_LIBDIR=$withval/lib64 @@ -28371,26 +28614,26 @@ echo "$as_me: error: Unable to find sqlite.h in standard locations" >&2;} else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Invalid SQLite directory $withval - unable to find sqlite.h under $withval" >&5 -echo "$as_me: error: Invalid SQLite directory $withval - unable to find sqlite.h under $withval" >&2;} + { { echo "$as_me:$LINENO: error: Invalid SQLite3 directory $withval - unable to find sqlite3.h under $withval" >&5 +echo "$as_me: error: Invalid SQLite3 directory $withval - unable to find sqlite3.h under $withval" >&2;} { (exit 1); exit 1; }; } fi fi SQL_INCLUDE=-I$SQLITE_INCDIR - SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite" + SQL_LFLAGS="-L$SQLITE_LIBDIR -lsqlite3" SQL_BINDIR=$SQLITE_BINDIR - SQL_LIB=$SQLITE_LIBDIR/libsqlite.a + SQL_LIB=$SQLITE_LIBDIR/libsqlite3.a cat >>confdefs.h <<\_ACEOF -#define HAVE_SQLITE 1 +#define HAVE_SQLITE3 1 _ACEOF { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } db_found=yes - support_sqlite=yes - db_type=SQLite - DB_TYPE=sqlite + support_sqlite3=yes + db_type=SQLite3 + DB_TYPE=sqlite3 else { echo "$as_me:$LINENO: result: no" >&5 @@ -28410,6 +28653,8 @@ fi +# BA_CHECK_SQLITE_DB + db_found=no { echo "$as_me:$LINENO: checking for DBI support" >&5 @@ -28471,6 +28716,12 @@ echo "$as_me: error: Unable to find dbi.h in standard locations" >&2;} else DRIVERDIR=$prefix/lib/dbd fi + elif test -d /usr/local/lib64/dbd; then + DRIVERDIR=/usr/local/lib64/dbd + elif test -d /usr/lib64/dbd; then + DRIVERDIR=/usr/lib64/dbd + elif test -d $prefix/lib64/dbd; then + DRIVERDIR=$prefix/lib64/dbd else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } @@ -28506,6 +28757,8 @@ echo "$as_me: error: Invalid DBI directory $withval - unable to find dbi.h under else DRIVERDIR=$withval/lib/dbd fi + elif test -d $withval/lib64/dbd; then + DRIVERDIR=$withval/lib64/dbd else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } @@ -28617,7 +28870,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" @@ -28657,7 +28914,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" @@ -28689,7 +28950,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" @@ -28721,7 +28986,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 @@ -28775,205 +29044,569 @@ fi fi -if test x$DB_TYPE = xpostgresql; then - A=`test -f $SQL_LIB && nm $SQL_LIB | grep PQputCopyData` - pkg=$? - if test $pkg != 0; then - support_batch_insert=no - fi -fi - -if test x$DB_TYPE = xdbi; then - DB_TYPE=$DB_PROG - db_type=$DB_PROG - pkg=1 - if test $DB_PROG = postgresql; then - A=`test -f $SQL_LIB && nm $SQL_LIB | grep PQputCopyData` - pkg=$? - fi +saved_LIBS="${LIBS}" +LIBS="${saved_LIBS} ${SQL_LFLAGS}" - if test $DB_PROG = mysql; then - A=`test -f $SQL_LIB && nm $DB_PROG_LIB | grep pthread_mutex_lock` - pkg=$? - fi - - if test $DB_PROG = sqlite3; then - A=`test -f $SQL_LIB && nm $DB_PROG_LIB | grep pthread_mutex_lock` - pkg=$? - fi - - if test $pkg = 0; then - # Check whether --enable-batch-insert was given. -if test "${enable_batch_insert+set}" = set; then - enableval=$enable_batch_insert; - if test x$enableval = xno; then - support_batch_insert=no - else - support_batch_insert=yes - fi - - -fi - - fi -else - uncomment_dbi="#" -fi - - - -if test $support_batch_insert = yes ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_BATCH_FILE_INSERT 1 -_ACEOF - -fi - -cat >>confdefs.h <<\_ACEOF -#define PROTOTYPES 1 -_ACEOF - - -if test -z "$CFLAGS" -o "$CFLAGS" = "-g -O2"; then - if test -z "$CCOPTS"; then - CCOPTS='-g -O2 -Wall' - fi - CFLAGS="$CCOPTS" -fi - - - -largefile_support="no" - - # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then - enableval=$enable_largefile; -fi - - if test "$enable_largefile" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}getconf", so it can be a program name with args. -set dummy ${ac_tool_prefix}getconf; 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_prog_GETCONF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$GETCONF"; then - ac_cv_prog_GETCONF="$GETCONF" # Let the user override the test. -else -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_prog_GETCONF="${ac_tool_prefix}getconf" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -GETCONF=$ac_cv_prog_GETCONF -if test -n "$GETCONF"; then - { echo "$as_me:$LINENO: result: $GETCONF" >&5 -echo "${ECHO_T}$GETCONF" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_GETCONF"; then - ac_ct_GETCONF=$GETCONF - # Extract the first word of "getconf", so it can be a program name with args. -set dummy getconf; 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_prog_ac_ct_GETCONF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_GETCONF"; then - ac_cv_prog_ac_ct_GETCONF="$ac_ct_GETCONF" # Let the user override the test. -else -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_prog_ac_ct_GETCONF="getconf" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_GETCONF=$ac_cv_prog_ac_ct_GETCONF -if test -n "$ac_ct_GETCONF"; then - { echo "$as_me:$LINENO: result: $ac_ct_GETCONF" >&5 -echo "${ECHO_T}$ac_ct_GETCONF" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_GETCONF" = x; then - GETCONF="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - GETCONF=$ac_ct_GETCONF - fi -else - GETCONF="$ac_cv_prog_GETCONF" -fi - - { echo "$as_me:$LINENO: checking for CFLAGS value to request large file support" >&5 -echo $ECHO_N "checking for CFLAGS value to request large file support... $ECHO_C" >&6; } -if test "${ac_cv_sys_largefile_CFLAGS+set}" = set; then +if test x$DB_TYPE = xpostgresql; then + support_batch_insert=yes + { echo "$as_me:$LINENO: checking for PQisthreadsafe in -lpq" >&5 +echo $ECHO_N "checking for PQisthreadsafe in -lpq... $ECHO_C" >&6; } +if test "${ac_cv_lib_pq_PQisthreadsafe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_sys_largefile_CFLAGS=`($GETCONF LFS_CFLAGS) 2>/dev/null` || { - ac_cv_sys_largefile_CFLAGS=no - case "$host_os" in - # IRIX 6.2 and later require cc -n32. - irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) - if test "$GCC" != yes; then - ac_cv_sys_largefile_CFLAGS=-n32 - fi - ac_save_CC="$CC" - CC="$CC $ac_cv_sys_largefile_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq $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 PQisthreadsafe (); int main () { - +return PQisthreadsafe (); + ; + 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_pq_PQisthreadsafe=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pq_PQisthreadsafe=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_pq_PQisthreadsafe" >&5 +echo "${ECHO_T}$ac_cv_lib_pq_PQisthreadsafe" >&6; } +if test $ac_cv_lib_pq_PQisthreadsafe = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_PQISTHREADSAFE 1 +_ACEOF + +fi + + { echo "$as_me:$LINENO: checking for PQputCopyData in -lpq" >&5 +echo $ECHO_N "checking for PQputCopyData in -lpq... $ECHO_C" >&6; } +if test "${ac_cv_lib_pq_PQputCopyData+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq $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 PQputCopyData (); +int +main () +{ +return PQputCopyData (); + ; + 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_pq_PQputCopyData=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pq_PQputCopyData=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_pq_PQputCopyData" >&5 +echo "${ECHO_T}$ac_cv_lib_pq_PQputCopyData" >&6; } +if test $ac_cv_lib_pq_PQputCopyData = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_PQ_COPY 1 +_ACEOF + +fi + + test "x$ac_cv_lib_pq_PQputCopyData" = "xyes" + pkg=$? + if test $pkg = 0; then + # Check whether --enable-batch-insert was given. +if test "${enable_batch_insert+set}" = set; then + enableval=$enable_batch_insert; + if test x$enableval = xno; then + support_batch_insert=no + fi + + +fi + + else + support_batch_insert=no + fi +fi + +if test x$DB_TYPE = xdbi; then + DB_TYPE=$DB_PROG + db_type=$DB_PROG + pkg=1 + if test $DB_PROG = postgresql; then + { echo "$as_me:$LINENO: checking for PQisthreadsafe in -lpq" >&5 +echo $ECHO_N "checking for PQisthreadsafe in -lpq... $ECHO_C" >&6; } +if test "${ac_cv_lib_pq_PQisthreadsafe+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq $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 PQisthreadsafe (); +int +main () +{ +return PQisthreadsafe (); + ; + 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_pq_PQisthreadsafe=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pq_PQisthreadsafe=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_pq_PQisthreadsafe" >&5 +echo "${ECHO_T}$ac_cv_lib_pq_PQisthreadsafe" >&6; } +if test $ac_cv_lib_pq_PQisthreadsafe = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_PQISTHREADSAFE 1 +_ACEOF + +fi + + { echo "$as_me:$LINENO: checking for PQputCopyData in -lpq" >&5 +echo $ECHO_N "checking for PQputCopyData in -lpq... $ECHO_C" >&6; } +if test "${ac_cv_lib_pq_PQputCopyData+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpq $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 PQputCopyData (); +int +main () +{ +return PQputCopyData (); + ; + 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_pq_PQputCopyData=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pq_PQputCopyData=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_pq_PQputCopyData" >&5 +echo "${ECHO_T}$ac_cv_lib_pq_PQputCopyData" >&6; } +if test $ac_cv_lib_pq_PQputCopyData = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_PQ_COPY 1 +_ACEOF + +fi + + test "x$ac_cv_lib_pq_PQputCopyData" = "xyes" + pkg=$? + fi + + if test $DB_PROG = mysql; then + A=`test -f $SQL_LIB && nm $DB_PROG_LIB | grep pthread_mutex_lock` + pkg=$? + fi + + if test $DB_PROG = sqlite3; then + A=`test -f $SQL_LIB && nm $DB_PROG_LIB | grep pthread_mutex_lock` + pkg=$? + { echo "$as_me:$LINENO: checking for sqlite3_threadsafe in -lsqlite3" >&5 +echo $ECHO_N "checking for sqlite3_threadsafe in -lsqlite3... $ECHO_C" >&6; } +if test "${ac_cv_lib_sqlite3_sqlite3_threadsafe+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsqlite3 $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 sqlite3_threadsafe (); +int +main () +{ +return sqlite3_threadsafe (); + ; + 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_sqlite3_sqlite3_threadsafe=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_sqlite3_sqlite3_threadsafe=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_sqlite3_sqlite3_threadsafe" >&5 +echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_threadsafe" >&6; } +if test $ac_cv_lib_sqlite3_sqlite3_threadsafe = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SQLITE3_THREADSAFE 1 +_ACEOF + +fi + + fi + + if test $pkg = 0; then + # Check whether --enable-batch-insert was given. +if test "${enable_batch_insert+set}" = set; then + enableval=$enable_batch_insert; + if test x$enableval = xno; then + support_batch_insert=no + else + support_batch_insert=yes + fi + + +fi + + fi +else + uncomment_dbi="#" +fi + +LIBS="${saved_LIBS}" + + + +if test x$DB_TYPE = xingres; then + support_batch_insert=yes +fi + +if test $support_batch_insert = yes ; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BATCH_FILE_INSERT 1 +_ACEOF + +fi + +cat >>confdefs.h <<\_ACEOF +#define PROTOTYPES 1 +_ACEOF + + +if test -z "$CFLAGS" -o "$CFLAGS" = "-g -O2"; then + if test -z "$CCOPTS"; then + CCOPTS='-g -O2 -Wall' + fi + CFLAGS="$CCOPTS" +fi + + + +largefile_support="no" + + # Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then + enableval=$enable_largefile; +fi + + if test "$enable_largefile" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}getconf", so it can be a program name with args. +set dummy ${ac_tool_prefix}getconf; 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_prog_GETCONF+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$GETCONF"; then + ac_cv_prog_GETCONF="$GETCONF" # Let the user override the test. +else +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_prog_GETCONF="${ac_tool_prefix}getconf" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +GETCONF=$ac_cv_prog_GETCONF +if test -n "$GETCONF"; then + { echo "$as_me:$LINENO: result: $GETCONF" >&5 +echo "${ECHO_T}$GETCONF" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_GETCONF"; then + ac_ct_GETCONF=$GETCONF + # Extract the first word of "getconf", so it can be a program name with args. +set dummy getconf; 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_prog_ac_ct_GETCONF+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_GETCONF"; then + ac_cv_prog_ac_ct_GETCONF="$ac_ct_GETCONF" # Let the user override the test. +else +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_prog_ac_ct_GETCONF="getconf" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_GETCONF=$ac_cv_prog_ac_ct_GETCONF +if test -n "$ac_ct_GETCONF"; then + { echo "$as_me:$LINENO: result: $ac_ct_GETCONF" >&5 +echo "${ECHO_T}$ac_ct_GETCONF" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_GETCONF" = x; then + GETCONF="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + GETCONF=$ac_ct_GETCONF + fi +else + GETCONF="$ac_cv_prog_GETCONF" +fi + + { echo "$as_me:$LINENO: checking for CFLAGS value to request large file support" >&5 +echo $ECHO_N "checking for CFLAGS value to request large file support... $ECHO_C" >&6; } +if test "${ac_cv_sys_largefile_CFLAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_sys_largefile_CFLAGS=`($GETCONF LFS_CFLAGS) 2>/dev/null` || { + ac_cv_sys_largefile_CFLAGS=no + case "$host_os" in + # IRIX 6.2 and later require cc -n32. + irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) + if test "$GCC" != yes; then + ac_cv_sys_largefile_CFLAGS=-n32 + fi + ac_save_CC="$CC" + CC="$CC $ac_cv_sys_largefile_CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + ; return 0; } @@ -30502,7 +31135,6 @@ fi - for ac_header in \ @@ -30531,7 +31163,6 @@ for ac_header in \ sys/time.h \ sys/types.h \ arpa/nameser.h \ - resolv.h \ mtio.h \ sys/mtio.h \ sys/tape.h \ @@ -32274,80 +32905,95 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $ba_cv_header_socklen_t" >&5 echo "${ECHO_T}$ba_cv_header_socklen_t" >&6; } -test $ba_cv_header_socklen_t = yes && cat >>confdefs.h <<\_ACEOF +test $ba_cv_header_socklen_t = yes && +cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKLEN_T 1 _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 +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +{ echo "$as_me:$LINENO: checking for ioctl_req_t" >&5 +echo $ECHO_N "checking for ioctl_req_t... $ECHO_C" >&6; } +if test "${ba_cv_header_ioctl_req_t+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 + 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);} + #include + #include + #include +int +main () +{ + + int (*d_ioctl)(int fd, unsigned long int request, ...); + d_ioctl = ::ioctl; + + ; + return 0; +} _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" +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_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 + (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); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then - ba_cv_bigendian=yes + ba_cv_header_ioctl_req_t=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) - ba_cv_bigendian=no + ba_cv_header_ioctl_req_t=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 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 +{ echo "$as_me:$LINENO: result: $ba_cv_header_ioctl_req_t" >&5 +echo "${ECHO_T}$ba_cv_header_ioctl_req_t" >&6; } +test $ba_cv_header_ioctl_req_t = yes && +cat >>confdefs.h <<\_ACEOF +#define HAVE_IOCTL_ULINT_REQUEST 1 _ACEOF +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -32537,6 +33183,247 @@ _ACEOF fi +{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # See if sys/param.h defines the BYTE_ORDER macro. +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 () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ + && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) + bogus endian macros +#endif + + ; + 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 + # It does; now see whether it defined to BIG_ENDIAN or not. +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 () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif + + ; + 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_c_bigendian=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_bigendian=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # It does not; compile a test program. +if test "$cross_compiling" = yes; then + # try to guess the endianness by grepping values into an object file + ac_cv_c_bigendian=unknown + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } +short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } +int +main () +{ + _ascii (); _ebcdic (); + ; + 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 + if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + ac_cv_c_bigendian=yes +fi +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi +fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +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 +int +main () +{ + + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; +} +_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 + ac_cv_c_bigendian=no +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 ) +ac_cv_c_bigendian=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } +case $ac_cv_c_bigendian in + yes) + +cat >>confdefs.h <<\_ACEOF +#define HAVE_BIG_ENDIAN 1 +_ACEOF + ;; + no) + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LITTLE_ENDIAN 1 +_ACEOF + ;; + *) + { { echo "$as_me:$LINENO: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +echo "$as_me: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + { (exit 1); exit 1; }; } ;; +esac + + { echo "$as_me:$LINENO: checking how to get filesystem type" >&5 echo $ECHO_N "checking how to get filesystem type... $ECHO_C" >&6; } fstype=no @@ -33429,9 +34316,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 @@ -33441,7 +34329,237 @@ 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 () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + 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_type_intptr_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + 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_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 intptr_t $ac_type +_ACEOF + + ac_type= +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +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 +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef uintptr_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + 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_type_uintptr_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + 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_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 uintptr_t $ac_type +_ACEOF + + ac_type= +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +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 +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef ino_t ac__type_new_; int main () { @@ -39746,6 +40864,103 @@ else fi + +for ac_func in getmntinfo +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 + cat >>confdefs.h <<\_ACEOF +#define HAVE_GETMNTINFO 1 +_ACEOF + +fi +done + { echo "$as_me:$LINENO: checking whether closedir returns void" >&5 echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6; } if test "${ac_cv_func_closedir_void+set}" = set; then @@ -40231,11 +41446,11 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6; } if test $ac_cv_lib_z_deflate = yes; then - FDLIBS="-lz" + ZLIBS="-lz" fi have_zlib=no -if test x$FDLIBS = x-lz; then +if test x$ZLIBS = x-lz; then cat >>confdefs.h <<\_ACEOF #define HAVE_LIBZ 1 _ACEOF @@ -40243,11 +41458,236 @@ _ACEOF have_zlib=yes fi -support_acl=yes + +AFS_CFLAGS="" +AFS_LIBS="" +support_afs=auto +# Check whether --enable-afs was given. +if test "${enable_afs+set}" = set; then + enableval=$enable_afs; + if test x$enableval = xyes; then + support_afs=yes + elif test x$enableval = xno; then + support_afs=no + fi + + +fi + + +have_afs=no +if test x$support_afs = xyes -o x$support_afs = xauto; then + +# Check whether --with-afsdir was given. +if test "${with_afsdir+set}" = set; then + withval=$with_afsdir; with_afsdir=$withval + +fi + + + if test x$with_afsdir = x; then + for root in /usr /usr/local; do + if test -d ${root}/include/afs/ ; then + with_afsdir=${root} + break + fi + done + fi + + AFS_CFLAGS="-I${with_afsdir}/include" + + saved_CFLAGS="${CFLAGS}" + CFLAGS="${AFS_CFLAGS} ${saved_CFLAGS}" + + +for ac_header in afs/stds.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header 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 <$ac_header> +_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 $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header 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 <$ac_header> +_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: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + CFLAGS="${saved_CFLAGS}" + + for dir in ${with_afsdir}/lib ${with_afsdir}/lib/afs + do + for arch_type in .a .so + do + A=`test -f ${dir}/libsys${arch_type} && nm ${dir}/libsys${arch_type} | grep pioctl` + pkg=$? + if test $pkg = 0; then + have_afs=yes + AFS_LIBS="-L${dir} -lsys -lrx -llwp ${dir}/util.a" + break + fi + done + done + + if test x$support_afs = xyes -a $have_afs != yes; then + { { echo "$as_me:$LINENO: error: afs support explicitly enabled but no supported afs implementation found, + please either load the afs libraries or rerun configure without --enable-afs" >&5 +echo "$as_me: error: afs support explicitly enabled but no supported afs implementation found, + please either load the afs libraries or rerun configure without --enable-afs" >&2;} + { (exit 1); exit 1; }; } + else + if test $have_afs = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_AFS 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_AFS_ACL 1 +_ACEOF + + fi + fi +fi + + + + +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 @@ -40257,7 +41697,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; } @@ -40475,11 +41915,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 @@ -40542,12 +41982,20 @@ 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; + if test $have_afs = yes; then + if test -d /usr/lib64/; then + FDLIBS="-L/usr/lib64 -lacl $FDLIBS" + else + FDLIBS="-L/usr/lib -lacl $FDLIBS" + fi + else + FDLIBS="-lacl $FDLIBS" + fi 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 @@ -40610,12 +42058,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 @@ -40678,10 +42126,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 @@ -40744,7 +42192,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 @@ -40765,27 +42213,40 @@ fi fi - if test $have_acl = yes; then - cat >>confdefs.h <<\_ACEOF + + 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 1 _ACEOF - fi + fi - if test $have_extended_acl = yes; then - cat >>confdefs.h <<\_ACEOF + if test $have_extended_acl = yes; then + +cat >>confdefs.h <<\_ACEOF #define HAVE_EXTENDED_ACL 1 _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 @@ -40793,19 +42254,19 @@ fi have_xattr=no -if test x$support_xattr = xyes; 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; } -if test "${ac_cv_header_sys_xattr_h+set}" = set; then +if test x$support_xattr = xyes -o x$support_xattr = xauto; then + if test "${ac_cv_header_sys_extattr_h+set}" = set; then + { echo "$as_me:$LINENO: checking for sys/extattr.h" >&5 +echo $ECHO_N "checking for sys/extattr.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_extattr_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_xattr_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_extattr_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_extattr_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking sys/xattr.h usability" >&5 -echo $ECHO_N "checking sys/xattr.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sys/extattr.h usability" >&5 +echo $ECHO_N "checking sys/extattr.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -40813,7 +42274,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -40845,15 +42306,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking sys/xattr.h presence" >&5 -echo $ECHO_N "checking sys/xattr.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking sys/extattr.h presence" >&5 +echo $ECHO_N "checking sys/extattr.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 +#include _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -40886,43 +42347,177 @@ 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/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sys/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/xattr.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sys/xattr.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/extattr.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sys/extattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/extattr.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sys/extattr.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sys/xattr.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sys/xattr.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/xattr.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sys/xattr.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/xattr.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sys/xattr.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/xattr.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sys/xattr.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/extattr.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sys/extattr.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/extattr.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sys/extattr.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/extattr.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sys/extattr.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/extattr.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sys/extattr.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/extattr.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sys/extattr.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/extattr.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/extattr.h: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for sys/xattr.h" >&5 -echo $ECHO_N "checking for sys/xattr.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_xattr_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for sys/extattr.h" >&5 +echo $ECHO_N "checking for sys/extattr.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_extattr_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_sys_xattr_h=$ac_header_preproc + ac_cv_header_sys_extattr_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_xattr_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_extattr_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_extattr_h" >&6; } fi -if test $ac_cv_header_sys_xattr_h = yes; then +if test $ac_cv_header_sys_extattr_h = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_XATTR_H 1 +#define HAVE_SYS_EXTATTR_H 1 +_ACEOF + +fi + + + if test "${ac_cv_header_libutil_h+set}" = set; then + { echo "$as_me:$LINENO: checking for libutil.h" >&5 +echo $ECHO_N "checking for libutil.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libutil_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_libutil_h" >&5 +echo "${ECHO_T}$ac_cv_header_libutil_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking libutil.h usability" >&5 +echo $ECHO_N "checking libutil.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 libutil.h presence" >&5 +echo $ECHO_N "checking libutil.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: libutil.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: libutil.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: libutil.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: libutil.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: libutil.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: libutil.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: libutil.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: libutil.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: libutil.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: libutil.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: libutil.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: libutil.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: libutil.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: libutil.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: libutil.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: libutil.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for libutil.h" >&5 +echo $ECHO_N "checking for libutil.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libutil_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_libutil_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_libutil_h" >&5 +echo "${ECHO_T}$ac_cv_header_libutil_h" >&6; } + +fi +if test $ac_cv_header_libutil_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBUTIL_H 1 _ACEOF fi @@ -40931,7 +42526,7 @@ fi -for ac_func in llistxattr lgetxattr lsetxattr +for ac_func in extattr_get_link extattr_set_link extattr_list_link do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -41021,26 +42616,33 @@ 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_EXTATTR_GET_LINK 1 _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_LGETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_SET_LINK 1 _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_LSETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_LIST_LINK 1 _ACEOF -else + +fi +done + if test $have_xattr = no; then -for ac_func in listxattr getxattr setxattr + +for ac_func in extattr_get_file extattr_set_file extattr_list_file do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -41130,17 +42732,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_EXTATTR_GET_FILE 1 _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_GETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_SET_FILE 1 _ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_SETXATTR 1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_LIST_FILE 1 _ACEOF @@ -41148,28 +42753,127 @@ _ACEOF fi done + fi + + if test $have_xattr = yes; then + have_extattr_string_in_libc=no + + +for ac_func in extattr_namespace_to_string extattr_string_to_namespace +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 -done +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_extattr_string_in_libc=yes - if test $have_xattr = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_XATTR 1 +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_NAMESPACE_TO_STRING 1 _ACEOF - fi + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_STRING_TO_NAMESPACE 1 +_ACEOF + + + fi +done -PTHREAD_LIB="" -{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + + if test $have_extattr_string_in_libc = no; then + { echo "$as_me:$LINENO: checking for extattr_namespace_to_string extattr_string_to_namespace in -lutil" >&5 +echo $ECHO_N "checking for extattr_namespace_to_string extattr_string_to_namespace in -lutil... $ECHO_C" >&6; } +if test "${ac_cv_lib_util_extattr_namespace_to_string_extattr_string_to_namespace+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" +LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -41183,11 +42887,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char pthread_create (); +char extattr_namespace_to_string extattr_string_to_namespace (); int main () { -return pthread_create (); +return extattr_namespace_to_string extattr_string_to_namespace (); ; return 0; } @@ -41210,37 +42914,208 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthread_pthread_create=yes + ac_cv_lib_util_extattr_namespace_to_string_extattr_string_to_namespace=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pthread_pthread_create=no + ac_cv_lib_util_extattr_namespace_to_string_extattr_string_to_namespace=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_pthread_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; } -if test $ac_cv_lib_pthread_pthread_create = yes; then - PTHREAD_LIB="-lpthread" -else +{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_extattr_namespace_to_string_extattr_string_to_namespace" >&5 +echo "${ECHO_T}$ac_cv_lib_util_extattr_namespace_to_string_extattr_string_to_namespace" >&6; } +if test $ac_cv_lib_util_extattr_namespace_to_string_extattr_string_to_namespace = yes; then - { echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5 -echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6; } -if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_NAMESPACE_TO_STRING 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_STRING_TO_NAMESPACE 1 +_ACEOF + + FDLIBS="-lutil $FDLIBS" + + +fi + + fi + fi + + if test $have_xattr = no; 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; } +if test "${ac_cv_header_sys_xattr_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_xattr_h" >&6; } else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthreads $LIBS" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking sys/xattr.h usability" >&5 +echo $ECHO_N "checking sys/xattr.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/xattr.h presence" >&5 +echo $ECHO_N "checking sys/xattr.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/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sys/xattr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/xattr.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sys/xattr.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sys/xattr.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sys/xattr.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/xattr.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sys/xattr.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/xattr.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sys/xattr.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/xattr.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sys/xattr.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sys/xattr.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sys/xattr.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for sys/xattr.h" >&5 +echo $ECHO_N "checking for sys/xattr.h... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_xattr_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_sys_xattr_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_xattr_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_xattr_h" >&6; } + +fi +if test $ac_cv_header_sys_xattr_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SYS_XATTR_H 1 +_ACEOF + +fi + + + + + +for ac_func in llistxattr lgetxattr lsetxattr +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 @@ -41248,11 +43123,1376 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char pthread_create (); +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 pthread_create (); +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_LLISTXATTR 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LGETXATTR 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LSETXATTR 1 +_ACEOF + + + +fi +done + + + if test $have_xattr = no; then + + + +for ac_func in listxattr getxattr setxattr +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_LISTXATTR 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GETXATTR 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_SETXATTR 1 +_ACEOF + + + +fi +done + + fi + fi + + 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 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FSTATAT 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_UNLINKAT 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FCHOWNAT 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_FUTIMESAT 1 +_ACEOF + + + +fi +done + + + 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 + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_NVLIST_NEXT_NVPAIR 1 +_ACEOF + + 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-xattr" >&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-xattr" >&2;} + { (exit 1); exit 1; }; } + else + if test $have_xattr = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XATTR 1 +_ACEOF + + fi + fi +fi + +PTHREAD_LIB="" +{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $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 pthread_create (); +int +main () +{ +return pthread_create (); + ; + 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_pthread_pthread_create=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pthread_pthread_create=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_pthread_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; } +if test $ac_cv_lib_pthread_pthread_create = yes; then + PTHREAD_LIB="-lpthread" +else + + { echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5 +echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6; } +if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthreads $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 pthread_create (); +int +main () +{ +return pthread_create (); + ; + 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_pthreads_pthread_create=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pthreads_pthread_create=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_pthreads_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_create" >&6; } +if test $ac_cv_lib_pthreads_pthread_create = yes; then + PTHREAD_LIB="-lpthreads" +else + + { echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5 +echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; } +if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc_r $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 pthread_create (); +int +main () +{ +return pthread_create (); + ; + 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_c_r_pthread_create=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_c_r_pthread_create=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_c_r_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6; } +if test $ac_cv_lib_c_r_pthread_create = yes; then + PTHREAD_LIB="-lc_r" +else + + { echo "$as_me:$LINENO: checking for pthread_create" >&5 +echo $ECHO_N "checking for pthread_create... $ECHO_C" >&6; } +if test "${ac_cv_func_pthread_create+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 pthread_create to an innocuous variant, in case declares pthread_create. + For example, HP-UX 11i declares gettimeofday. */ +#define pthread_create innocuous_pthread_create + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char pthread_create (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef pthread_create + +/* 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 pthread_create (); +/* 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_pthread_create || defined __stub___pthread_create +choke me +#endif + +int +main () +{ +return pthread_create (); + ; + 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_func_pthread_create=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_pthread_create=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_func_pthread_create" >&6; } + + + +fi + + + +fi + + + +fi + + + + +for ac_header in sys/prctl.h sys/capability.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header 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 <$ac_header> +_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 $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header 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 <$ac_header> +_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: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + +for ac_func in prctl setreuid +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 + +fi +done + +{ echo "$as_me:$LINENO: checking for cap_set_proc in -lcap" >&5 +echo $ECHO_N "checking for cap_set_proc in -lcap... $ECHO_C" >&6; } +if test "${ac_cv_lib_cap_cap_set_proc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcap $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 cap_set_proc (); +int +main () +{ +return cap_set_proc (); ; return 0; } @@ -41275,180 +44515,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthreads_pthread_create=yes + ac_cv_lib_cap_cap_set_proc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pthreads_pthread_create=no + ac_cv_lib_cap_cap_set_proc=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_pthreads_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_create" >&6; } -if test $ac_cv_lib_pthreads_pthread_create = yes; then - PTHREAD_LIB="-lpthreads" -else - - { echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5 -echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; } -if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc_r $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 pthread_create (); -int -main () -{ -return pthread_create (); - ; - 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_c_r_pthread_create=yes +{ echo "$as_me:$LINENO: result: $ac_cv_lib_cap_cap_set_proc" >&5 +echo "${ECHO_T}$ac_cv_lib_cap_cap_set_proc" >&6; } +if test $ac_cv_lib_cap_cap_set_proc = yes; then + CAP_LIBS="-lcap" else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_c_r_pthread_create=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 + CAP_LIBS= fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6; } -if test $ac_cv_lib_c_r_pthread_create = yes; then - PTHREAD_LIB="-lc_r" -else - { echo "$as_me:$LINENO: checking for pthread_create" >&5 -echo $ECHO_N "checking for pthread_create... $ECHO_C" >&6; } -if test "${ac_cv_func_pthread_create+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 pthread_create to an innocuous variant, in case declares pthread_create. - For example, HP-UX 11i declares gettimeofday. */ -#define pthread_create innocuous_pthread_create - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_create (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef pthread_create - -/* 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 pthread_create (); -/* 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_pthread_create || defined __stub___pthread_create -choke me -#endif +if test x$CAP_LIBS = x-lcap; then -int -main () -{ -return pthread_create (); - ; - return 0; -} +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBCAP 1 _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_func_pthread_create=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_pthread_create=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_create" >&6; } - - - -fi - - - -fi - - fi @@ -41498,10 +44589,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` @@ -41552,11 +44649,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 @@ -41590,10 +44691,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 @@ -41656,10 +44753,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 @@ -41679,15 +44772,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" @@ -41697,14 +44785,9 @@ mandrake) platforms/mandrake/bacula-fd \ platforms/mandrake/bacula-sd \ platforms/mandrake/bacula-dir \ - platforms/mandrake/bacula.spec \ " ;; 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" @@ -41716,10 +44799,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" @@ -41745,13 +44824,9 @@ solaris) _ACEOF fi - LIBS="$LIBS -lresolv" + LIBS="$LIBS -lresolv -lrt" ;; 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" @@ -41761,14 +44836,9 @@ suse) platforms/suse/bacula-fd \ platforms/suse/bacula-sd \ platforms/suse/bacula-dir \ - platforms/suse/bacula \ - platforms/suse/bacula.spec" + platforms/suse/bacula" ;; 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" @@ -41823,7 +44893,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/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.pl 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_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/create_ingres_database src/cats/update_ingres_tables src/cats/make_ingres_tables src/cats/grant_ingres_privileges src/cats/drop_ingres_tables src/cats/drop_ingres_database src/cats/sqlite src/cats/mysql 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_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 examples/nagios/check_bacula/Makefile $PFILES" ac_config_commands="$ac_config_commands default" @@ -42791,8 +45861,6 @@ do "src/host.h") CONFIG_FILES="$CONFIG_FILES src/host.h" ;; "src/console/Makefile") CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;; "src/console/bconsole.conf") CONFIG_FILES="$CONFIG_FILES src/console/bconsole.conf" ;; - "src/gnome2-console/Makefile") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/Makefile" ;; - "src/gnome2-console/bgnome-console.conf") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/bgnome-console.conf" ;; "src/qt-console/bat.conf") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.conf" ;; "src/qt-console/bat.pro") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro" ;; "src/qt-console/bat.pro.mingw32") CONFIG_FILES="$CONFIG_FILES src/qt-console/bat.pro.mingw32" ;; @@ -42809,6 +45877,7 @@ do "src/filed/Makefile") CONFIG_FILES="$CONFIG_FILES src/filed/Makefile" ;; "src/filed/bacula-fd.conf") CONFIG_FILES="$CONFIG_FILES src/filed/bacula-fd.conf" ;; "src/cats/Makefile") CONFIG_FILES="$CONFIG_FILES src/cats/Makefile" ;; + "src/cats/make_catalog_backup.pl") CONFIG_FILES="$CONFIG_FILES src/cats/make_catalog_backup.pl" ;; "src/cats/make_catalog_backup") CONFIG_FILES="$CONFIG_FILES src/cats/make_catalog_backup" ;; "src/cats/delete_catalog_backup") CONFIG_FILES="$CONFIG_FILES src/cats/delete_catalog_backup" ;; "src/cats/create_postgresql_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_postgresql_database" ;; @@ -42823,26 +45892,20 @@ do "src/cats/grant_mysql_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_mysql_privileges" ;; "src/cats/drop_mysql_tables") CONFIG_FILES="$CONFIG_FILES src/cats/drop_mysql_tables" ;; "src/cats/drop_mysql_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_mysql_database" ;; - "src/cats/create_sqlite_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_sqlite_database" ;; - "src/cats/update_sqlite_tables") CONFIG_FILES="$CONFIG_FILES src/cats/update_sqlite_tables" ;; - "src/cats/make_sqlite_tables") CONFIG_FILES="$CONFIG_FILES src/cats/make_sqlite_tables" ;; - "src/cats/grant_sqlite_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_sqlite_privileges" ;; - "src/cats/drop_sqlite_tables") CONFIG_FILES="$CONFIG_FILES src/cats/drop_sqlite_tables" ;; - "src/cats/drop_sqlite_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_sqlite_database" ;; "src/cats/create_sqlite3_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_sqlite3_database" ;; "src/cats/update_sqlite3_tables") CONFIG_FILES="$CONFIG_FILES src/cats/update_sqlite3_tables" ;; "src/cats/make_sqlite3_tables") CONFIG_FILES="$CONFIG_FILES src/cats/make_sqlite3_tables" ;; "src/cats/grant_sqlite3_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_sqlite3_privileges" ;; "src/cats/drop_sqlite3_tables") CONFIG_FILES="$CONFIG_FILES src/cats/drop_sqlite3_tables" ;; "src/cats/drop_sqlite3_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_sqlite3_database" ;; + "src/cats/create_ingres_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_ingres_database" ;; + "src/cats/update_ingres_tables") CONFIG_FILES="$CONFIG_FILES src/cats/update_ingres_tables" ;; + "src/cats/make_ingres_tables") CONFIG_FILES="$CONFIG_FILES src/cats/make_ingres_tables" ;; + "src/cats/grant_ingres_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_ingres_privileges" ;; + "src/cats/drop_ingres_tables") CONFIG_FILES="$CONFIG_FILES src/cats/drop_ingres_tables" ;; + "src/cats/drop_ingres_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_ingres_database" ;; "src/cats/sqlite") CONFIG_FILES="$CONFIG_FILES src/cats/sqlite" ;; "src/cats/mysql") CONFIG_FILES="$CONFIG_FILES src/cats/mysql" ;; - "src/cats/create_bdb_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_bdb_database" ;; - "src/cats/update_bdb_tables") CONFIG_FILES="$CONFIG_FILES src/cats/update_bdb_tables" ;; - "src/cats/make_bdb_tables") CONFIG_FILES="$CONFIG_FILES src/cats/make_bdb_tables" ;; - "src/cats/grant_bdb_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_bdb_privileges" ;; - "src/cats/drop_bdb_tables") CONFIG_FILES="$CONFIG_FILES src/cats/drop_bdb_tables" ;; - "src/cats/drop_bdb_database") CONFIG_FILES="$CONFIG_FILES src/cats/drop_bdb_database" ;; "src/cats/create_bacula_database") CONFIG_FILES="$CONFIG_FILES src/cats/create_bacula_database" ;; "src/cats/update_bacula_tables") CONFIG_FILES="$CONFIG_FILES src/cats/update_bacula_tables" ;; "src/cats/grant_bacula_privileges") CONFIG_FILES="$CONFIG_FILES src/cats/grant_bacula_privileges" ;; @@ -42854,11 +45917,18 @@ 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_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" ;; - "updatedb/update_sqlite_tables_10_to_11") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite_tables_10_to_11" ;; + "updatedb/update_mysql_tables_11_to_12") CONFIG_FILES="$CONFIG_FILES updatedb/update_mysql_tables_11_to_12" ;; + "updatedb/update_sqlite3_tables_11_to_12") CONFIG_FILES="$CONFIG_FILES updatedb/update_sqlite3_tables_11_to_12" ;; + "updatedb/update_postgresql_tables_11_to_12") CONFIG_FILES="$CONFIG_FILES updatedb/update_postgresql_tables_11_to_12" ;; + "examples/nagios/check_bacula/Makefile") CONFIG_FILES="$CONFIG_FILES examples/nagios/check_bacula/Makefile" ;; "$PFILES") CONFIG_FILES="$CONFIG_FILES $PFILES" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; @@ -42967,6 +46037,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 @@ -42974,6 +46047,12 @@ DATE!$DATE$ac_delim LSMDATE!$LSMDATE$ac_delim BACULA!$BACULA$ac_delim post_host!$post_host$ac_delim +BDB_VERSION!$BDB_VERSION$ac_delim +LIBBAC_LT_RELEASE!$LIBBAC_LT_RELEASE$ac_delim +LIBBACCFG_LT_RELEASE!$LIBBACCFG_LT_RELEASE$ac_delim +LIBBACPY_LT_RELEASE!$LIBBACPY_LT_RELEASE$ac_delim +LIBBACSQL_LT_RELEASE!$LIBBACSQL_LT_RELEASE$ac_delim +LIBBACFIND_LT_RELEASE!$LIBBACFIND_LT_RELEASE$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim LDFLAGS!$LDFLAGS$ac_delim @@ -43008,20 +46087,11 @@ DVDRWMEDIAINFO!$DVDRWMEDIAINFO$ac_delim 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 PIDOF!$PIDOF$ac_delim -AWK!$AWK$ac_delim -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 @@ -43067,6 +46137,15 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +AWK!$AWK$ac_delim +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 build_cpu!$build_cpu$ac_delim build_vendor!$build_vendor$ac_delim build_os!$build_os$ac_delim @@ -43097,6 +46176,7 @@ LIBTOOL_INSTALL_TARGET!$LIBTOOL_INSTALL_TARGET$ac_delim LIBTOOL_UNINSTALL_TARGET!$LIBTOOL_UNINSTALL_TARGET$ac_delim LIBTOOL_CLEAN_TARGET!$LIBTOOL_CLEAN_TARGET$ac_delim QMAKE_LIBTOOL!$QMAKE_LIBTOOL$ac_delim +FD_PLUGIN_DIR!$FD_PLUGIN_DIR$ac_delim INCLUDE_INSTALL_TARGET!$INCLUDE_INSTALL_TARGET$ac_delim INCLUDE_UNINSTALL_TARGET!$INCLUDE_UNINSTALL_TARGET$ac_delim HAVE_SUN_OS_TRUE!$HAVE_SUN_OS_TRUE$ac_delim @@ -43153,17 +46233,7 @@ INSTOBJEXT!$INSTOBJEXT$ac_delim GENCAT!$GENCAT$ac_delim INTLOBJS!$INTLOBJS$ac_delim INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim -GNOME_INCLUDEDIR!$GNOME_INCLUDEDIR$ac_delim -GNOMEUI_LIBS!$GNOMEUI_LIBS$ac_delim -GNOME_LIBDIR!$GNOME_LIBDIR$ac_delim -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 @@ -43205,6 +46275,11 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim WX_DIR!$WX_DIR$ac_delim TRAY_MONITOR_CPPFLAGS!$TRAY_MONITOR_CPPFLAGS$ac_delim @@ -43233,7 +46308,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 @@ -43277,6 +46356,10 @@ X_PRE_LIBS!$X_PRE_LIBS$ac_delim X_LIBS!$X_LIBS$ac_delim X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim LIBOBJS!$LIBOBJS$ac_delim +ZLIBS!$ZLIBS$ac_delim +AFS_CFLAGS!$AFS_CFLAGS$ac_delim +AFS_LIBS!$AFS_LIBS$ac_delim +CAP_LIBS!$CAP_LIBS$ac_delim FDLIBS!$FDLIBS$ac_delim DEBUG!$DEBUG$ac_delim DINCLUDE!$DINCLUDE$ac_delim @@ -43286,17 +46369,57 @@ 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 +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF MACOSX!$MACOSX$ac_delim DISTNAME!$DISTNAME$ac_delim 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` = 4; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -43314,7 +46437,7 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' @@ -43577,7 +46700,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 -f "$tmp/subs-4.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && @@ -44649,22 +47772,20 @@ 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 + if test "x$QMAKE" = "xnone"; then + { { echo "$as_me:$LINENO: error: Could not find qmake $PATH. Check your Qt installation" >&5 +echo "$as_me: error: Could not find qmake $PATH. Check your Qt installation" >&2;} + { (exit 1); exit 1; }; } fi QMAKEBIN="qmake" - - if test "x$QMAKEQT4" != "xnone"; then - QMAKEBIN=qmake-qt4 - fi - cd src/qt-console - chmod 755 install_conf_file build-depkgs-qt-console echo "Creating bat Makefile" + touch bat + chmod 755 bat + rm -f Makefile $QMAKEBIN - make clean + ${MAKE:-make} clean cd ${BUILD_DIR} fi @@ -44673,6 +47794,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 @@ -44681,29 +47806,30 @@ cd .. c=updatedb chmod 755 $c/update_mysql_tables_10_to_11 $c/update_sqlite3_tables_10_to_11 -chmod 755 $c/update_postgresql_tables_10_to_11 $c/update_sqlite_tables_10_to_11 +chmod 755 $c/update_postgresql_tables_10_to_11 +chmod 755 $c/update_mysql_tables_11_to_12 $c/update_sqlite3_tables_11_to_12 +chmod 755 $c/update_postgresql_tables_11_to_12 + c=src/cats chmod 755 $c/create_bacula_database $c/update_bacula_tables $c/make_bacula_tables chmod 755 $c/grant_bacula_privileges $c/drop_bacula_tables $c/drop_bacula_database -chmod 755 $c/create_bdb_database $c/update_bdb_tables $c/make_bdb_tables -chmod 755 $c/grant_bdb_privileges $c/drop_bdb_tables $c/drop_bdb_database - chmod 755 $c/create_mysql_database $c/update_mysql_tables $c/make_mysql_tables chmod 755 $c/grant_mysql_privileges $c/drop_mysql_tables $c/drop_mysql_database -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 -chmod 755 $c/make_catalog_backup $c/delete_catalog_backup +chmod 755 $c/create_ingres_database $c/update_ingres_tables $c/make_ingres_tables +chmod 755 $c/grant_ingres_privileges $c/drop_ingres_tables $c/drop_ingres_database + + +chmod 755 $c/make_catalog_backup $c/delete_catalog_backup $c/make_catalog_backup.pl chmod 755 $c/sqlite chmod 755 $c/mysql @@ -44728,13 +47854,13 @@ fi echo " " echo "Cleaning up" echo " " -make clean +${MAKE:-make} clean if test "x${db_type}" = "xInternal" ; then echo " " echo " " echo "You have not specified either --enable-client-only or one of the" - echo " supported databases: MySQL, PostgreSQL, SQLite3, SQLite or DBI." + echo " supported databases: MySQL, PostgreSQL, Ingres, SQLite3 or DBI." echo " This is not permitted. Please reconfigure." echo " " echo "Aborting the configuration ..." @@ -44759,7 +47885,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} @@ -44801,19 +47927,42 @@ 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-lockmgr: ${support_lockmgr} + bat support: ${support_bat} enable-gnome: ${support_gnome} ${gnome_version} enable-bwx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} client-only: ${build_client_only} build-dird: ${build_dird} build-stored: ${build_stored} + Plugin support: ${have_plugins} + AFS support: ${have_afs} ACL support: ${have_acl} - XATTR support: ${have_xattr} + XATTR support: ${have_xattr} Python support: ${support_python} ${PYTHON_LIBS} Batch insert enabled: ${support_batch_insert} " > config.out +# create a small shell script useful for support with +# configure options and config.out info +cat > scripts/bacula_config << EOF +#!/bin/sh +cat << __EOC__ +$ $0 $ac_configure_args +EOF +cat config.out >> scripts/bacula_config +echo __EOC__ >> scripts/bacula_config +chmod 755 scripts/bacula_config + cat config.out + +# Display a warning message if postgresql client lib is <= 8.1 +if test x$DB_TYPE = xpostgresql -a x$ac_cv_lib_pq_PQisthreadsafe != xyes \ + -a x$support_batch_insert = xyes +then + echo "WARNING: Your PostgreSQL client library is too old to detect " + echo " if it was compiled with --enable-thread-safety, consider to" + echo " upgrade it in order to avoid problems with Batch insert mode" + echo +fi