diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 58 |
1 files changed, 44 insertions, 14 deletions
diff --git a/configure b/configure index ec0ded7e..9c685f01 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.34.0. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.35.91. # # 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.34.0' -PACKAGE_STRING='NetworkManager 1.34.0' +PACKAGE_VERSION='1.35.91' +PACKAGE_STRING='NetworkManager 1.35.91' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -793,6 +793,7 @@ SYSTEMD_INHIBIT_LIBS SYSTEMD_INHIBIT_CFLAGS SYSTEMD_LOGIN_LIBS SYSTEMD_LOGIN_CFLAGS +NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT SYSTEMD_JOURNAL_LIBS SYSTEMD_JOURNAL_CFLAGS @@ -1071,6 +1072,7 @@ with_systemdsystemunitdir with_hostname_persist with_systemd_journal with_config_logging_backend_default +with_config_wifi_backend_default with_systemd_logind with_consolekit with_session_tracking @@ -1745,7 +1747,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.34.0 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.35.91 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1817,7 +1819,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.34.0:";; + short | recursive ) echo "Configuration of NetworkManager 1.35.91:";; esac cat <<\_ACEOF @@ -1917,6 +1919,8 @@ Optional Packages: Use systemd journal for logging --with-config-logging-backend-default=backend Default value for logging.backend + --with-config-wifi-backend-default=backend + Default value for wifi.backend --with-systemd-logind=yes|no Support systemd session tracking --with-consolekit=yes|no @@ -2166,7 +2170,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.34.0 +NetworkManager configure 1.35.91 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2939,7 +2943,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.34.0, which was +It was created by NetworkManager $as_me 1.35.91, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3809,7 +3813,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.34.0' + VERSION='1.35.91' cat >>confdefs.h <<_ACEOF @@ -17992,9 +17996,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 -NM_MINOR_VERSION=34 -NM_MICRO_VERSION=0 -NM_VERSION=1.34.0 +NM_MINOR_VERSION=35 +NM_MICRO_VERSION=91 +NM_VERSION=1.35.91 @@ -18002,7 +18006,7 @@ NM_VERSION=1.34.0 -NM_GIT_SHA=9133a30c9deb3a003a20b09a617a25b07ada18ae +NM_GIT_SHA=259999d55e0a1dba3c8d53ebb9fa8848404145c6 if test """" != "no-config-h" ; then @@ -22566,6 +22570,32 @@ _ACEOF NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT="$nm_config_logging_backend_default" + +# Check whether --with-config-wifi-backend-default was given. +if test "${with_config_wifi_backend_default+set}" = set; then : + withval=$with_config_wifi_backend_default; nm_config_wifi_backend_default="$withval" +else + nm_config_wifi_backend_default="wpa_supplicant" +fi + + +if test "$nm_config_wifi_backend_default" != 'iwd' \ + -a "$nm_config_wifi_backend_default" != 'wpa_supplicant'; then + as_fn_error $? "The default Wi-Fi backend must be either wpa_supplicant or iwd." "$LINENO" 5 +fi +if test "$nm_config_wifi_backend_default" = "iwd"; then + if test "$ac_with_iwd" != "yes"; then + as_fn_error $? "Setting the default Wi-Fi backend to iwd requires iwd support." "$LINENO" 5 + fi +fi + +cat >>confdefs.h <<_ACEOF +#define NM_CONFIG_DEFAULT_WIFI_BACKEND "$nm_config_wifi_backend_default" +_ACEOF + +NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT="$nm_config_wifi_backend_default" + + # Session tracking support # Check whether --with-systemd-logind was given. @@ -30472,7 +30502,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.34.0, which was +This file was extended by NetworkManager $as_me 1.35.91, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30538,7 +30568,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.34.0 +NetworkManager config.status 1.35.91 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |