From 51aeeb6fdae18e2e9c3da649ced14f399c8d4a94 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 31 Mar 2014 20:40:52 +0200 Subject: [PATCH] Recompile configure --- bacula/configure | 266 ++--------------------------------------------- 1 file changed, 9 insertions(+), 257 deletions(-) diff --git a/bacula/configure b/bacula/configure index 96f9a16736..432acdc45c 100755 --- a/bacula/configure +++ b/bacula/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for bacula 7.0.0. +# Generated by GNU Autoconf 2.68 for bacula 7.0.1. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='bacula' PACKAGE_TARNAME='bacula' -PACKAGE_VERSION='7.0.0' -PACKAGE_STRING='bacula 7.0.0' +PACKAGE_VERSION='7.0.1' +PACKAGE_STRING='bacula 7.0.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -689,8 +689,6 @@ archivedir working_dir OPENSSL_INC OPENSSL_LIBS -PYTHON_INCDIR -PYTHON_LIBS READLINE_SRC CONS_LDFLAGS CONS_LIBS @@ -825,7 +823,6 @@ PKGCONFIG DVDRWFORMAT DVDRWMEDIAINFO GROWISOFS -PYTHON MKISOFS DD MTX @@ -943,7 +940,6 @@ enable_conio enable_ipv6 enable_readline with_readline -with_python with_tcp_wrappers with_openssl with_working_dir @@ -1548,7 +1544,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bacula 7.0.0 to adapt to many kinds of systems. +\`configure' configures bacula 7.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1617,7 +1613,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bacula 7.0.0:";; + short | recursive ) echo "Configuration of bacula 7.0.1:";; esac cat <<\_ACEOF @@ -1671,9 +1667,6 @@ Optional Packages: --without-libintl-prefix don't search for libintl in includedir and libdir --with-included-gettext use the GNU gettext library included here --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 - number of common places for the Python files. --with-tcp-wrappers[=DIR] enable tcpwrappers support --with-openssl[=DIR] Include OpenSSL support. DIR is the OpenSSL base @@ -1815,7 +1808,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bacula configure 7.0.0 +bacula configure 7.0.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2745,7 +2738,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bacula $as_me 7.0.0, which was +It was created by bacula $as_me 7.0.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -5374,47 +5367,6 @@ $as_echo "no" >&6; } fi -# Extract the first word of "python", so it can be a program name with args. -set dummy python; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PYTHON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="python" - ;; -esac -fi -PYTHON=$ac_cv_path_PYTHON -if test -n "$PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -$as_echo "$PYTHON" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - # Extract the first word of "growisofs", so it can be a program name with args. set dummy growisofs; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -21709,7 +21661,6 @@ support_static_fd=no support_static_sd=no support_static_dir=no support_static_cons=no -support_python=no build_client_only=no build_dird=yes build_stored=yes @@ -22584,204 +22535,6 @@ done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python support" >&5 -$as_echo_n "checking for Python support... " >&6; } - -# Check whether --with-python was given. -if test "${with_python+set}" = set; then : - withval=$with_python; - PYTHON_INCDIR= - PYTHON_LIBS= - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - 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 python2.7 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 - 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" - else - PYTHON_LIBS="-L$prefix/lib/config -lpython" - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Unable to find Python.h in standard locations" "$LINENO" 5 - fi - fi - fi - else - 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 - PYTHON_INCDIR=-I$withval/include - if test -d $withval/lib64/config; then - PYTHON_LIBS="-L$withval/lib64/config -lpython" - else - PYTHON_LIBS="-L$withval/lib/config -lpython" - fi - elif test -f $withval/include/python/Python.h; then - PYTHON_INCDIR=-I$withval/include/python - if test -d $withval/lib64/python/config; then - PYTHON_LIBS="-L$withval/lib64/python/config -lpython" - else - PYTHON_LIBS="-L$withval/lib/python/config -lpython" - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Invalid Python directory $withval - unable to find Python.h under $withval" "$LINENO" 5 - fi - fi - - $as_echo "#define HAVE_PYTHON 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - support_python=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for more Python libs" >&5 -$as_echo "$as_me: checking for more Python libs" >&6;} - saved_LIBS="$LIBS"; LIBS= - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 -$as_echo_n "checking for library containing shm_open... " >&6; } -if ${ac_cv_search_shm_open+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* 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 shm_open (); -int -main () -{ -return shm_open (); - ; - return 0; -} -_ACEOF -for ac_lib in '' rt; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_shm_open=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_shm_open+:} false; then : - break -fi -done -if ${ac_cv_search_shm_open+:} false; then : - -else - ac_cv_search_shm_open=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shm_open" >&5 -$as_echo "$ac_cv_search_shm_open" >&6; } -ac_res=$ac_cv_search_shm_open -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5 -$as_echo_n "checking for openpty in -lutil... " >&6; } -if ${ac_cv_lib_util_openpty+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lutil $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* 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 openpty (); -int -main () -{ -return openpty (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_util_openpty=yes -else - ac_cv_lib_util_openpty=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5 -$as_echo "$ac_cv_lib_util_openpty" >&6; } -if test "x$ac_cv_lib_util_openpty" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBUTIL 1 -_ACEOF - - LIBS="-lutil $LIBS" - -fi - - PYTHON_LIBS="$PYTHON_LIBS $LIBS" - LIBS="$saved_LIBS" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - - -fi - - - - ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" if test "x$ac_cv_func_socket" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: using libc's socket" >&5 @@ -31411,7 +31164,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bacula $as_me 7.0.0, which was +This file was extended by bacula $as_me 7.0.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31477,7 +31230,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -bacula config.status 7.0.0 +bacula config.status 7.0.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -33782,7 +33535,6 @@ Configuration on `date`: AFS support: ${have_afs} ACL support: ${have_acl} XATTR support: ${have_xattr} - Python support: ${support_python} ${PYTHON_LIBS} systemd support: ${support_systemd} ${SYSTEMD_UNITDIR} Batch insert enabled: ${batch_insert_db_backends} -- 2.39.5