--- configure 2018-07-16 15:40:30.788374759 +0200 +++ configure.new 2018-07-16 15:40:41.395415652 +0200 @@ -668,10 +668,10 @@ ENABLE_RUNNING_TESTS_WITH_PY3_TRUE ENABLE_FEDABIPKGDIFF_FALSE ENABLE_FEDABIPKGDIFF_TRUE +WGET PYTHON3_INTERPRETER PYTHON_VERSION PYTHON -WGET ENABLE_BASH_COMPLETION_FALSE ENABLE_BASH_COMPLETION_TRUE HAS_BASH_COMPLETION @@ -16891,82 +16891,11 @@ fi +# The minimal python 2 version we want to support is 2.6.6 because EL6 +# distributions have that version installed. +MINIMAL_PYTHON2_VERSION="2.6.6" -if test x$ENABLE_FEDABIPKGDIFF = xauto -o x$ENABLE_FEDABIPKGDIFF = xyes; then - CHECK_DEPS_FOR_FEDABIPKGDIFF=yes -else - CHECK_DEPS_FOR_FEDABIPKGDIFF=no -fi - -if test x$CHECK_DEPS_FOR_FEDABIPKGDIFF = xyes; then - MISSING_FEDABIPKGDIFF_DEP=no - - if test x$ENABLE_FEDABIPKGDIFF = xyes; then - MISSING_FEDABIPKGDIFF_DEP_FATAL=yes - else - MISSING_FEDABIPKGDIFF_DEP_FATAL=no - fi - - # Extract the first word of "wget", so it can be a program name with args. -set dummy wget; 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_WGET+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $WGET in - [\\/]* | ?:[\\/]*) - ac_cv_path_WGET="$WGET" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_WGET="$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_WGET" && ac_cv_path_WGET="no" - ;; -esac -fi -WGET=$ac_cv_path_WGET -if test -n "$WGET"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5 -$as_echo "$WGET" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - if test x$WGET = xno; then - ENABLE_FEDABIPKGDIFF=no - if test x$MISSING_FEDABIPKGDIFF_DEP_FATAL = xyes; then - as_fn_error $? "could not find the wget program" "$LINENO" 5 - else - MISSING_FEDABIPKGDIFF_DEP=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: could not find the wget program" >&5 -$as_echo "$as_me: could not find the wget program" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: disabling fedabipkgdiff as a result" >&5 -$as_echo "$as_me: disabling fedabipkgdiff as a result" >&6;} - fi - fi - - # The minimal python 2 version we want to support is 2.6.6 because EL6 - # distributions have that version installed. - MINIMAL_PYTHON2_VERSION="2.6.6" - - # Extract the first word of "python", so it can be a program name with args. +# 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; } @@ -17078,10 +17007,10 @@ fi - # The minimal python 3 version we want to support is 3.5, which is - # available in Fedora releases and in EL7. - if test x$ENABLE_PYTHON3 != xno; then - for ac_prog in python3 python3.5 python3.6 python3.7 +# The minimal python 3 version we want to support is 3.5, which is +# available in Fedora releases and in EL7. +if test x$ENABLE_PYTHON3 != xno; then + for ac_prog in python3 python3.5 python3.6 python3.7 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -17124,66 +17053,140 @@ done test -n "$PYTHON3_INTERPRETER" || PYTHON3_INTERPRETER="no" - else - PYTHON3_INTERPRETER=no - fi +else + PYTHON3_INTERPRETER=no +fi - if test x$ENABLE_PYTHON3 = xauto; then - if test x$PYTHON3_INTERPRETER != xno; then - ENABLE_PYTHON3=yes - else - # When enabling python3 is auto, tests only run if the - # python3 interpreter was found on the system. Otherwise, - # just ignore it. +if test x$ENABLE_PYTHON3 = xauto; then + if test x$PYTHON3_INTERPRETER != xno; then + ENABLE_PYTHON3=yes + else + # When enabling python3 is auto, tests only run if the + # python3 interpreter was found on the system. Otherwise, + # just ignore it. ENABLE_PYTHON3=no - { $as_echo "$as_me:${as_lineno-$LINENO}: Python 3 was not found. Skip running tests with Python 3." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: Python 3 was not found. Skip running tests with Python 3." >&5 $as_echo "$as_me: Python 3 was not found. Skip running tests with Python 3." >&6;} - fi - fi + fi +fi - if test x$ENABLE_PYTHON3 = xyes; then - if test x$PYTHON3_INTERPRETER != xno; then - # We were asked to enable python3 implicitely (auto and - # python3 was found) or explicitly. So enable running tests - # using python3 then. - RUN_TESTS_WITH_PY3=yes - else - as_fn_error $? "Python 3 was not found" "$LINENO" 5 - fi - fi +if test x$ENABLE_PYTHON3 = xyes; then + if test x$PYTHON3_INTERPRETER != xno; then + # We were asked to enable python3 implicitely (auto and + # python3 was found) or explicitly. So enable running tests + # using python3 then. + RUN_TESTS_WITH_PY3=yes + else + as_fn_error $? "Python 3 was not found" "$LINENO" 5 + fi +fi - if test x$PYTHON3_INTERPRETER = xyes; then - MINIMAL_PYTHON_VERSION_FOUND=yes - fi +if test x$PYTHON3_INTERPRETER = xyes; then + MINIMAL_PYTHON_VERSION_FOUND=yes +fi - if test x$MINIMAL_PYTHON_VERSION_FOUND = xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: no minimal version of python found" >&5 +if test x$MINIMAL_PYTHON_VERSION_FOUND = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: no minimal version of python found" >&5 $as_echo "$as_me: no minimal version of python found" >&6;} - MISSING_FEDABIPKGDIFF_DEP=yes - if test x$MISSING_FEDABIPKGDIFF_DEP_FATAL = xyes; then - as_fn_error $? "could not find a python program of version at least $MINIMAL_PYTHON2_VERSION" "$LINENO" 5 - fi - if test x$PYTHON = xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: python binary wasn't found" >&5 + if test x$PYTHON = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: python binary wasn't found" >&5 $as_echo "$as_me: python binary wasn't found" >&6;} - if test x$PYTHON3_INTERPRETER != xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: using $PYTHON3_INTERPRETER instead" >&5 + if test x$PYTHON3_INTERPRETER != xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: using $PYTHON3_INTERPRETER instead" >&5 $as_echo "$as_me: using $PYTHON3_INTERPRETER instead" >&6;} - PYTHON=$PYTHON3_INTERPRETER + PYTHON=$PYTHON3_INTERPRETER MINIMAL_PYTHON_VERSION_FOUND=yes MISSING_FEDABIPKGDIFF_DEP=no - fi - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: a minimal version of python was found ..." >&5 + fi + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: a minimal version of python was found ..." >&5 $as_echo "$as_me: a minimal version of python was found ..." >&6;} - if test x$PYTHON3_INTERPRETER != xno; then - # We were instructed to use python3 and it's present on the - # system. Let's update the PYTHON variable that points to the - # actual python interpreter we are going to be using - { $as_echo "$as_me:${as_lineno-$LINENO}: ... and it was $PYTHON3_INTERPRETER" >&5 + if test x$PYTHON3_INTERPRETER != xno; then + # We were instructed to use python3 and it's present on the + # system. Let's update the PYTHON variable that points to the + # actual python interpreter we are going to be using + { $as_echo "$as_me:${as_lineno-$LINENO}: ... and it was $PYTHON3_INTERPRETER" >&5 $as_echo "$as_me: ... and it was $PYTHON3_INTERPRETER" >&6;} - PYTHON=$PYTHON3_INTERPRETER + PYTHON=$PYTHON3_INTERPRETER + fi +fi + + +if test x$ENABLE_FEDABIPKGDIFF = xauto -o x$ENABLE_FEDABIPKGDIFF = xyes; then + CHECK_DEPS_FOR_FEDABIPKGDIFF=yes +else + CHECK_DEPS_FOR_FEDABIPKGDIFF=no +fi + +if test x$CHECK_DEPS_FOR_FEDABIPKGDIFF = xyes; then + MISSING_FEDABIPKGDIFF_DEP=no + + if test x$ENABLE_FEDABIPKGDIFF = xyes; then + MISSING_FEDABIPKGDIFF_DEP_FATAL=yes + else + MISSING_FEDABIPKGDIFF_DEP_FATAL=no + fi + + # Extract the first word of "wget", so it can be a program name with args. +set dummy wget; 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_WGET+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $WGET in + [\\/]* | ?:[\\/]*) + ac_cv_path_WGET="$WGET" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_WGET="$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_WGET" && ac_cv_path_WGET="no" + ;; +esac +fi +WGET=$ac_cv_path_WGET +if test -n "$WGET"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5 +$as_echo "$WGET" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + if test x$WGET = xno; then + ENABLE_FEDABIPKGDIFF=no + if test x$MISSING_FEDABIPKGDIFF_DEP_FATAL = xyes; then + as_fn_error $? "could not find the wget program" "$LINENO" 5 + else + MISSING_FEDABIPKGDIFF_DEP=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: could not find the wget program" >&5 +$as_echo "$as_me: could not find the wget program" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: disabling fedabipkgdiff as a result" >&5 +$as_echo "$as_me: disabling fedabipkgdiff as a result" >&6;} + fi + fi + + if test x$MINIMAL_PYTHON_VERSION_FOUND = xno; then + MISSING_FEDABIPKGDIFF_DEP=yes + if test x$MISSING_FEDABIPKGDIFF_DEP_FATAL = xyes; then + as_fn_error $? "could not find a python program of version at least $MINIMAL_PYTHON2_VERSION" "$LINENO" 5 fi fi