diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 102 |
1 files changed, 25 insertions, 77 deletions
diff --git a/configure b/configure index 08f511a1..20631292 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.36.4. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.37.92. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.36.4' -PACKAGE_STRING='NetworkManager 1.36.4' +PACKAGE_VERSION='1.37.92' +PACKAGE_STRING='NetworkManager 1.37.92' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -642,9 +642,6 @@ HAVE_DOCS_FALSE HAVE_DOCS_TRUE BUILD_DOCS_FALSE BUILD_DOCS_TRUE -WITH_PYTHON_BLACK_FALSE -WITH_PYTHON_BLACK_TRUE -BLACK XSLTPROC PERL GTK_DOC_USE_REBASE_FALSE @@ -1747,7 +1744,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 NetworkManager 1.36.4 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.37.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1819,7 +1816,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.36.4:";; + short | recursive ) echo "Configuration of NetworkManager 1.37.92:";; esac cat <<\_ACEOF @@ -1941,7 +1938,7 @@ Optional Packages: NetworkManager.conf --with-polkit-agent-helper-1=/path/to/polkit-agent-helper-1 Path to the polkit-agent-helper-1 binary from polkit - --with-crypto=nss|gnutls + --with-crypto=nss|gnutls|null Cryptography library to use for certificate and key operations --with-dbus-sys-dir=DIR where D-BUS system.d directory is @@ -2170,7 +2167,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.36.4 +NetworkManager configure 1.37.92 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2943,7 +2940,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 NetworkManager $as_me 1.36.4, which was +It was created by NetworkManager $as_me 1.37.92, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3813,7 +3810,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.36.4' + VERSION='1.37.92' cat >>confdefs.h <<_ACEOF @@ -17996,9 +17993,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 -NM_MINOR_VERSION=36 -NM_MICRO_VERSION=4 -NM_VERSION=1.36.4 +NM_MINOR_VERSION=37 +NM_MICRO_VERSION=92 +NM_VERSION=1.37.92 @@ -18006,7 +18003,7 @@ NM_VERSION=1.36.4 -NM_GIT_SHA=4e8e5bdfc2ab6b51b9f8626512089a1f0c94cce6 +NM_GIT_SHA=a845a3425f9500f85fad62a9f2f08f320241b0fa if test """" != "no-config-h" ; then @@ -22090,7 +22087,7 @@ fi # default location if test -z "$with_systemdsystemunitdir" && $PKG_CONFIG systemd; then : - with_systemdsystemunitdir="\$(prefix)/lib/systemd/system" + with_systemdsystemunitdir=`$PKG_CONFIG systemd '--define-variable=prefix=${prefix}' '--define-variable=root_prefix=${prefix}' --variable systemdsystemunitdir` fi if test -z "$with_systemdsystemunitdir"; then : with_systemdsystemunitdir=no @@ -24643,8 +24640,10 @@ elif test "$with_crypto" = 'gnutls'; then if test "${have_crypto_gnutls}" != "yes"; then as_fn_error $? "No usable gnutls found for --with-crypto=gnutls" "$LINENO" 5 fi +elif test "$with_crypto" = 'null'; then + : else - as_fn_error $? "Please choose either 'nss' or 'gnutls' for certificate and crypto operations" "$LINENO" 5 + as_fn_error $? "Please choose either 'nss', 'gnutls' or 'null' for certificate and crypto operations" "$LINENO" 5 fi if test "$with_crypto" = 'nss'; then WITH_NSS_TRUE= @@ -28527,11 +28526,13 @@ test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX" # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test "x$ax_pthread_ok" = "xyes"; then - ,as_fn_error $? "Threads are required for the NetworkManager tests" "$LINENO" 5 + +$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h + : else ax_pthread_ok=no - + as_fn_error $? "Threads are required for the NetworkManager tests" "$LINENO" 5 fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -29708,61 +29709,12 @@ else have_introspection=no fi -# check for python black. And check if all files are formatted with python black -# Extract the first word of "black", so it can be a program name with args. -set dummy black; 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_BLACK+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $BLACK in - [\\/]* | ?:[\\/]*) - ac_cv_path_BLACK="$BLACK" # 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_BLACK="$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 - - ;; -esac -fi -BLACK=$ac_cv_path_BLACK -if test -n "$BLACK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BLACK" >&5 -$as_echo "$BLACK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test "${BLACK}" != ""; then - WITH_PYTHON_BLACK_TRUE= - WITH_PYTHON_BLACK_FALSE='#' -else - WITH_PYTHON_BLACK_TRUE='#' - WITH_PYTHON_BLACK_FALSE= -fi - - # check for pregenerated manpages and documentation to be installed use_pregen_docs=no if test "$build_docs" != "yes" -a \ - -f "$srcdir"/man/NetworkManager.8 -a \ -f "$srcdir"/man/NetworkManager-dispatcher.8 -a \ + -f "$srcdir"/man/NetworkManager-wait-online.service.8 -a \ + -f "$srcdir"/man/NetworkManager.8 -a \ -f "$srcdir"/man/NetworkManager.conf.5 -a \ -f "$srcdir"/man/nm-online.1 -a \ -f "$srcdir"/man/nmcli-examples.7 -a \ @@ -30103,10 +30055,6 @@ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}" as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WITH_PYTHON_BLACK_TRUE}" && test -z "${WITH_PYTHON_BLACK_FALSE}"; then - as_fn_error $? "conditional \"WITH_PYTHON_BLACK\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BUILD_DOCS_TRUE}" && test -z "${BUILD_DOCS_FALSE}"; then as_fn_error $? "conditional \"BUILD_DOCS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -30512,7 +30460,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 NetworkManager $as_me 1.36.4, which was +This file was extended by NetworkManager $as_me 1.37.92, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30578,7 +30526,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="\\ -NetworkManager config.status 1.36.4 +NetworkManager config.status 1.37.92 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |