diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 1736 |
1 files changed, 1222 insertions, 514 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 0.9.8.10. +# Generated by GNU Autoconf 2.69 for NetworkManager 0.9.10.0. # # 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='0.9.8.10' -PACKAGE_STRING='NetworkManager 0.9.8.10' +PACKAGE_VERSION='0.9.10.0' +PACKAGE_STRING='NetworkManager 0.9.10.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -633,9 +633,12 @@ ac_includes_default="\ #endif" gt_needs= +enable_option_checking=no ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +LIBOBJS +subdirs INSTALL_PREGEN_MANPAGES_FALSE INSTALL_PREGEN_MANPAGES_TRUE GTK_DOC_USE_REBASE_FALSE @@ -648,24 +651,29 @@ GTK_DOC_BUILD_HTML_FALSE GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE -HAVE_GTK_DOC_FALSE -HAVE_GTK_DOC_TRUE GTKDOC_DEPS_LIBS GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE -GTKDOC_CHECK_PATH GTKDOC_CHECK -RUN_ROOT_TESTS_FALSE -RUN_ROOT_TESTS_TRUE +VALGRIND_RULES +REQUIRE_ROOT_TESTS_FALSE +REQUIRE_ROOT_TESTS_TRUE ENABLE_TESTS_FALSE ENABLE_TESTS_TRUE +with_valgrind ENABLE_VAPIGEN_FALSE ENABLE_VAPIGEN_TRUE VAPIGEN_MAKEFILE VAPIGEN_VAPIDIR VAPIGEN +BUILD_NMTUI_FALSE +BUILD_NMTUI_TRUE +NEWT_LIBS +NEWT_CFLAGS +LIBNDP_LIBS +LIBNDP_CFLAGS WITH_CONCHECK_FALSE WITH_CONCHECK_TRUE LIBSOUP_LIBS @@ -684,6 +692,8 @@ WITH_MODEM_MANAGER_1_FALSE WITH_MODEM_MANAGER_1_TRUE MM_GLIB_LIBS MM_GLIB_CFLAGS +PPPOE_PATH +PPPD_PATH PPPD_PLUGIN_DIR WITH_PPP_FALSE WITH_PPP_TRUE @@ -707,14 +717,23 @@ WITH_POLKIT_FALSE WITH_POLKIT_TRUE POLKIT_LIBS POLKIT_CFLAGS +WITH_TEAMDCTL_FALSE +WITH_TEAMDCTL_TRUE +LIBTEAMDCTL_LIBS +LIBTEAMDCTL_CFLAGS WITH_WIMAX_FALSE WITH_WIMAX_TRUE IWMX_SDK_LIBS IWMX_SDK_CFLAGS +READLINE_LIBS UUID_LIBS UUID_CFLAGS LIBNL_LIBS LIBNL_CFLAGS +HAVE_SELINUX_FALSE +HAVE_SELINUX_TRUE +SELINUX_LIBS +SELINUX_CFLAGS SUSPEND_RESUME_SYSTEMD_FALSE SUSPEND_RESUME_SYSTEMD_TRUE SUSPEND_RESUME_UPOWER_FALSE @@ -735,8 +754,6 @@ SYSTEMD_200_CFLAGS systemdsystemunitdir HAVE_SYSTEMD_FALSE HAVE_SYSTEMD_TRUE -WITH_BLUEZ4_FALSE -WITH_BLUEZ4_TRUE UDEV_BASE_DIR WITH_QT_FALSE WITH_QT_TRUE @@ -757,6 +774,10 @@ GUDEV_LIBS GUDEV_CFLAGS GLIB_LIBS GLIB_CFLAGS +HAVE_DBUS_GLIB_100_FALSE +HAVE_DBUS_GLIB_100_TRUE +DBUS_GLIB_100_LIBS +DBUS_GLIB_100_CFLAGS DBUS_LIBS DBUS_CFLAGS PKG_CONFIG_LIBDIR @@ -774,6 +795,7 @@ LCOV CODE_COVERAGE_ENABLED CODE_COVERAGE_ENABLED_FALSE CODE_COVERAGE_ENABLED_TRUE +DISTRO_NETWORK_SERVICE CONFIG_PLUGIN_IFNET_FALSE CONFIG_PLUGIN_IFNET_TRUE CONFIG_PLUGIN_IFUPDOWN_FALSE @@ -836,7 +858,6 @@ INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE USE_NLS -LIBOBJS NM_VERSION NM_MICRO_VERSION NM_MINOR_VERSION @@ -990,17 +1011,20 @@ with_wext enable_introspection enable_qt with_udev_dir -enable_bluez4 with_systemdsystemunitdir with_session_tracking with_suspend_resume +with_selinux enable_wimax +enable_teamdctl enable_polkit enable_modify_system with_crypto with_dbus_sys_dir enable_ppp with_pppd_plugin_dir +with_pppd +with_pppoe with_modem_manager_1 with_dhclient with_dhcpcd @@ -1011,12 +1035,12 @@ with_dnsmasq with_system_ca_path with_kernel_firmware_dir enable_concheck +with_nmtui enable_more_warnings enable_vala enable_tests +with_valgrind with_tests -with_docs -enable_doc with_html_dir enable_gtk_doc enable_gtk_doc_html @@ -1040,6 +1064,8 @@ PKG_CONFIG_PATH PKG_CONFIG_LIBDIR DBUS_CFLAGS DBUS_LIBS +DBUS_GLIB_100_CFLAGS +DBUS_GLIB_100_LIBS GLIB_CFLAGS GLIB_LIBS GUDEV_CFLAGS @@ -1052,12 +1078,16 @@ SYSTEMD_LOGIN_CFLAGS SYSTEMD_LOGIN_LIBS SYSTEMD_INHIBIT_CFLAGS SYSTEMD_INHIBIT_LIBS +SELINUX_CFLAGS +SELINUX_LIBS LIBNL_CFLAGS LIBNL_LIBS UUID_CFLAGS UUID_LIBS IWMX_SDK_CFLAGS IWMX_SDK_LIBS +LIBTEAMDCTL_CFLAGS +LIBTEAMDCTL_LIBS POLKIT_CFLAGS POLKIT_LIBS NSS_CFLAGS @@ -1068,9 +1098,13 @@ MM_GLIB_CFLAGS MM_GLIB_LIBS LIBSOUP_CFLAGS LIBSOUP_LIBS +LIBNDP_CFLAGS +LIBNDP_LIBS +NEWT_CFLAGS +NEWT_LIBS GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS' - +ac_subdirs_all='libndp' # Initialize some variables set by options. ac_init_help= @@ -1610,7 +1644,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 0.9.8.10 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.9.10.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1680,7 +1714,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.9.8.10:";; + short | recursive ) echo "Configuration of NetworkManager 0.9.10.0:";; esac cat <<\_ACEOF @@ -1712,8 +1746,8 @@ Optional Features: --enable-introspection=[no/auto/yes] Enable introspection for this build --enable-qt enable Qt examples - --enable-bluez4 build with BlueZ 4 support instead of BlueZ 5 --enable-wimax enable WiMAX support + --enable-teamdctl enable Teamd control support --enable-polkit enable PolicyKit support --enable-modify-system Allow users to modify system connections --enable-ppp enable PPP/PPPoE support @@ -1723,8 +1757,6 @@ Optional Features: build Vala bindings [[default=auto]] --enable-tests=root|yes|no Build NetworkManager tests (default: yes) - --enable-doc Build NetworkManager documentation (deprecated, use - --enable-gtk-doc) --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]] @@ -1754,12 +1786,18 @@ Optional Packages: --with-suspend-resume=upower|systemd Build NetworkManager with specific suspend/resume support + --with-selinux=yes|no|auto + Build with SELinux (default: auto) --with-crypto=nss|gnutls Cryptography library to use for certificate and key operations --with-dbus-sys-dir=DIR where D-BUS system.d directory is --with-pppd-plugin-dir=DIR path to the pppd plugins directory + --with-pppd=/path/to/pppd + path to pppd binary + --with-pppoe=/path/to/pppoe + path to pppoe binary --with-modem-manager-1 Enable new ModemManager1 interface support --with-dhclient=yes|no|path Enable dhclient 4.x support @@ -1777,9 +1815,11 @@ Optional Packages: --with-kernel-firmware-dir=DIR where kernel firmware directory is (default is /lib/firmware) + --with-nmtui=yes|no Build nmtui + --with-valgrind=yes|no|path + Use valgrind to memory-check the tests (default: + yes) --with-tests Build NetworkManager tests (deprecated) - --with-docs Build NetworkManager documentation (deprecated, use - --enable-gtk-doc) --with-html-dir=PATH path to installed docs Some influential environment variables: @@ -1801,6 +1841,10 @@ Some influential environment variables: path overriding pkg-config's built-in search path DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config DBUS_LIBS linker flags for DBUS, overriding pkg-config + DBUS_GLIB_100_CFLAGS + C compiler flags for DBUS_GLIB_100, overriding pkg-config + DBUS_GLIB_100_LIBS + linker flags for DBUS_GLIB_100, overriding pkg-config GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config GLIB_LIBS linker flags for GLIB, overriding pkg-config GUDEV_CFLAGS @@ -1820,6 +1864,10 @@ Some influential environment variables: C compiler flags for SYSTEMD_INHIBIT, overriding pkg-config SYSTEMD_INHIBIT_LIBS linker flags for SYSTEMD_INHIBIT, overriding pkg-config + SELINUX_CFLAGS + C compiler flags for SELINUX, overriding pkg-config + SELINUX_LIBS + linker flags for SELINUX, overriding pkg-config LIBNL_CFLAGS C compiler flags for LIBNL, overriding pkg-config LIBNL_LIBS linker flags for LIBNL, overriding pkg-config @@ -1829,6 +1877,10 @@ Some influential environment variables: C compiler flags for IWMX_SDK, overriding pkg-config IWMX_SDK_LIBS linker flags for IWMX_SDK, overriding pkg-config + LIBTEAMDCTL_CFLAGS + C compiler flags for LIBTEAMDCTL, overriding pkg-config + LIBTEAMDCTL_LIBS + linker flags for LIBTEAMDCTL, overriding pkg-config POLKIT_CFLAGS C compiler flags for POLKIT, overriding pkg-config POLKIT_LIBS linker flags for POLKIT, overriding pkg-config @@ -1845,6 +1897,11 @@ Some influential environment variables: C compiler flags for LIBSOUP, overriding pkg-config LIBSOUP_LIBS linker flags for LIBSOUP, overriding pkg-config + LIBNDP_CFLAGS + C compiler flags for LIBNDP, overriding pkg-config + LIBNDP_LIBS linker flags for LIBNDP, overriding pkg-config + NEWT_CFLAGS C compiler flags for NEWT, overriding pkg-config + NEWT_LIBS linker flags for NEWT, overriding pkg-config GTKDOC_DEPS_CFLAGS C compiler flags for GTKDOC_DEPS, overriding pkg-config GTKDOC_DEPS_LIBS @@ -1916,7 +1973,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.9.8.10 +NetworkManager configure 0.9.10.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2460,7 +2517,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 0.9.8.10, which was +It was created by NetworkManager $as_me 0.9.10.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2843,6 +2900,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + am__api_version='1.13' # Find a good install program. We prefer a C program (faster), @@ -3329,7 +3387,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.9.8.10' + VERSION='0.9.10.0' cat >>confdefs.h <<_ACEOF @@ -3496,7 +3554,6 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -5793,7 +5850,6 @@ fi - # C++ only required if --enable-qt=yes ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -16581,151 +16637,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=0 NM_MINOR_VERSION=9 -NM_MICRO_VERSION=8 -NM_VERSION=0.9.8.10 -NM_GIT_SHA=b784f9700adc363b077d26e5ac6412ff7c410b22 - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -for ac_header in fcntl.h paths.h sys/ioctl.h sys/time.h syslog.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done +NM_MICRO_VERSION=10 +NM_VERSION=0.9.10.0 +NM_GIT_SHA=6eb82acd6dce882f4b91aafcf68dd9e143ce34e2 -ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = xyes; then : -else -cat >>confdefs.h <<_ACEOF -#define mode_t int -_ACEOF -fi ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" if test "x$ac_cv_type_pid_t" = xyes; then : @@ -16738,158 +16657,6 @@ _ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if ${ac_cv_header_time+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -#include <sys/time.h> -#include <time.h> - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then - -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -fi - - -if test $ac_cv_c_compiler_gnu = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 -$as_echo_n "checking whether $CC needs -traditional... " >&6; } -if ${ac_cv_prog_gcc_traditional+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_pattern="Autoconf.*'x'" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sgtty.h> -Autoconf TIOCGETP -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : - ac_cv_prog_gcc_traditional=yes -else - ac_cv_prog_gcc_traditional=no -fi -rm -f conftest* - - - if test $ac_cv_prog_gcc_traditional = no; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <termio.h> -Autoconf TCGETA -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : - ac_cv_prog_gcc_traditional=yes -fi -rm -f conftest* - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 -$as_echo "$ac_cv_prog_gcc_traditional" >&6; } - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 -$as_echo_n "checking for working memcmp... " >&6; } -if ${ac_cv_func_memcmp_working+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_memcmp_working=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - - /* Some versions of memcmp are not 8-bit clean. */ - char c0 = '\100', c1 = '\200', c2 = '\201'; - if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) - return 1; - - /* The Next x86 OpenStep bug shows up only when comparing 16 bytes - or more and with at least one buffer not starting on a 4-byte boundary. - William Lewis provided this test program. */ - { - char foo[21]; - char bar[21]; - int i; - for (i = 0; i < 4; i++) - { - char *a = foo + i; - char *b = bar + i; - strcpy (a, "--------01111111"); - strcpy (b, "--------10000000"); - if (memcmp (a, b, 16) >= 0) - return 1; - } - return 0; - } - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_memcmp_working=yes -else - ac_cv_func_memcmp_working=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 -$as_echo "$ac_cv_func_memcmp_working" >&6; } -test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in - *" memcmp.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" - ;; -esac - - -for ac_func in select socket uname -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 @@ -19808,6 +19575,12 @@ else CONFIG_PLUGIN_IFNET_FALSE= fi + +if test "$enable_ifcfg_rh" = "yes"; then + DISTRO_NETWORK_SERVICE=network.service +fi + + # Code coverage { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 @@ -19841,7 +19614,7 @@ $as_echo "$enable_code_coverage" >&6; } fi # List of supported lcov versions. - lcov_version_list="1.6 1.7 1.8 1.9" + lcov_version_list="1.6 1.7 1.8 1.9 1.10" # Extract the first word of "lcov", so it can be a program name with args. set dummy lcov; ac_word=$2 @@ -20003,7 +19776,7 @@ code_coverage_quiet_0 = --quiet # Use recursive makes in order to ignore errors during check check-code-coverage: -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) -$(MAKE) $(AM_MAKEFLAGS) -k check $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture else @@ -20012,7 +19785,7 @@ endif # Capture code coverage data code-coverage-capture: code-coverage-capture-hook -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp @@ -20025,11 +19798,13 @@ endif # Hook rule executed before code-coverage-capture, overridable by the user code-coverage-capture-hook: +ifeq ($(CODE_COVERAGE_ENABLED),yes) clean: code-coverage-clean code-coverage-clean: -$(LCOV) --directory $(top_builddir) -z -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) -find . -name "*.gcda" -o -name "*.gcov" -delete +endif GITIGNOREFILES ?= GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) @@ -20149,6 +19924,43 @@ if test "$ac_have_nl80211" = no; then as_fn_error $? "Linux kernel development header linux/nl80211.h not installed or not functional" "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel nl80211 Critical Protocol Start/Stop" >&5 +$as_echo_n "checking Linux kernel nl80211 Critical Protocol Start/Stop... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __user + #define __user + #endif + #include <sys/types.h> + #include <linux/types.h> + #include <sys/socket.h> + #include <linux/nl80211.h> +int +main () +{ +unsigned int a = NL80211_CMD_CRIT_PROTOCOL_START; a++; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_have_nl80211_critproto=yes +else + ac_have_nl80211_critproto=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_nl80211_critproto" >&5 +$as_echo "$ac_have_nl80211_critproto" >&6; } +if test "$ac_have_nl80211_critproto" = yes; then + +$as_echo "#define HAVE_NL80211_CRITICAL_PROTOCOL_CMDS 1" >>confdefs.h + +else + +$as_echo "#define HAVE_NL80211_CRITICAL_PROTOCOL_CMDS 0" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel VLAN_FLAG_LOOSE_BINDING enum value" >&5 $as_echo_n "checking Linux kernel VLAN_FLAG_LOOSE_BINDING enum value... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -20576,12 +20388,142 @@ fi -GLIB_VERSION_DEFINES="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 '-DGLIB_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,34)'" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus_g_method_invocation_get_g_connection in -ldbus-glib-1" >&5 +$as_echo_n "checking for dbus_g_method_invocation_get_g_connection in -ldbus-glib-1... " >&6; } +if ${ac_cv_lib_dbus_glib_1_dbus_g_method_invocation_get_g_connection+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldbus-glib-1 $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 dbus_g_method_invocation_get_g_connection (); +int +main () +{ +return dbus_g_method_invocation_get_g_connection (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dbus_glib_1_dbus_g_method_invocation_get_g_connection=yes +else + ac_cv_lib_dbus_glib_1_dbus_g_method_invocation_get_g_connection=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_dbus_glib_1_dbus_g_method_invocation_get_g_connection" >&5 +$as_echo "$ac_cv_lib_dbus_glib_1_dbus_g_method_invocation_get_g_connection" >&6; } +if test "x$ac_cv_lib_dbus_glib_1_dbus_g_method_invocation_get_g_connection" = xyes; then : + ac_have_gmi_get_con="1" +else + ac_have_gmi_get_con="0" +fi + + +cat >>confdefs.h <<_ACEOF +#define HAVE_DBUS_GLIB_GMI_GET_CONNECTION $ac_have_gmi_get_con +_ACEOF + + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_GLIB_100" >&5 +$as_echo_n "checking for DBUS_GLIB_100... " >&6; } + +if test -n "$DBUS_GLIB_100_CFLAGS"; then + pkg_cv_DBUS_GLIB_100_CFLAGS="$DBUS_GLIB_100_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-glib-1 >= 0.100\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.100") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DBUS_GLIB_100_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.100" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$DBUS_GLIB_100_LIBS"; then + pkg_cv_DBUS_GLIB_100_LIBS="$DBUS_GLIB_100_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-glib-1 >= 0.100\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.100") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DBUS_GLIB_100_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.100" 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_GLIB_100_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-glib-1 >= 0.100" 2>&1` + else + DBUS_GLIB_100_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-glib-1 >= 0.100" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DBUS_GLIB_100_PKG_ERRORS" >&5 + + have_dbus_glib_100=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_dbus_glib_100=no +else + DBUS_GLIB_100_CFLAGS=$pkg_cv_DBUS_GLIB_100_CFLAGS + DBUS_GLIB_100_LIBS=$pkg_cv_DBUS_GLIB_100_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_dbus_glib_100=yes +fi +if (test "${have_dbus_glib_100}" = "yes"); then + +$as_echo "#define HAVE_DBUS_GLIB_100 1" >>confdefs.h + +else + +$as_echo "#define HAVE_DBUS_GLIB_100 0" >>confdefs.h + +fi + if test "${have_dbus_glib_100}" = "yes"; then + HAVE_DBUS_GLIB_100_TRUE= + HAVE_DBUS_GLIB_100_FALSE='#' +else + HAVE_DBUS_GLIB_100_TRUE='#' + HAVE_DBUS_GLIB_100_FALSE= +fi -# dbus-glib uses GValueArray, which is deprecated as of GLib 2.32. -# Set GLIB_VERSION_MIN_REQUIRED to something less than that to avoid -# getting warnings. (GLIB_VERSION_2_26 is the oldest defined version.) -DBUS_CFLAGS="$DBUS_CFLAGS $GLIB_VERSION_DEFINES" pkg_failed=no @@ -20592,12 +20534,12 @@ if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.22 gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.22 gmodule-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20609,12 +20551,12 @@ if test -n "$GLIB_LIBS"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.22 gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.22 gmodule-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20635,14 +20577,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GLIB_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.22 gmodule-2.0) were not met: + as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.32 gmodule-2.0) were not met: $GLIB_PKG_ERRORS @@ -20674,7 +20616,9 @@ else $as_echo "yes" >&6; } fi -GLIB_CFLAGS="$GLIB_CFLAGS $GLIB_VERSION_DEFINES" + +GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32" + @@ -21020,31 +20964,6 @@ else fi -# BlueZ -# Check whether --enable-bluez4 was given. -if test "${enable_bluez4+set}" = set; then : - enableval=$enable_bluez4; enable_bluez4=${enableval} -fi - -if (test "${enable_bluez4}" = "yes"); then - -$as_echo "#define WITH_BLUEZ4 1" >>confdefs.h - -else - -$as_echo "#define WITH_BLUEZ4 0" >>confdefs.h - - enable_bluez4=no -fi - if test "${enable_bluez4}" = "yes"; then - WITH_BLUEZ4_TRUE= - WITH_BLUEZ4_FALSE='#' -else - WITH_BLUEZ4_TRUE='#' - WITH_BLUEZ4_FALSE= -fi - - # systemd unit support # Check whether --with-systemdsystemunitdir was given. @@ -21446,6 +21365,111 @@ else fi +# SELinux support + +# Check whether --with-selinux was given. +if test "${with_selinux+set}" = set; then : + withval=$with_selinux; +else + with_selinux=auto +fi + +if test "$with_selinux" = "yes" -o "$with_selinux" = "auto"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5 +$as_echo_n "checking for SELINUX... " >&6; } + +if test -n "$SELINUX_CFLAGS"; then + pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags "libselinux" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SELINUX_LIBS"; then + pkg_cv_SELINUX_LIBS="$SELINUX_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs "libselinux" 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 + SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libselinux" 2>&1` + else + SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libselinux" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SELINUX_PKG_ERRORS" >&5 + + have_selinux=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_selinux=no +else + SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS + SELINUX_LIBS=$pkg_cv_SELINUX_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_selinux=yes +fi +else + have_selinux=no +fi +if test "$with_selinux" = "yes" -a "$have_selinux" = "no"; then + as_fn_error $? "You must have libselinux installed to build --with-selinux=yes." "$LINENO" 5 +fi +if test "$have_selinux" = "yes"; then + +$as_echo "#define HAVE_SELINUX 1" >>confdefs.h + +else + +$as_echo "#define HAVE_SELINUX 0" >>confdefs.h + +fi + if test "${have_selinux}" = "yes"; then + HAVE_SELINUX_TRUE= + HAVE_SELINUX_FALSE='#' +else + HAVE_SELINUX_TRUE='#' + HAVE_SELINUX_FALSE= +fi + + # libnl support for the linux platform pkg_failed=no @@ -21456,12 +21480,12 @@ if test -n "$LIBNL_CFLAGS"; then pkg_cv_LIBNL_CFLAGS="$LIBNL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNL_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null` + pkg_cv_LIBNL_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -21473,12 +21497,12 @@ if test -n "$LIBNL_LIBS"; then pkg_cv_LIBNL_LIBS="$LIBNL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNL_LIBS=`$PKG_CONFIG --libs "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null` + pkg_cv_LIBNL_LIBS=`$PKG_CONFIG --libs "libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -21499,14 +21523,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>&1` + LIBNL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0" 2>&1` else - LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0" 2>&1` + LIBNL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBNL_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libnl-3.0 >= 3.2.7 libnl-route-3.0 libnl-genl-3.0) were not met: + as_fn_error $? "Package requirements (libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0) were not met: $LIBNL_PKG_ERRORS @@ -21636,6 +21660,132 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5 +$as_echo_n "checking for a readline compatible library... " >&6; } +if ${ax_cv_lib_readline+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ORIG_LIBS="$LIBS" + for readline_lib in readline edit editline; do + # prefer ncurses since we use it for nmtui too + for termcap_lib in "" ncurses termcap curses; do + if test -z "$termcap_lib"; then + TRY_LIB="-l$readline_lib" + else + TRY_LIB="-l$readline_lib -l$termcap_lib" + fi + LIBS="$ORIG_LIBS $TRY_LIB" + 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 readline (); +int +main () +{ +return readline (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_lib_readline="$TRY_LIB" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -n "$ax_cv_lib_readline"; then + break + fi + done + if test -n "$ax_cv_lib_readline"; then + break + fi + done + LIBS="$ORIG_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline" >&5 +$as_echo "$ax_cv_lib_readline" >&6; } + + if test -z "$ax_cv_lib_readline"; then + as_fn_error $? "readline library with terminfo support is required (one of ncurses, curses, or termcap)" "$LINENO" 5 + fi + + LIBS="$LIBS $ax_cv_lib_readline" + for ac_header in readline.h readline/readline.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5 +$as_echo_n "checking whether readline supports history... " >&6; } +if ${ax_cv_lib_readline_history+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_cv_lib_readline_history="no" + 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 add_history (); +int +main () +{ +return add_history (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_lib_readline_history="yes" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline_history" >&5 +$as_echo "$ax_cv_lib_readline_history" >&6; } + if test "$ax_cv_lib_readline_history" != "yes"; then + as_fn_error $? "readline history support is required" "$LINENO" 5 + fi + for ac_header in history.h readline/history.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + READLINE_LIBS="$ax_cv_lib_readline" + + + # Intel WiMAX SDK checks pkg_failed=no @@ -21747,6 +21897,111 @@ else fi +# Teamd control checks + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTEAMDCTL" >&5 +$as_echo_n "checking for LIBTEAMDCTL... " >&6; } + +if test -n "$LIBTEAMDCTL_CFLAGS"; then + pkg_cv_LIBTEAMDCTL_CFLAGS="$LIBTEAMDCTL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libteamdctl >= 1.9\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libteamdctl >= 1.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBTEAMDCTL_CFLAGS=`$PKG_CONFIG --cflags "libteamdctl >= 1.9" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBTEAMDCTL_LIBS"; then + pkg_cv_LIBTEAMDCTL_LIBS="$LIBTEAMDCTL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libteamdctl >= 1.9\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libteamdctl >= 1.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBTEAMDCTL_LIBS=`$PKG_CONFIG --libs "libteamdctl >= 1.9" 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 + LIBTEAMDCTL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libteamdctl >= 1.9" 2>&1` + else + LIBTEAMDCTL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libteamdctl >= 1.9" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBTEAMDCTL_PKG_ERRORS" >&5 + + have_teamdctl=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_teamdctl=no +else + LIBTEAMDCTL_CFLAGS=$pkg_cv_LIBTEAMDCTL_CFLAGS + LIBTEAMDCTL_LIBS=$pkg_cv_LIBTEAMDCTL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_teamdctl=yes +fi +# Check whether --enable-teamdctl was given. +if test "${enable_teamdctl+set}" = set; then : + enableval=$enable_teamdctl; enable_teamdctl=${enableval} +else + enable_teamdctl=${have_teamdctl} +fi + +if (test "${enable_teamdctl}" = "yes"); then + if test x"$have_teamdctl" = x"no"; then + as_fn_error $? "Teamd control is required" "$LINENO" 5 + fi + + + + # temporary bug workaround + LIBTEAMDCTL_CFLAGS=`echo $LIBTEAMDCTL_CFLAGS | sed -e 's:/teamdctl.h::'` + +$as_echo "#define WITH_TEAMDCTL 1" >>confdefs.h + +else + +$as_echo "#define WITH_TEAMDCTL 0" >>confdefs.h + +fi + if test "${enable_teamdctl}" = "yes"; then + WITH_TEAMDCTL_TRUE= + WITH_TEAMDCTL_FALSE='#' +else + WITH_TEAMDCTL_TRUE='#' + WITH_TEAMDCTL_FALSE= +fi + + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5 @@ -22153,7 +22408,7 @@ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` -GLIB_MKENUMS='$(top_srcdir)/tools/glib-mkenums' +GLIB_MKENUMS=`pkg-config --variable=glib_mkenums glib-2.0` @@ -22225,6 +22480,122 @@ else fi + +# Check whether --with-pppd was given. +if test "${with_pppd+set}" = set; then : + withval=$with_pppd; +fi + +if test "x${with_pppd}" = x; then + # Extract the first word of "pppd", so it can be a program name with args. +set dummy pppd; 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_PPPD_PATH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PPPD_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_PPPD_PATH="$PPPD_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/sbin:/usr/sbin" +for as_dir in $as_dummy +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_PPPD_PATH="$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 +PPPD_PATH=$ac_cv_path_PPPD_PATH +if test -n "$PPPD_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PPPD_PATH" >&5 +$as_echo "$PPPD_PATH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +else + PPPD_PATH="$with_pppd" +fi + +cat >>confdefs.h <<_ACEOF +#define PPPD_PATH "$PPPD_PATH" +_ACEOF + + + + +# Check whether --with-pppoe was given. +if test "${with_pppoe+set}" = set; then : + withval=$with_pppoe; +fi + +if test "x${with_pppoe}" = x; then + # Extract the first word of "pppoe", so it can be a program name with args. +set dummy pppoe; 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_PPPOE_PATH+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PPPOE_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_PPPOE_PATH="$PPPOE_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/sbin:/usr/sbin" +for as_dir in $as_dummy +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_PPPOE_PATH="$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 +PPPOE_PATH=$ac_cv_path_PPPOE_PATH +if test -n "$PPPOE_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PPPOE_PATH" >&5 +$as_echo "$PPPOE_PATH" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +else + PPPOE_PATH="$with_pppoe" +fi + +cat >>confdefs.h <<_ACEOF +#define PPPOE_PATH "$PPPOE_PATH" +_ACEOF + + + # ModemManager1 with libmm-glib # Check whether --with-modem-manager-1 was given. @@ -22878,6 +23249,16 @@ else $as_echo "yes" >&6; } have_libsoup=yes fi +if test "$have_libsoup" = "yes"; then + +$as_echo "#define HAVE_LIBSOUP 1" >>confdefs.h + +else + +$as_echo "#define HAVE_LIBSOUP 0" >>confdefs.h + +fi + # Check whether --enable-concheck was given. if test "${enable_concheck+set}" = set; then : enableval=$enable_concheck; enable_concheck=${enableval} @@ -22908,6 +23289,192 @@ else fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNDP" >&5 +$as_echo_n "checking for LIBNDP... " >&6; } + +if test -n "$LIBNDP_CFLAGS"; then + pkg_cv_LIBNDP_CFLAGS="$LIBNDP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libndp\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libndp") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBNDP_CFLAGS=`$PKG_CONFIG --cflags "libndp" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBNDP_LIBS"; then + pkg_cv_LIBNDP_LIBS="$LIBNDP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libndp\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libndp") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBNDP_LIBS=`$PKG_CONFIG --libs "libndp" 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 + LIBNDP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libndp" 2>&1` + else + LIBNDP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libndp" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBNDP_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libndp) were not met: + +$LIBNDP_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables LIBNDP_CFLAGS +and LIBNDP_LIBS to avoid the need to call pkg-config. +See the pkg-config man page 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 $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables LIBNDP_CFLAGS +and LIBNDP_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } +else + LIBNDP_CFLAGS=$pkg_cv_LIBNDP_CFLAGS + LIBNDP_LIBS=$pkg_cv_LIBNDP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + +# Check whether --with-nmtui was given. +if test "${with_nmtui+set}" = set; then : + withval=$with_nmtui; +fi + +if test "$with_nmtui" != no; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NEWT" >&5 +$as_echo_n "checking for NEWT... " >&6; } + +if test -n "$NEWT_CFLAGS"; then + pkg_cv_NEWT_CFLAGS="$NEWT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnewt >= 0.52.15\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnewt >= 0.52.15") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NEWT_CFLAGS=`$PKG_CONFIG --cflags "libnewt >= 0.52.15" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$NEWT_LIBS"; then + pkg_cv_NEWT_LIBS="$NEWT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnewt >= 0.52.15\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnewt >= 0.52.15") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NEWT_LIBS=`$PKG_CONFIG --libs "libnewt >= 0.52.15" 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 + NEWT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnewt >= 0.52.15" 2>&1` + else + NEWT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnewt >= 0.52.15" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$NEWT_PKG_ERRORS" >&5 + + build_nmtui=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + build_nmtui=no +else + NEWT_CFLAGS=$pkg_cv_NEWT_CFLAGS + NEWT_LIBS=$pkg_cv_NEWT_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + build_nmtui=yes +fi +else + build_nmtui=no +fi +if test "$with_nmtui" = yes -a "$build_nmtui" = no; then + as_fn_error $? "You must have libnewt installed to build nmtui." "$LINENO" 5 +fi + if test "$build_nmtui" = yes; then + BUILD_NMTUI_TRUE= + BUILD_NMTUI_FALSE='#' +else + BUILD_NMTUI_TRUE='#' + BUILD_NMTUI_FALSE= +fi + + + # Check whether --enable-more-warnings was given. if test "${enable_more_warnings+set}" = set; then : enableval=$enable_more_warnings; set_more_warnings="$enableval" @@ -22923,7 +23490,7 @@ $as_echo "yes" >&6; } CFLAGS="-Wall -std=gnu89 $CFLAGS" for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \ - -Wdeclaration-after-statement \ + -Wdeclaration-after-statement -Wformat-security \ -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \ -fno-strict-aliasing -Wno-unused-but-set-variable \ -Wundef -Wimplicit-function-declaration \ @@ -23215,6 +23782,12 @@ if test "${enable_tests+set}" = set; then : enableval=$enable_tests; fi + +# Check whether --with-valgrind was given. +if test "${with_valgrind+set}" = set; then : + withval=$with_valgrind; +fi + # Fallback to --with-tests # Check whether --with-tests was given. @@ -23225,96 +23798,41 @@ fi if test -n "$with_tests"; then : enable_tests="$with_tests" fi -# Default to --enable-tests +# Default to --enable-tests --with-valgrind if test -z "$enable_tests"; then : enable_tests="yes" fi +if test -z "$with_valgrind"; then : + with_valgrind="yes" +fi # Normalize values if test "$enable_tests" != "yes" -a "$enable_tests" != "root"; then : enable_tests="no" fi -# Add conditionals - if test "$enable_tests" != "no"; then - ENABLE_TESTS_TRUE= - ENABLE_TESTS_FALSE='#' -else - ENABLE_TESTS_TRUE='#' - ENABLE_TESTS_FALSE= -fi - - if test "$enable_tests" == "root"; then - RUN_ROOT_TESTS_TRUE= - RUN_ROOT_TESTS_FALSE='#' -else - RUN_ROOT_TESTS_TRUE='#' - RUN_ROOT_TESTS_FALSE= -fi - - -# Backwards compatible documentation enable/disable - -# Check whether --with-docs was given. -if test "${with_docs+set}" = set; then : - withval=$with_docs; -fi - -# Check whether --enable-doc was given. -if test "${enable_doc+set}" = set; then : - enableval=$enable_doc; -fi - -if test "$with_docs" = "yes"; then : - enable_gtk_doc="yes" -fi -if test "$enable_doc" = "yes"; then : - enable_gtk_doc="yes" -fi - - - - gtk_doc_requires="gtk-doc >= 1.0" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 -$as_echo_n "checking for gtk-doc... " >&6; } - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - have_gtk_doc=yes -else - have_gtk_doc=no -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 -$as_echo "$have_gtk_doc" >&6; } - - if test "$have_gtk_doc" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: - You will not be able to create source packages with 'make dist' - because $gtk_doc_requires is not found." >&5 -$as_echo "$as_me: WARNING: - You will not be able to create source packages with 'make dist' - because $gtk_doc_requires is not found." >&2;} - fi - - # Extract the first word of "gtkdoc-check", so it can be a program name with args. -set dummy gtkdoc-check; ac_word=$2 +# Search for tools +if test "$with_valgrind" == "yes"; then : + for ac_prog in valgrind +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; 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_prog_GTKDOC_CHECK+:} false; then : +if ${ac_cv_path_with_valgrind+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$GTKDOC_CHECK"; then - ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $with_valgrind in + [\\/]* | ?:[\\/]*) + ac_cv_path_with_valgrind="$with_valgrind" # 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_prog_GTKDOC_CHECK="gtkdoc-check.test" + ac_cv_path_with_valgrind="$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 @@ -23322,28 +23840,59 @@ done done IFS=$as_save_IFS + ;; +esac fi -fi -GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +with_valgrind=$ac_cv_path_with_valgrind +if test -n "$with_valgrind"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_valgrind" >&5 +$as_echo "$with_valgrind" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - # Extract the first word of "gtkdoc-check", so it can be a program name with args. + test -n "$with_valgrind" && break +done +test -n "$with_valgrind" || with_valgrind="no" + +fi +# Add conditionals and substitutions + if test "$enable_tests" != "no"; then + ENABLE_TESTS_TRUE= + ENABLE_TESTS_FALSE='#' +else + ENABLE_TESTS_TRUE='#' + ENABLE_TESTS_FALSE= +fi + + if test "$enable_tests" == "root"; then + REQUIRE_ROOT_TESTS_TRUE= + REQUIRE_ROOT_TESTS_FALSE='#' +else + REQUIRE_ROOT_TESTS_TRUE='#' + REQUIRE_ROOT_TESTS_FALSE= +fi + +if test "$with_valgrind" != "no"; then : + VALGRIND_RULES='TESTS_ENVIRONMENT = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" "$(top_srcdir)/valgrind.suppressions"' + +fi + + + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; 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_GTKDOC_CHECK_PATH+:} false; then : +if ${ac_cv_path_GTKDOC_CHECK+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK_PATH in + case $GTKDOC_CHECK in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. + ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -23353,7 +23902,7 @@ do 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_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_CHECK="$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 @@ -23364,10 +23913,10 @@ IFS=$as_save_IFS ;; esac fi -GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH -if test -n "$GTKDOC_CHECK_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 -$as_echo "$GTKDOC_CHECK_PATH" >&6; } +GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -23480,19 +24029,18 @@ else fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } - - if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then - as_fn_error $? " - You must have $gtk_doc_requires installed to build documentation for - $PACKAGE_NAME. Please install gtk-doc or disable building the - documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 - fi - - if test "x$PACKAGE_NAME" != "xglib"; then + if test x$enable_gtk_doc = xyes; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + : +else + as_fn_error $? "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5 +fi + if test "x$PACKAGE_NAME" != "xglib"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 @@ -23564,8 +24112,14 @@ else $as_echo "yes" >&6; } fi + fi fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + # Check whether --enable-gtk-doc-html was given. if test "${enable_gtk_doc_html+set}" = set; then : enableval=$enable_gtk_doc_html; @@ -23590,14 +24144,6 @@ fi fi - if test x$have_gtk_doc = xyes; then - HAVE_GTK_DOC_TRUE= - HAVE_GTK_DOC_FALSE='#' -else - HAVE_GTK_DOC_TRUE='#' - HAVE_GTK_DOC_FALSE= -fi - if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= ENABLE_GTK_DOC_FALSE='#' @@ -23642,7 +24188,11 @@ fi # check for pregenerated manpages to be installed install_pregen_manpages=no -if test "$enable_gtk_doc" != "yes" -a -f man/nm-settings.5; then +if test "$enable_gtk_doc" != "yes" \ + -a -f man/NetworkManager.conf.5 \ + -a -f man/nm-settings.5 \ + -a -f man/nmcli-examples.5 \ + -a -f man/NetworkManager.8; then install_pregen_manpages=yes fi if test "x${install_pregen_manpages}" = "xyes"; then @@ -23655,7 +24205,11 @@ fi -ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile src/generated/Makefile src/logging/Makefile src/posix-signals/Makefile src/dns-manager/Makefile src/vpn-manager/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/ip6-manager/Makefile src/supplicant-manager/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/dnsmasq-manager/Makefile src/modem-manager/Makefile src/bluez-manager/Makefile src/wifi/Makefile src/firewall-manager/Makefile src/settings/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/wimax/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile cli/completion/Makefile test/Makefile initscript/RedHat/NetworkManager initscript/Debian/NetworkManager initscript/Slackware/rc.networkmanager initscript/SUSE/networkmanager initscript/Arch/networkmanager initscript/paldo/NetworkManager initscript/Mandriva/networkmanager initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/NetworkManager.8 man/NetworkManager.conf.5 man/nm-system-settings.conf.5 man/nm-tool.1 man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile 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 NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile" +ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile src/config/tests/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/dnsmasq-manager/tests/Makefile src/supplicant-manager/tests/Makefile src/ppp-manager/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ifcfg-suse/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/settings/plugins/example/Makefile src/settings/tests/Makefile src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/adsl/Makefile src/devices/wimax/Makefile src/devices/bluetooth/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/Makefile libnm-util/tests/certs/Makefile libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile callouts/Makefile callouts/tests/Makefile tools/Makefile cli/Makefile cli/src/Makefile cli/completion/Makefile tui/Makefile tui/newt/Makefile test/Makefile initscript/RedHat/NetworkManager initscript/Debian/NetworkManager initscript/Slackware/rc.networkmanager initscript/SUSE/networkmanager initscript/Arch/networkmanager initscript/Mandriva/networkmanager initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile man/nm-system-settings.conf.5 man/nm-online.1 man/nmcli.1 po/Makefile.in policy/Makefile policy/org.freedesktop.NetworkManager.policy.in data/Makefile docs/Makefile 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 NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/python/dbus/Makefile examples/python/gi/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile" + + + +subdirs="$subdirs libndp" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -23831,6 +24385,10 @@ if test -z "${WITH_WEXT_TRUE}" && test -z "${WITH_WEXT_FALSE}"; then as_fn_error $? "conditional \"WITH_WEXT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_DBUS_GLIB_100_TRUE}" && test -z "${HAVE_DBUS_GLIB_100_FALSE}"; then + as_fn_error $? "conditional \"HAVE_DBUS_GLIB_100\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23839,10 +24397,6 @@ 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 fi -if test -z "${WITH_BLUEZ4_TRUE}" && test -z "${WITH_BLUEZ4_FALSE}"; then - as_fn_error $? "conditional \"WITH_BLUEZ4\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23867,10 +24421,18 @@ if test -z "${SUSPEND_RESUME_SYSTEMD_TRUE}" && test -z "${SUSPEND_RESUME_SYSTEMD as_fn_error $? "conditional \"SUSPEND_RESUME_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_SELINUX_TRUE}" && test -z "${HAVE_SELINUX_FALSE}"; then + as_fn_error $? "conditional \"HAVE_SELINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITH_WIMAX_TRUE}" && test -z "${WITH_WIMAX_FALSE}"; then as_fn_error $? "conditional \"WITH_WIMAX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITH_TEAMDCTL_TRUE}" && test -z "${WITH_TEAMDCTL_FALSE}"; then + as_fn_error $? "conditional \"WITH_TEAMDCTL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITH_POLKIT_TRUE}" && test -z "${WITH_POLKIT_FALSE}"; then as_fn_error $? "conditional \"WITH_POLKIT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23895,6 +24457,10 @@ if test -z "${WITH_CONCHECK_TRUE}" && test -z "${WITH_CONCHECK_FALSE}"; then as_fn_error $? "conditional \"WITH_CONCHECK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${BUILD_NMTUI_TRUE}" && test -z "${BUILD_NMTUI_FALSE}"; then + as_fn_error $? "conditional \"BUILD_NMTUI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_VAPIGEN_TRUE}" && test -z "${ENABLE_VAPIGEN_FALSE}"; then as_fn_error $? "conditional \"ENABLE_VAPIGEN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23903,12 +24469,8 @@ if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${RUN_ROOT_TESTS_TRUE}" && test -z "${RUN_ROOT_TESTS_FALSE}"; then - as_fn_error $? "conditional \"RUN_ROOT_TESTS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then - as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. +if test -z "${REQUIRE_ROOT_TESTS_TRUE}" && test -z "${REQUIRE_ROOT_TESTS_FALSE}"; then + as_fn_error $? "conditional \"REQUIRE_ROOT_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then @@ -24332,7 +24894,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 0.9.8.10, which was +This file was extended by NetworkManager $as_me 0.9.10.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24398,7 +24960,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 0.9.8.10 +NetworkManager config.status 0.9.10.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -24918,23 +25480,12 @@ do "include/nm-version.h") CONFIG_FILES="$CONFIG_FILES include/nm-version.h" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;; - "src/generated/Makefile") CONFIG_FILES="$CONFIG_FILES src/generated/Makefile" ;; - "src/logging/Makefile") CONFIG_FILES="$CONFIG_FILES src/logging/Makefile" ;; - "src/posix-signals/Makefile") CONFIG_FILES="$CONFIG_FILES src/posix-signals/Makefile" ;; - "src/dns-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/dns-manager/Makefile" ;; - "src/vpn-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/vpn-manager/Makefile" ;; + "src/config/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/config/tests/Makefile" ;; "src/dhcp-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/dhcp-manager/Makefile" ;; "src/dhcp-manager/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/dhcp-manager/tests/Makefile" ;; - "src/ip6-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/ip6-manager/Makefile" ;; - "src/supplicant-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/supplicant-manager/Makefile" ;; + "src/dnsmasq-manager/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/dnsmasq-manager/tests/Makefile" ;; "src/supplicant-manager/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/supplicant-manager/tests/Makefile" ;; "src/ppp-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/ppp-manager/Makefile" ;; - "src/dnsmasq-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/dnsmasq-manager/Makefile" ;; - "src/modem-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/modem-manager/Makefile" ;; - "src/bluez-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/bluez-manager/Makefile" ;; - "src/wifi/Makefile") CONFIG_FILES="$CONFIG_FILES src/wifi/Makefile" ;; - "src/firewall-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/firewall-manager/Makefile" ;; - "src/settings/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/Makefile" ;; "src/settings/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/Makefile" ;; "src/settings/plugins/ifupdown/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifupdown/Makefile" ;; "src/settings/plugins/ifupdown/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifupdown/tests/Makefile" ;; @@ -24949,7 +25500,16 @@ do "src/settings/plugins/keyfile/tests/keyfiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/keyfile/tests/keyfiles/Makefile" ;; "src/settings/plugins/example/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/example/Makefile" ;; "src/settings/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/tests/Makefile" ;; - "src/wimax/Makefile") CONFIG_FILES="$CONFIG_FILES src/wimax/Makefile" ;; + "src/platform/Makefile") CONFIG_FILES="$CONFIG_FILES src/platform/Makefile" ;; + "src/platform/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/platform/tests/Makefile" ;; + "src/rdisc/Makefile") CONFIG_FILES="$CONFIG_FILES src/rdisc/Makefile" ;; + "src/rdisc/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/rdisc/tests/Makefile" ;; + "src/devices/adsl/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/adsl/Makefile" ;; + "src/devices/wimax/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wimax/Makefile" ;; + "src/devices/bluetooth/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/bluetooth/Makefile" ;; + "src/devices/wifi/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wifi/Makefile" ;; + "src/devices/wifi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wifi/tests/Makefile" ;; + "src/devices/wwan/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wwan/Makefile" ;; "libnm-util/libnm-util.pc") CONFIG_FILES="$CONFIG_FILES libnm-util/libnm-util.pc" ;; "libnm-util/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-util/Makefile" ;; "libnm-util/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-util/tests/Makefile" ;; @@ -24964,22 +25524,20 @@ do "cli/Makefile") CONFIG_FILES="$CONFIG_FILES cli/Makefile" ;; "cli/src/Makefile") CONFIG_FILES="$CONFIG_FILES cli/src/Makefile" ;; "cli/completion/Makefile") CONFIG_FILES="$CONFIG_FILES cli/completion/Makefile" ;; + "tui/Makefile") CONFIG_FILES="$CONFIG_FILES tui/Makefile" ;; + "tui/newt/Makefile") CONFIG_FILES="$CONFIG_FILES tui/newt/Makefile" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "initscript/RedHat/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/RedHat/NetworkManager" ;; "initscript/Debian/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/Debian/NetworkManager" ;; "initscript/Slackware/rc.networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Slackware/rc.networkmanager" ;; "initscript/SUSE/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/SUSE/networkmanager" ;; "initscript/Arch/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Arch/networkmanager" ;; - "initscript/paldo/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/paldo/NetworkManager" ;; "initscript/Mandriva/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Mandriva/networkmanager" ;; "initscript/linexa/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/linexa/networkmanager" ;; "introspection/Makefile") CONFIG_FILES="$CONFIG_FILES introspection/Makefile" ;; "introspection/all.xml") CONFIG_FILES="$CONFIG_FILES introspection/all.xml" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; - "man/NetworkManager.8") CONFIG_FILES="$CONFIG_FILES man/NetworkManager.8" ;; - "man/NetworkManager.conf.5") CONFIG_FILES="$CONFIG_FILES man/NetworkManager.conf.5" ;; "man/nm-system-settings.conf.5") CONFIG_FILES="$CONFIG_FILES man/nm-system-settings.conf.5" ;; - "man/nm-tool.1") CONFIG_FILES="$CONFIG_FILES man/nm-tool.1" ;; "man/nm-online.1") CONFIG_FILES="$CONFIG_FILES man/nm-online.1" ;; "man/nmcli.1") CONFIG_FILES="$CONFIG_FILES man/nmcli.1" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; @@ -24997,6 +25555,8 @@ do "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "examples/shell/Makefile") CONFIG_FILES="$CONFIG_FILES examples/shell/Makefile" ;; "examples/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/Makefile" ;; + "examples/python/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/dbus/Makefile" ;; + "examples/python/gi/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/gi/Makefile" ;; "examples/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES examples/ruby/Makefile" ;; "examples/C/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/Makefile" ;; "examples/C/glib/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/glib/Makefile" ;; @@ -26655,6 +27215,151 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || as_fn_exit 1 fi + +# +# CONFIG_SUBDIRS section. +# +if test "$no_recursion" != yes; then + + # Remove --cache-file, --srcdir, and --disable-option-checking arguments + # so they do not pile up. + ac_sub_configure_args= + ac_prev= + eval "set x $ac_configure_args" + shift + for ac_arg + do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case $ac_arg in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ + | --c=*) + ;; + --config-cache | -C) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + ;; + --disable-option-checking) + ;; + *) + case $ac_arg in + *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_sub_configure_args " '$ac_arg'" ;; + esac + done + + # Always prepend --prefix to ensure using the same prefix + # in subdir configurations. + ac_arg="--prefix=$prefix" + case $ac_arg in + *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" + + # Pass --silent + if test "$silent" = yes; then + ac_sub_configure_args="--silent $ac_sub_configure_args" + fi + + # Always prepend --disable-option-checking to silence warnings, since + # different subdirs can have different --enable and --with options. + ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args" + + ac_popdir=`pwd` + for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + test -d "$srcdir/$ac_dir" || continue + + ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" + $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 + $as_echo "$ac_msg" >&6 + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + cd "$ac_dir" + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f "$ac_srcdir/configure.gnu"; then + ac_sub_configure=$ac_srcdir/configure.gnu + elif test -f "$ac_srcdir/configure"; then + ac_sub_configure=$ac_srcdir/configure + elif test -f "$ac_srcdir/configure.in"; then + # This should be Cygnus configure. + ac_sub_configure=$ac_aux_dir/configure + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 +$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + # Make the cache file name correct relative to the subdirectory. + case $cache_file in + [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; + *) # Relative name. + ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + # The eval makes quoting arguments work. + eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ + --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || + as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 + fi + + cd "$ac_popdir" + done +fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} @@ -26686,6 +27391,7 @@ if test "${enable_polkit}" = "yes"; then else echo " policykit: no" fi +echo " selinux: $have_selinux" echo echo "Features:" @@ -26694,7 +27400,8 @@ echo " wimax: $enable_wimax" echo " ppp: $enable_ppp" echo " modemmanager-1: $with_modem_manager_1" echo " concheck: $enable_concheck" -echo " bluez 4: $enable_bluez4" +echo " libteamdctl: $enable_teamdctl" +echo " nmtui: $build_nmtui" echo echo "Configuration plugins" @@ -26717,5 +27424,6 @@ echo echo "Miscellaneous:" echo " documentation: $enable_gtk_doc" echo " tests: $enable_tests" +echo " valgrind: $with_valgrind" echo " code coverage: $enable_code_coverage" echo |