diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 491 |
1 files changed, 194 insertions, 297 deletions
diff --git a/configure b/configure index 5948703c..0b1ecea7 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.18.0. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.19.90. # # 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.18.0' -PACKAGE_STRING='NetworkManager 1.18.0' +PACKAGE_VERSION='1.19.90' +PACKAGE_STRING='NetworkManager 1.19.90' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -802,13 +802,6 @@ QT_LIBS QT_CFLAGS LIBUDEV_LIBS LIBUDEV_CFLAGS -WITH_FAKE_TYPELIBS_FALSE -WITH_FAKE_TYPELIBS_TRUE -WITH_LEGACY_LIBRARIES_FALSE -WITH_LEGACY_LIBRARIES_TRUE -GLIB_COMPILE_RESOURCES -DBUS_LIBS -DBUS_CFLAGS HAVE_INTROSPECTION_FALSE HAVE_INTROSPECTION_TRUE INTROSPECTION_MAKEFILE @@ -847,8 +840,6 @@ CONFIG_PLUGIN_IFUPDOWN_FALSE CONFIG_PLUGIN_IFUPDOWN_TRUE CONFIG_PLUGIN_IFCFG_RH_FALSE CONFIG_PLUGIN_IFCFG_RH_TRUE -CONFIG_PLUGIN_IBFT_FALSE -CONFIG_PLUGIN_IBFT_TRUE nmrundir nmstatedir nmdatadir @@ -1051,7 +1042,7 @@ enable_nls enable_rpath with_libiconv_prefix with_libintl_prefix -enable_config_plugin_ibft +with_runstatedir enable_ifcfg_rh enable_ifupdown with_config_plugins_default @@ -1061,7 +1052,6 @@ enable_wifi with_wext with_iwd enable_introspection -with_libnm_glib enable_qt with_udev_dir with_systemdsystemunitdir @@ -1142,8 +1132,6 @@ PKG_CONFIG_PATH PKG_CONFIG_LIBDIR GLIB_CFLAGS GLIB_LIBS -DBUS_CFLAGS -DBUS_LIBS LIBUDEV_CFLAGS LIBUDEV_LIBS QT_CFLAGS @@ -1731,7 +1719,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.18.0 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.19.90 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1801,7 +1789,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.18.0:";; + short | recursive ) echo "Configuration of NetworkManager 1.19.90:";; esac cat <<\_ACEOF @@ -1825,8 +1813,6 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths - --enable-config-plugin-ibft - enable ibft configuration plugin --enable-ifcfg-rh enable ifcfg-rh configuration plugin (Fedora/RHEL) --enable-ifupdown enable ifupdown configuration plugin (Debian/Ubuntu) --enable-code-coverage Whether to enable code coverage support @@ -1847,21 +1833,20 @@ Optional Features: --enable-ovs enable Open vSwitch support --enable-concheck enable connectivity checking support --enable-more-warnings Possible values: no/yes/error - --enable-more-asserts Enable more assertions for debugging (default: - auto). Deprecated option. Use - --with-more-asserts=level - --enable-more-logging Enable more debug logging (default: auto) + --enable-more-asserts Enable more assertions for debugging [default=auto]. + Deprecated option. Use --with-more-asserts=level + --enable-more-logging Enable more debug logging [default=auto] --enable-lto Enable Link Time Optimization for smaller size - (default: no) + [default=no] --enable-ld-gc Enable garbage collection of unused symbols on - linking (default: auto) + linking [default=auto] --enable-undefined-sanitizer - Compile with undefined behavior sanitizer (default: - no) + Compile with undefined behavior sanitizer + [default=no] --enable-vala=[no/auto/yes] - build Vala bindings [[default=auto]] + build Vala bindings [default=auto] --enable-tests=root|yes|no - Build NetworkManager tests (default: yes) + Build NetworkManager tests [default=yes] --enable-gtk-doc use gtk-doc to build documentation [[default=no]] --enable-gtk-doc-html build documentation in html format [[default=yes]] --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] @@ -1882,6 +1867,10 @@ Optional Packages: --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir + --with-runstatedir=DIR Directory for /var/run. Defaults to + $localstatedir/run. In autoconf >= 2.70, you should + instead use --runstatedir option. This option takes + precedence over --runstatedir. --with-config-plugins-default=PLUGINS Default configuration option for main.plugins setting, used as fallback if the configuration @@ -1891,7 +1880,6 @@ Optional Packages: --with-wext=yes Enable or disable Linux Wireless Extensions --with-iwd=yes Support IWD as wifi-backend in addition to wpa_supplicant (experimental) - --with-libnm-glib build legacy libraries --with-udev-dir=DIR Absolute path of the udev base directory. Set to 'no' not to install the udev rules --with-systemdsystemunitdir=DIR @@ -1912,11 +1900,11 @@ Optional Packages: --with-suspend-resume=upower|systemd|elogind|consolekit Build NetworkManager with specific suspend/resume support - --with-ebpf=yes|no|auto Build with eBPF support (default: auto) + --with-ebpf=yes|no|auto Build with eBPF support [default=auto] --with-selinux=yes|no|auto - Build with SELinux (default: auto) + Build with SELinux [default=auto] --with-libaudit=yes|yes-disabled-by-default|no|auto - Build with audit daemon support (default: auto). + Build with audit daemon support [default=auto]. yes-disabled-by-default enables support, but disables it unless explicitly configured via NetworkManager.conf @@ -1939,7 +1927,7 @@ Optional Packages: --with-config-dhcp-default=dhclient|dhcpcd|internal Default configuration option for main.dhcp setting, used as fallback if the configuration option is - unset + unset [default=internal] --with-resolvconf=yes|no|path Enable resolvconf support --with-netconfig=yes|no Enable SUSE netconfig support @@ -1954,18 +1942,18 @@ Optional Packages: --with-system-ca-path=/path/to/ssl/certs path to system CA certificates --with-kernel-firmware-dir=DIR - where kernel firmware directory is (default is - /lib/firmware) + where kernel firmware directory is + [default=/lib/firmware] --with-libpsl=yes|no Link against libpsl --with-nmcli=yes|no Build nmcli --with-nmtui=yes|no Build nmtui --with-more-asserts=level Enable more assertions for debugging (0 = none, 100 - = all, default: auto) + = all) [default=auto] --with-address-sanitizer=yes|no|exec - Enable address sanitizer (default: no) + Enable address sanitizer [default=no] --with-valgrind=yes|no|path - Use valgrind to memory-check the tests (default: no) + Use valgrind to memory-check the tests [default=no] --with-tests Build NetworkManager tests (deprecated) --with-valgrind-suppressions=path Use specific valgrind suppression file @@ -1992,8 +1980,6 @@ Some influential environment variables: path overriding pkg-config's built-in search path GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config GLIB_LIBS linker flags for GLIB, overriding pkg-config - DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config - DBUS_LIBS linker flags for DBUS, overriding pkg-config LIBUDEV_CFLAGS C compiler flags for LIBUDEV, overriding pkg-config LIBUDEV_LIBS @@ -2141,7 +2127,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.18.0 +NetworkManager configure 1.19.90 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2914,7 +2900,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.18.0, which was +It was created by NetworkManager $as_me 1.19.90, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3784,7 +3770,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.18.0' + VERSION='1.19.90' cat >>confdefs.h <<_ACEOF @@ -17967,9 +17953,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 -NM_MINOR_VERSION=18 -NM_MICRO_VERSION=0 -NM_VERSION=1.18.0 +NM_MINOR_VERSION=19 +NM_MICRO_VERSION=90 +NM_VERSION=1.19.90 @@ -17977,7 +17963,7 @@ NM_VERSION=1.18.0 -NM_GIT_SHA=cb739531832730e0585a740cd389c715d072cd72 +NM_GIT_SHA=e5912389c66d5545cd35e5497dee75933b1dcfb5 if test """" != "no-config-h" ; then @@ -18003,6 +17989,105 @@ fi # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5 +$as_echo_n "checking size of pid_t... " >&6; } +if ${ac_cv_sizeof_pid_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_pid_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (pid_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_pid_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5 +$as_echo "$ac_cv_sizeof_pid_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_PID_T $ac_cv_sizeof_pid_t +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uid_t" >&5 +$as_echo_n "checking size of uid_t... " >&6; } +if ${ac_cv_sizeof_uid_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uid_t))" "ac_cv_sizeof_uid_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_uid_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (uid_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_uid_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uid_t" >&5 +$as_echo "$ac_cv_sizeof_uid_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UID_T $ac_cv_sizeof_uid_t +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of gid_t" >&5 +$as_echo_n "checking size of gid_t... " >&6; } +if ${ac_cv_sizeof_gid_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (gid_t))" "ac_cv_sizeof_gid_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_gid_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (gid_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_gid_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_gid_t" >&5 +$as_echo "$ac_cv_sizeof_gid_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_GID_T $ac_cv_sizeof_gid_t +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of dev_t" >&5 $as_echo_n "checking size of dev_t... " >&6; } if ${ac_cv_sizeof_dev_t+:} false; then : @@ -18036,6 +18121,39 @@ _ACEOF # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ino_t" >&5 +$as_echo_n "checking size of ino_t... " >&6; } +if ${ac_cv_sizeof_ino_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ino_t))" "ac_cv_sizeof_ino_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_ino_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (ino_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_ino_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ino_t" >&5 +$as_echo "$ac_cv_sizeof_ino_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_INO_T $ac_cv_sizeof_ino_t +_ACEOF + + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 $as_echo_n "checking size of time_t... " >&6; } if ${ac_cv_sizeof_time_t+:} false; then : @@ -18069,32 +18187,33 @@ _ACEOF # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5 -$as_echo_n "checking size of pid_t... " >&6; } -if ${ac_cv_sizeof_pid_t+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of rlim_t" >&5 +$as_echo_n "checking size of rlim_t... " >&6; } +if ${ac_cv_sizeof_rlim_t+:} false; then : $as_echo_n "(cached) " >&6 else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t" "$ac_includes_default"; then : + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (rlim_t))" "ac_cv_sizeof_rlim_t" "#include <sys/resource.h> +"; then : else - if test "$ac_cv_type_pid_t" = yes; then + if test "$ac_cv_type_rlim_t" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (pid_t) +as_fn_error 77 "cannot compute sizeof (rlim_t) See \`config.log' for more details" "$LINENO" 5; } else - ac_cv_sizeof_pid_t=0 + ac_cv_sizeof_rlim_t=0 fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5 -$as_echo "$ac_cv_sizeof_pid_t" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_rlim_t" >&5 +$as_echo "$ac_cv_sizeof_rlim_t" >&6; } cat >>confdefs.h <<_ACEOF -#define SIZEOF_PID_T $ac_cv_sizeof_pid_t +#define SIZEOF_RLIM_T $ac_cv_sizeof_rlim_t _ACEOF @@ -20657,7 +20776,16 @@ cat >>confdefs.h <<_ACEOF _ACEOF -# Add runstatedir if not specified manually in autoconf < 2.70 +# autoconf 2.70 adds option --runstatedir. To make the directory also configurable +# on older versions, add --with-runstatedir option. Note that this option overwrites +# --runstatedir (should it be set). If you know to use autoconf >= 2.70, you should +# instead use --runstatedir. + +# Check whether --with-runstatedir was given. +if test "${with_runstatedir+set}" = set; then : + withval=$with_runstatedir; runstatedir="$withval" +fi + if test -z "$runstatedir"; then : runstatedir="$localstatedir/run" fi @@ -20692,11 +20820,6 @@ done # Alternative configuration plugins -# Check whether --enable-config-plugin-ibft was given. -if test "${enable_config_plugin_ibft+set}" = set; then : - enableval=$enable_config_plugin_ibft; -fi - # Check whether --enable-ifcfg-rh was given. if test "${enable_ifcfg_rh+set}" = set; then : enableval=$enable_ifcfg_rh; @@ -20721,19 +20844,7 @@ fi if test -z "$enable_ifupdown"; then : enable_ifupdown=no fi -# Disable obsolete ibft plugin by default -if test -z "$enable_config_plugin_ibft"; then : - enable_config_plugin_ibft="no" -fi # Create automake conditionals - if test "$enable_config_plugin_ibft" = "yes"; then - CONFIG_PLUGIN_IBFT_TRUE= - CONFIG_PLUGIN_IBFT_FALSE='#' -else - CONFIG_PLUGIN_IBFT_TRUE='#' - CONFIG_PLUGIN_IBFT_FALSE= -fi - if test "$enable_ifcfg_rh" = "yes"; then CONFIG_PLUGIN_IFCFG_RH_TRUE= CONFIG_PLUGIN_IFCFG_RH_FALSE='#' @@ -20763,7 +20874,6 @@ if test -z "$config_plugins_default" -o "$config_plugins_default" = no; then config_plugins_default='' test "$enable_ifcfg_rh" = "yes" && config_plugins_default="$config_plugins_default,ifcfg-rh" test "$enable_ifupdown" = "yes" && config_plugins_default="$config_plugins_default,ifupdown" - test "$enable_config_plugin_ibft" = "yes" && config_plugins_default="$config_plugins_default,ibft" config_plugins_default="${config_plugins_default#,}" fi @@ -20776,15 +20886,6 @@ cat >>confdefs.h <<_ACEOF #define NM_CONFIG_DEFAULT_MAIN_PLUGINS "$config_plugins_default" _ACEOF -if test "${enable_config_plugin_ibft}" = yes; then - -$as_echo "#define WITH_SETTINGS_PLUGIN_IBFT 1" >>confdefs.h - -else - -$as_echo "#define WITH_SETTINGS_PLUGIN_IBFT 0" >>confdefs.h - -fi if test "$enable_ifcfg_rh" = "yes"; then DISTRO_NETWORK_SERVICE=network.service @@ -21020,13 +21121,6 @@ fi if test "${enable_wifi}" != "no"; then enable_wifi='yes' - -$as_echo "#define WITH_WIFI 1" >>confdefs.h - -else - -$as_echo "#define WITH_WIFI 0" >>confdefs.h - fi if test "${enable_wifi}" = "yes"; then WITH_WIFI_TRUE= @@ -21624,172 +21718,6 @@ fi -# Check whether --with-libnm-glib was given. -if test "${with_libnm_glib+set}" = set; then : - withval=$with_libnm_glib; -fi - -fake_typelibs=no -if test "$with_libnm_glib" == "yes"; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 -$as_echo_n "checking for DBUS... " >&6; } - -if test -n "$DBUS_CFLAGS"; then - pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.1 dbus-glib-1 >= 0.94\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.1 dbus-glib-1 >= 0.94") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$DBUS_LIBS"; then - pkg_cv_DBUS_LIBS="$DBUS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.1 dbus-glib-1 >= 0.94\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.1 dbus-glib-1 >= 0.94") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>&1` - else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 1.1 dbus-glib-1 >= 0.94" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DBUS_PKG_ERRORS" >&5 - - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "$DBUS_PKG_ERRORS - -Configure with --without-libnm-glib if you do not need the legacy libraries -See \`config.log' for more details" "$LINENO" 5; } - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "$DBUS_PKG_ERRORS - -Configure with --without-libnm-glib if you do not need the legacy libraries -See \`config.log' for more details" "$LINENO" 5; } - -else - DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS - DBUS_LIBS=$pkg_cv_DBUS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi - - if test "${found_introspection}" = "yes"; then - # Extract the first word of "glib-compile-resources", so it can be a program name with args. -set dummy glib-compile-resources; 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_GLIB_COMPILE_RESOURCES+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_COMPILE_RESOURCES in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # 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_GLIB_COMPILE_RESOURCES="$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 -GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES -if test -n "$GLIB_COMPILE_RESOURCES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5 -$as_echo "$GLIB_COMPILE_RESOURCES" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if ! test x"$GLIB_COMPILE_RESOURCES" = x""; then - fake_typelibs=yes - fi - fi -else - with_libnm_glib=no -fi - if test "$with_libnm_glib" == "yes"; then - WITH_LEGACY_LIBRARIES_TRUE= - WITH_LEGACY_LIBRARIES_FALSE='#' -else - WITH_LEGACY_LIBRARIES_TRUE='#' - WITH_LEGACY_LIBRARIES_FALSE= -fi - -if test "$fake_typelibs" = "yes"; then - -$as_echo "#define WITH_FAKE_TYPELIBS 1" >>confdefs.h - -else - -$as_echo "#define WITH_FAKE_TYPELIBS 0" >>confdefs.h - -fi - if test "${fake_typelibs}" = "yes"; then - WITH_FAKE_TYPELIBS_TRUE= - WITH_FAKE_TYPELIBS_FALSE='#' -else - WITH_FAKE_TYPELIBS_TRUE='#' - WITH_FAKE_TYPELIBS_FALSE= -fi - - - pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5 $as_echo_n "checking for LIBUDEV... " >&6; } @@ -22072,13 +22000,6 @@ fi if test "$with_systemdsystemunitdir" != no; then systemdsystemunitdir=$with_systemdsystemunitdir - -$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h - -else - -$as_echo "#define HAVE_SYSTEMD 0" >>confdefs.h - fi @@ -25307,13 +25228,9 @@ else config_dhcp_default="" fi -if test "$config_dhcp_default" = yes -o "$config_dhcp_default" = no; then - config_dhcp_default='' +if test "$config_dhcp_default" = yes -o "$config_dhcp_default" = no -o -z "$config_dhcp_default"; then + config_dhcp_default='internal' fi -test -z "$config_dhcp_default" -a "$with_dhcpcanon" != "no" && config_dhcp_default='dhcpcanon' -test -z "$config_dhcp_default" -a "$with_dhclient" != "no" && config_dhcp_default='dhclient' -test -z "$config_dhcp_default" -a "$with_dhcpcd" != "no" && config_dhcp_default='dhcpcd' -test -z "$config_dhcp_default" && config_dhcp_default='internal' cat >>confdefs.h <<_ACEOF #define NM_CONFIG_DEFAULT_MAIN_DHCP "$config_dhcp_default" @@ -26402,6 +26319,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -Wno-missing-field-initializers \ -Wno-pragmas \ -Wno-sign-compare \ + -Wno-unknown-pragmas \ -Wno-unused-parameter \ ; do @@ -28221,7 +28139,7 @@ fi -ac_config_files="$ac_config_files Makefile shared/nm-version-macros.h libnm/libnm.pc libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc" +ac_config_files="$ac_config_files Makefile shared/nm-version-macros.h libnm/libnm.pc po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -28372,10 +28290,6 @@ fi ac_config_commands="$ac_config_commands po/stamp-it" -if test -z "${CONFIG_PLUGIN_IBFT_TRUE}" && test -z "${CONFIG_PLUGIN_IBFT_FALSE}"; then - as_fn_error $? "conditional \"CONFIG_PLUGIN_IBFT\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${CONFIG_PLUGIN_IFCFG_RH_TRUE}" && test -z "${CONFIG_PLUGIN_IFCFG_RH_FALSE}"; then as_fn_error $? "conditional \"CONFIG_PLUGIN_IFCFG_RH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -28404,14 +28318,6 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}" as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WITH_LEGACY_LIBRARIES_TRUE}" && test -z "${WITH_LEGACY_LIBRARIES_FALSE}"; then - as_fn_error $? "conditional \"WITH_LEGACY_LIBRARIES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${WITH_FAKE_TYPELIBS_TRUE}" && test -z "${WITH_FAKE_TYPELIBS_FALSE}"; then - as_fn_error $? "conditional \"WITH_FAKE_TYPELIBS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${WITH_QT_TRUE}" && test -z "${WITH_QT_FALSE}"; then as_fn_error $? "conditional \"WITH_QT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -28937,7 +28843,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.18.0, which was +This file was extended by NetworkManager $as_me 1.19.90, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29003,7 +28909,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.18.0 +NetworkManager config.status 1.19.90 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -29528,17 +29434,10 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "shared/nm-version-macros.h") CONFIG_FILES="$CONFIG_FILES shared/nm-version-macros.h" ;; "libnm/libnm.pc") CONFIG_FILES="$CONFIG_FILES libnm/libnm.pc" ;; - "libnm-util/libnm-util.pc") CONFIG_FILES="$CONFIG_FILES libnm-util/libnm-util.pc" ;; - "libnm-glib/libnm-glib.pc") CONFIG_FILES="$CONFIG_FILES libnm-glib/libnm-glib.pc" ;; - "libnm-glib/libnm-glib-vpn.pc") CONFIG_FILES="$CONFIG_FILES libnm-glib/libnm-glib-vpn.pc" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "data/org.freedesktop.NetworkManager.policy.in") CONFIG_FILES="$CONFIG_FILES data/org.freedesktop.NetworkManager.policy.in" ;; "docs/api/Makefile") CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;; "docs/api/version.xml") CONFIG_FILES="$CONFIG_FILES docs/api/version.xml" ;; - "docs/libnm-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm-glib/Makefile" ;; - "docs/libnm-glib/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libnm-glib/version.xml" ;; - "docs/libnm-util/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm-util/Makefile" ;; - "docs/libnm-util/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libnm-util/version.xml" ;; "docs/libnm/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm/Makefile" ;; "docs/libnm/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libnm/version.xml" ;; "NetworkManager.pc") CONFIG_FILES="$CONFIG_FILES NetworkManager.pc" ;; @@ -31157,14 +31056,12 @@ echo " ofono: $with_ofono" echo " concheck: $enable_concheck" echo " libteamdctl: $enable_teamdctl" echo " ovs: $enable_ovs" -echo " libnm-glib: $with_libnm_glib" echo " nmcli: $build_nmcli" echo " nmtui: $build_nmtui" echo " iwd: $ac_with_iwd" echo echo "Configuration plugins (main.plugins=${config_plugins_default})" -echo " ibft: ${enable_config_plugin_ibft}" echo " ifcfg-rh: ${enable_ifcfg_rh}" echo " ifupdown: ${enable_ifupdown}" echo |