X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=bacula%2Fconfigure;h=0d5a6cef400ad106f93ab55c86ad79cbb22982aa;hb=95c60dcb53e518d700211dfbda0ce1884a9841e3;hp=06d1318fe876c0dd0d9aebeb231c7e17bd0b8d39;hpb=48b8146529d3a41c8d47ecd92d54d3398a4ca127;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index 06d1318fe8..0d5a6cef40 100755 --- a/bacula/configure +++ b/bacula/configure @@ -946,11 +946,6 @@ INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX -GNOME_INCLUDEDIR -GNOMEUI_LIBS -GNOME_LIBDIR -GNOME_LIBS -GNOME_DIR BAT_DIR QWT_INC QWT_LDFLAGS @@ -986,6 +981,7 @@ OPENSSL_INC working_dir archivedir basename +hostname scriptdir bsrdir logdir @@ -1032,6 +1028,7 @@ X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS +CAP_LIBS FDLIBS DEBUG DINCLUDE @@ -1041,7 +1038,6 @@ WCFLAGS WLDFLAGS WRAPLIBS OBJLIST -hostname TAPEDRIVE PSCMD WIN32 @@ -1698,6 +1694,7 @@ Optional Packages: --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 @@ -5994,13 +5991,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:5997: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5994: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6000: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5997: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6003: output\"" >&5) + (eval echo "\"\$as_me:6000: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7221,7 +7218,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7224 "configure"' > conftest.$ac_ext + echo '#line 7221 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9436,11 +9433,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:9439: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9436: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9443: \$? = $ac_status" >&5 + echo "$as_me:9440: \$? = $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. @@ -9775,11 +9772,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:9778: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9775: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9782: \$? = $ac_status" >&5 + echo "$as_me:9779: \$? = $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. @@ -9880,11 +9877,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:9883: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9880: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9887: \$? = $ac_status" >&5 + echo "$as_me:9884: \$? = $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 @@ -9935,11 +9932,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:9938: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9935: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9942: \$? = $ac_status" >&5 + echo "$as_me:9939: \$? = $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 @@ -12691,7 +12688,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12694 "configure" +#line 12691 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12787,7 +12784,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12790 "configure" +#line 12787 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14799,11 +14796,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:14802: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14799: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14806: \$? = $ac_status" >&5 + echo "$as_me:14803: \$? = $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. @@ -14898,11 +14895,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:14901: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14898: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14905: \$? = $ac_status" >&5 + echo "$as_me:14902: \$? = $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 @@ -14950,11 +14947,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:14953: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14950: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14957: \$? = $ac_status" >&5 + echo "$as_me:14954: \$? = $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 @@ -16407,6 +16404,9 @@ then elif test -f /etc/slackware-version then DISTNAME=slackware +elif test x$host_vendor = xapple +then + DISTNAME=osx elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin then DISTNAME=darwin @@ -24041,26 +24041,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 @@ -24274,8 +24262,11 @@ 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 "Libtool is enabled, not compatible with static tools, please rerun configure with --disable-libtool" - exit 1 + { { 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 @@ -24295,8 +24286,11 @@ 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 "Libtool is enabled, not compatible with static tools, please rerun configure with --disable-libtool" - exit 1 + { { 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 @@ -24316,8 +24310,11 @@ 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 "Libtool is enabled, not compatible with static tools, please rerun configure with --disable-libtool" - exit 1 + { { 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 @@ -24337,8 +24334,11 @@ 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 "Libtool is enabled, not compatible with static tools, please rerun configure with --disable-libtool" - exit 1 + { { 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 @@ -24358,8 +24358,11 @@ 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 "Libtool is enabled, not compatible with static tools, please rerun configure with --disable-libtool" - exit 1 + { { 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 @@ -26227,38 +26230,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 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}" + 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 @@ -26776,8 +26787,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 @@ -26861,6 +26870,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 @@ -27234,6 +27245,11 @@ else OPENSSL_INC="" fi +if test "$support_tls" = "no"; then + OPENSSL_LIBS="" + OPENSSL_INC="" +fi + { echo "$as_me:$LINENO: result: $support_tls" >&5 echo "${ECHO_T}$support_tls" >&6; } @@ -27368,6 +27384,24 @@ 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}` @@ -32428,75 +32462,6 @@ test $ba_cv_header_socklen_t = yes && cat >>confdefs.h <<\_ACEOF _ACEOF -{ echo "$as_me:$LINENO: checking for bigendian" >&5 -echo $ECHO_N "checking for bigendian... $ECHO_C" >&6; } -if test "${ba_cv_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test "$cross_compiling" = yes; then - - ba_cv_bigendian=no - - -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - main(){long a=1L; char *p=(char *)&a; exit(*p);} - -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - ba_cv_bigendian=yes - -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) - - ba_cv_bigendian=no - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - - -fi -{ echo "$as_me:$LINENO: result: $ba_cv_bigendian" >&5 -echo "${ECHO_T}$ba_cv_bigendian" >&6; } -test $ba_cv_bigendian = yes && cat >>confdefs.h <<\_ACEOF -#define HAVE_BIGENDIAN 1 -_ACEOF - - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -40623,11 +40588,13 @@ _ACEOF have_zlib=yes fi -support_acl=yes +support_acl=auto # Check whether --enable-acl was given. if test "${enable_acl+set}" = set; then enableval=$enable_acl; - if test x$enableval = xno; then + if test x$enableval = xyes; then + support_acl=yes + elif test x$enableval = xno; then support_acl=no fi @@ -40637,7 +40604,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; } @@ -41145,28 +41112,39 @@ fi fi - if test $have_acl = yes; then + + 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 +#define HAVE_ACL 1 _ACEOF - fi + fi - if test $have_extended_acl = yes; then + if test $have_extended_acl = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_EXTENDED_ACL +#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 + if test x$enableval = xyes; then + support_xattr=yes + elif test x$enableval = xno; then support_xattr=no fi @@ -41175,19 +41153,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 @@ -41195,7 +41173,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" @@ -41227,15 +41205,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 @@ -41268,112 +41246,77 @@ 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 - - - -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 + 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 - cat >conftest.$ac_ext <<_ACEOF + # 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. */ -/* 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; -} +$ac_includes_default +#include _ACEOF -rm -f conftest.$ac_objext 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>conftest.er1 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -41382,57 +41325,223 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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" + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" + ac_header_compiler=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 +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 - have_xattr=yes + ac_header_preproc=no +fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_LLISTXATTR -_ACEOF +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;} -cat >>confdefs.h <<\_ACEOF -#define HAVE_LGETXATTR -_ACEOF + ;; +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_LSETXATTR +#define HAVE_LIBUTIL_H 1 _ACEOF - - fi -done - # - # OSX specific - # - if test $have_xattr = no; then -for ac_func in listxattr getxattr setxattr +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 +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_EXTATTR_GET_LINK 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_SET_LINK 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_LIST_LINK 1 +_ACEOF + + + +fi +done + + + if test $have_xattr = no; then + + + +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 @@ -41525,17 +41634,17 @@ _ACEOF have_xattr=yes cat >>confdefs.h <<\_ACEOF -#define HAVE_LLISTXATTR +#define HAVE_EXTATTR_GET_FILE 1 _ACEOF cat >>confdefs.h <<\_ACEOF -#define HAVE_LGETXATTR +#define HAVE_EXTATTR_SET_FILE 1 _ACEOF cat >>confdefs.h <<\_ACEOF -#define HAVE_LSETXATTR +#define HAVE_EXTATTR_LIST_FILE 1 _ACEOF @@ -41545,10 +41654,568 @@ done fi - # - # Solaris specific - # - if test $have_xattr = no; then + 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 +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 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_NAMESPACE_TO_STRING 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_EXTATTR_STRING_TO_NAMESPACE 1 +_ACEOF + + + +fi +done + + + 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="-lutil $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 extattr_namespace_to_string extattr_string_to_namespace (); +int +main () +{ +return extattr_namespace_to_string extattr_string_to_namespace (); + ; + 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_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_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_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 + + +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 + # 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 + 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_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; } @@ -42050,27 +42717,27 @@ _ACEOF have_xattr=yes cat >>confdefs.h <<\_ACEOF -#define HAVE_OPENAT +#define HAVE_OPENAT 1 _ACEOF cat >>confdefs.h <<\_ACEOF -#define HAVE_FSTATAT +#define HAVE_FSTATAT 1 _ACEOF cat >>confdefs.h <<\_ACEOF -#define HAVE_UNLINKAT +#define HAVE_UNLINKAT 1 _ACEOF cat >>confdefs.h <<\_ACEOF -#define HAVE_FCHOWNAT +#define HAVE_FCHOWNAT 1 _ACEOF cat >>confdefs.h <<\_ACEOF -#define HAVE_FUTIMESAT +#define HAVE_FUTIMESAT 1 _ACEOF @@ -42143,6 +42810,11 @@ fi 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" @@ -42151,12 +42823,20 @@ fi fi fi - if test $have_xattr = yes; then + 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 +#define HAVE_XATTR 1 _ACEOF + fi fi fi @@ -42338,27 +43018,268 @@ 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_c_r_pthread_create=yes + 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_lib_c_r_pthread_create=no + 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 -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" +{ 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 - { 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 + 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 @@ -42367,12 +43288,12 @@ _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. +/* Define $ac_func to an innocuous variant, in case declares $ac_func. For example, HP-UX 11i declares gettimeofday. */ -#define pthread_create innocuous_pthread_create +#define $ac_func innocuous_$ac_func /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_create (); below. + which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -42382,7 +43303,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif -#undef pthread_create +#undef $ac_func /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -42390,18 +43311,18 @@ 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_pthread_create || defined __stub___pthread_create +#if defined __stub_$ac_func || defined __stub___$ac_func choke me #endif int main () { -return pthread_create (); +return $ac_func (); ; return 0; } @@ -42424,29 +43345,100 @@ 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_func_pthread_create=yes + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_pthread_create=no + 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 -{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_create" >&6; } - - +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; +} +_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_cap_cap_set_proc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + 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_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 + CAP_LIBS= +fi +if test x$CAP_LIBS = x-lcap; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBCAP 1 +_ACEOF fi @@ -42496,10 +43488,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` @@ -42550,11 +43548,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 @@ -42588,10 +43590,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 @@ -42654,10 +43652,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 @@ -42677,15 +43671,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" @@ -42699,10 +43688,6 @@ mandrake) " ;; gentoo) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`awk '/version / {print $5}' < /etc/gentoo-release` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" @@ -42714,10 +43699,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" @@ -42746,10 +43727,6 @@ _ACEOF LIBS="$LIBS -lresolv" ;; suse) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`cat /etc/SuSE-release |grep VERSION|\ cut -f 3 -d ' '` TAPEDRIVE="/dev/nst0" @@ -42763,10 +43740,6 @@ suse) platforms/suse/bacula.spec" ;; suse5) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTNAME=suse DISTVER=5.x TAPEDRIVE="/dev/nst0" @@ -42821,7 +43794,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 src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_sqlite_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" +ac_config_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 src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile src/plugins/sd/Makefile src/plugins/dir/Makefile src/win32/Makefile.inc po/Makefile.in updatedb/update_mysql_tables_9_to_10 updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 updatedb/update_sqlite_tables_9_to_10 updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 updatedb/update_postgresql_tables_10_to_11 updatedb/update_sqlite_tables_10_to_11 $PFILES" ac_config_commands="$ac_config_commands default" @@ -43789,8 +44762,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" ;; @@ -44160,13 +45131,13 @@ 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 +WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -44208,11 +45179,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -QWT_LDFLAGS!$QWT_LDFLAGS$ac_delim -QWT_LIB!$QWT_LIB$ac_delim -QWT!$QWT$ac_delim -WXCONS_CPPFLAGS!$WXCONS_CPPFLAGS$ac_delim -WXCONS_LDFLAGS!$WXCONS_LDFLAGS$ac_delim WX_DIR!$WX_DIR$ac_delim TRAY_MONITOR_CPPFLAGS!$TRAY_MONITOR_CPPFLAGS$ac_delim TRAY_MONITOR_LDFLAGS!$TRAY_MONITOR_LDFLAGS$ac_delim @@ -44241,6 +45207,7 @@ 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 @@ -44287,6 +45254,7 @@ 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 +CAP_LIBS!$CAP_LIBS$ac_delim FDLIBS!$FDLIBS$ac_delim DEBUG!$DEBUG$ac_delim DINCLUDE!$DINCLUDE$ac_delim @@ -44296,7 +45264,6 @@ WCFLAGS!$WCFLAGS$ac_delim WLDFLAGS!$WLDFLAGS$ac_delim WRAPLIBS!$WRAPLIBS$ac_delim OBJLIST!$OBJLIST$ac_delim -hostname!$hostname$ac_delim TAPEDRIVE!$TAPEDRIVE$ac_delim PSCMD!$PSCMD$ac_delim WIN32!$WIN32$ac_delim @@ -44306,7 +45273,7 @@ DISTVER!$DISTVER$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -44325,7 +45292,7 @@ fi cat >>$CONFIG_STATUS <<_ACEOF cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g @@ -44338,6 +45305,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g CEOF$ac_eof _ACEOF @@ -44585,7 +45554,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" | sed 's/|#_!!_#|//g' >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && @@ -45658,8 +46627,9 @@ fi if test "${support_bat}" = "yes" ; then if test "x$QMAKE" = "xnone" && test "x$QMAKEQT4" = "xnone"; then - echo "Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation" - exit 1 + { { echo "$as_me:$LINENO: error: Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation" >&5 +echo "$as_me: error: Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation" >&2;} + { (exit 1); exit 1; }; } fi QMAKEBIN="qmake" @@ -45671,8 +46641,9 @@ if test "${support_bat}" = "yes" ; then cd src/qt-console echo "Creating bat Makefile" touch bat + chmod 755 bat $QMAKEBIN - make clean + ${MAKE:-make} clean cd ${BUILD_DIR} fi @@ -45740,7 +46711,7 @@ fi echo " " echo "Cleaning up" echo " " -make clean +${MAKE:-make} clean if test "x${db_type}" = "xInternal" ; then echo " "