diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2786 |
1 files changed, 1442 insertions, 1344 deletions
diff --git a/configure b/configure index 5c7016b4..923fa923 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.68 for NetworkManager 0.9.6.4. +# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.7.995. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>. # @@ -571,8 +571,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='0.9.6.4' -PACKAGE_STRING='NetworkManager 0.9.6.4' +PACKAGE_VERSION='0.9.7.995' +PACKAGE_STRING='NetworkManager 0.9.7.995' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -616,13 +616,6 @@ gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS -WITH_TESTS_FALSE -WITH_TESTS_TRUE -ENABLE_VAPIGEN_FALSE -ENABLE_VAPIGEN_TRUE -VAPIGEN_MAKEFILE -VAPIGEN_VAPIDIR -VAPIGEN GTK_DOC_USE_REBASE_FALSE GTK_DOC_USE_REBASE_TRUE GTK_DOC_USE_LIBTOOL_FALSE @@ -639,6 +632,17 @@ HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE GTKDOC_CHECK +ENABLE_DOC_FALSE +ENABLE_DOC_TRUE +RUN_ROOT_TESTS_FALSE +RUN_ROOT_TESTS_TRUE +ENABLE_TESTS_FALSE +ENABLE_TESTS_TRUE +ENABLE_VAPIGEN_FALSE +ENABLE_VAPIGEN_TRUE +VAPIGEN_MAKEFILE +VAPIGEN_VAPIDIR +VAPIGEN WITH_CONCHECK_FALSE WITH_CONCHECK_TRUE LIBSOUP_LIBS @@ -646,10 +650,16 @@ LIBSOUP_CFLAGS KERNEL_FIRMWARE_DIR SYSTEM_CA_PATH IPTABLES_PATH -RESOLVCONF_PATH +with_netconfig +with_resolvconf DHCPCD_PATH -DHCLIENT_VERSION DHCLIENT_PATH +with_dhcpcd +with_dhclient +WITH_MODEM_MANAGER_1_FALSE +WITH_MODEM_MANAGER_1_TRUE +MM_GLIB_LIBS +MM_GLIB_CFLAGS PPPD_PLUGIN_DIR WITH_PPP_FALSE WITH_PPP_TRUE @@ -669,6 +679,7 @@ GNUTLS_CFLAGS PKGCONFIG_PATH NSS_LIBS NSS_CFLAGS +NM_MODIFY_SYSTEM_POLICY WITH_POLKIT_FALSE WITH_POLKIT_TRUE POLKIT_LIBS @@ -685,21 +696,24 @@ LIBNL1_LIBS LIBNL1_CFLAGS LIBNL2_LIBS LIBNL2_CFLAGS -LIBNL_GENL3_LIBS -LIBNL_GENL3_CFLAGS -LIBNL_ROUTE3_LIBS -LIBNL_ROUTE3_CFLAGS LIBNL3_LIBS LIBNL3_CFLAGS +SUSPEND_RESUME_SYSTEMD_FALSE +SUSPEND_RESUME_SYSTEMD_TRUE +SUSPEND_RESUME_UPOWER_FALSE +SUSPEND_RESUME_UPOWER_TRUE +SYSTEMD_INHIBIT_LIBS +SYSTEMD_INHIBIT_CFLAGS +CKDB_PATH +SYSTEMD_LOGIN_LIBS +SYSTEMD_LOGIN_CFLAGS SESSION_TRACKING_SYSTEMD_FALSE SESSION_TRACKING_SYSTEMD_TRUE SESSION_TRACKING_CK_FALSE SESSION_TRACKING_CK_TRUE -SYSTEMD_LIBS -SYSTEMD_CFLAGS +systemdsystemunitdir HAVE_SYSTEMD_FALSE HAVE_SYSTEMD_TRUE -systemdsystemunitdir UDEV_BASE_DIR WITH_QT_FALSE WITH_QT_TRUE @@ -716,12 +730,8 @@ INTROSPECTION_GIRDIR INTROSPECTION_GENERATE INTROSPECTION_COMPILER INTROSPECTION_SCANNER -GIO_LIBS -GIO_CFLAGS GUDEV_LIBS GUDEV_CFLAGS -GMODULE_LIBS -GMODULE_CFLAGS GLIB_LIBS GLIB_CFLAGS DBUS_LIBS @@ -733,36 +743,27 @@ LIBDL LIBM WITH_WEXT_FALSE WITH_WEXT_TRUE -TARGET_LFS_FALSE -TARGET_LFS_TRUE -TARGET_EXHERBO_FALSE -TARGET_EXHERBO_TRUE -TARGET_LINEXA_FALSE -TARGET_LINEXA_TRUE -TARGET_PARDUS_FALSE -TARGET_PARDUS_TRUE -TARGET_MANDRIVA_FALSE -TARGET_MANDRIVA_TRUE -TARGET_FRUGALWARE_FALSE -TARGET_FRUGALWARE_TRUE -TARGET_PALDO_FALSE -TARGET_PALDO_TRUE -TARGET_ARCH_FALSE -TARGET_ARCH_TRUE -TARGET_SLACKWARE_FALSE -TARGET_SLACKWARE_TRUE -TARGET_DEBIAN_FALSE -TARGET_DEBIAN_TRUE -TARGET_GENTOO_FALSE -TARGET_GENTOO_TRUE -TARGET_SUSE_FALSE -TARGET_SUSE_TRUE -TARGET_REDHAT_FALSE -TARGET_REDHAT_TRUE -TARGET_GENERIC_FALSE -TARGET_GENERIC_TRUE -WITH_DOCS_FALSE -WITH_DOCS_TRUE +GNOME_CODE_COVERAGE_RULES +CODE_COVERAGE_LDFLAGS +CODE_COVERAGE_CFLAGS +GENHTML +LCOV +CODE_COVERAGE_ENABLED +CODE_COVERAGE_ENABLED_FALSE +CODE_COVERAGE_ENABLED_TRUE +CONFIG_PLUGIN_IFNET_FALSE +CONFIG_PLUGIN_IFNET_TRUE +CONFIG_PLUGIN_IFUPDOWN_FALSE +CONFIG_PLUGIN_IFUPDOWN_TRUE +CONFIG_PLUGIN_IFCFG_SUSE_FALSE +CONFIG_PLUGIN_IFCFG_SUSE_TRUE +CONFIG_PLUGIN_IFCFG_RH_FALSE +CONFIG_PLUGIN_IFCFG_RH_TRUE +nmrundir +nmstatedir +nmdatadir +nmconfdir +nmbinary GETTEXT_PACKAGE POSUB LTLIBINTL @@ -817,7 +818,6 @@ NM_VERSION NM_MICRO_VERSION NM_MINOR_VERSION NM_MAJOR_VERSION -DISABLE_DEPRECATED CXXCPP OTOOL64 OTOOL @@ -957,8 +957,11 @@ enable_nls enable_rpath with_libiconv_prefix with_libintl_prefix -with_docs -with_distro +enable_ifcfg_rh +enable_ifcfg_suse +enable_ifupdown +enable_ifnet +enable_code_coverage with_dist_version with_wext enable_introspection @@ -966,27 +969,35 @@ enable_qt with_udev_dir with_systemdsystemunitdir with_session_tracking +with_suspend_resume +with_libnl enable_wimax enable_polkit +enable_modify_system with_crypto with_dbus_sys_dir enable_ppp with_pppd_plugin_dir +with_modem_manager_1 with_dhclient with_dhcpcd with_resolvconf +with_netconfig with_iptables with_system_ca_path with_kernel_firmware_dir enable_crashtrace enable_concheck enable_more_warnings +enable_vala +enable_tests +enable_doc +with_tests +with_docs with_html_dir enable_gtk_doc enable_gtk_doc_html enable_gtk_doc_pdf -enable_vala -with_tests ' ac_precious_vars='build_alias host_alias @@ -1008,22 +1019,16 @@ DBUS_CFLAGS DBUS_LIBS GLIB_CFLAGS GLIB_LIBS -GMODULE_CFLAGS -GMODULE_LIBS GUDEV_CFLAGS GUDEV_LIBS -GIO_CFLAGS -GIO_LIBS QT_CFLAGS QT_LIBS -SYSTEMD_CFLAGS -SYSTEMD_LIBS +SYSTEMD_LOGIN_CFLAGS +SYSTEMD_LOGIN_LIBS +SYSTEMD_INHIBIT_CFLAGS +SYSTEMD_INHIBIT_LIBS LIBNL3_CFLAGS LIBNL3_LIBS -LIBNL_ROUTE3_CFLAGS -LIBNL_ROUTE3_LIBS -LIBNL_GENL3_CFLAGS -LIBNL_GENL3_LIBS LIBNL2_CFLAGS LIBNL2_LIBS LIBNL1_CFLAGS @@ -1038,6 +1043,8 @@ NSS_CFLAGS NSS_LIBS GNUTLS_CFLAGS GNUTLS_LIBS +MM_GLIB_CFLAGS +MM_GLIB_LIBS LIBSOUP_CFLAGS LIBSOUP_LIBS GTKDOC_DEPS_CFLAGS @@ -1584,7 +1591,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.6.4 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.9.7.995 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1654,7 +1661,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.9.6.4:";; + short | recursive ) echo "Configuration of NetworkManager 0.9.7.995:";; esac cat <<\_ACEOF @@ -1675,20 +1682,29 @@ 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-ifcfg-rh enable ifcfg-rh configuration plugin (Fedora/RHEL) + --enable-ifcfg-suse enable ifcfg-suse configuration plugin (SUSE) + --enable-ifupdown enable ifupdown configuration plugin (Debian/Ubuntu) + --enable-ifnet enable ifnet configuration plugin (Gentoo) + --enable-code-coverage Whether to enable code coverage support --enable-introspection=[no/auto/yes] Enable introspection for this build --enable-qt enable Qt examples --enable-wimax enable WiMAX support --enable-polkit enable PolicyKit support + --enable-modify-system Allow users to modify system connections --enable-ppp enable PPP/PPPoE support --disable-crashtrace Disable GNU backtrace extensions --enable-concheck enable connectivity checking support --enable-more-warnings Possible values: no/yes/error + --enable-vala=[no/auto/yes] + build Vala bindings [[default=auto]] + --enable-tests=root|yes|no + Build NetworkManager tests (default: yes) + --enable-doc Build NetworkManager documentation (default: no) --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]] - --enable-vala=[no/auto/yes] - build Vala bindings [[default=auto]] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1703,31 +1719,33 @@ 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-docs Build NetworkManager documentation - --with-distro=DISTRO Specify the Linux distribution to target: One of - redhat, suse, gentoo, debian, arch, slackware, - paldo, mandriva, pardus, linexa, exherbo or lfs --with-dist-version=<NM-distribution-version> - Define the NM's distribution version string + Define the NM''s distribution version string --with-wext=yes Enable or disable Linux Wireless Extensions --with-udev-dir=DIR where the udev base directory is --with-systemdsystemunitdir=DIR Directory for systemd service files - --with-session-tracking=systemd|ck|none - Build NetworkManager with specific session tracking + --with-session-tracking=systemd|consolekit|no + Select session tracking support (default: + consolekit) + --with-suspend-resume=upower|systemd + Build NetworkManager with specific suspend/resume support + --with-libnl=1|2|3 Select libnl version (default: latest available) --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-modem-manager-1 Enable new ModemManager1 interface support --with-dhclient=yes|no|path Enable dhclient 4.x support --with-dhcpcd=yes|no|path Enable dhcpcd 4.x support --with-resolvconf=yes|no|path Enable resolvconf support + --with-netconfig=yes|no Enable SUSE netconfig support --with-iptables=/path/to/iptables path to iptables --with-system-ca-path=/path/to/ssl/certs @@ -1735,8 +1753,9 @@ Optional Packages: --with-kernel-firmware-dir=DIR where kernel firmware directory is (default is /lib/firmware) + --with-tests Build NetworkManager tests (deprecated) + --with-docs Build NetworkManager documentation (deprecated) --with-html-dir=PATH path to installed docs - --with-tests Build NetworkManager tests Some influential environment variables: CC C compiler command @@ -1759,32 +1778,22 @@ Some influential environment variables: DBUS_LIBS linker flags for DBUS, overriding pkg-config GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config GLIB_LIBS linker flags for GLIB, overriding pkg-config - GMODULE_CFLAGS - C compiler flags for GMODULE, overriding pkg-config - GMODULE_LIBS - linker flags for GMODULE, overriding pkg-config GUDEV_CFLAGS C compiler flags for GUDEV, overriding pkg-config GUDEV_LIBS linker flags for GUDEV, overriding pkg-config - GIO_CFLAGS C compiler flags for GIO, overriding pkg-config - GIO_LIBS linker flags for GIO, overriding pkg-config QT_CFLAGS C compiler flags for QT, overriding pkg-config QT_LIBS linker flags for QT, overriding pkg-config - SYSTEMD_CFLAGS - C compiler flags for SYSTEMD, overriding pkg-config - SYSTEMD_LIBS - linker flags for SYSTEMD, overriding pkg-config + SYSTEMD_LOGIN_CFLAGS + C compiler flags for SYSTEMD_LOGIN, overriding pkg-config + SYSTEMD_LOGIN_LIBS + linker flags for SYSTEMD_LOGIN, overriding pkg-config + SYSTEMD_INHIBIT_CFLAGS + C compiler flags for SYSTEMD_INHIBIT, overriding pkg-config + SYSTEMD_INHIBIT_LIBS + linker flags for SYSTEMD_INHIBIT, overriding pkg-config LIBNL3_CFLAGS C compiler flags for LIBNL3, overriding pkg-config LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config - LIBNL_ROUTE3_CFLAGS - C compiler flags for LIBNL_ROUTE3, overriding pkg-config - LIBNL_ROUTE3_LIBS - linker flags for LIBNL_ROUTE3, overriding pkg-config - LIBNL_GENL3_CFLAGS - C compiler flags for LIBNL_GENL3, overriding pkg-config - LIBNL_GENL3_LIBS - linker flags for LIBNL_GENL3, overriding pkg-config LIBNL2_CFLAGS C compiler flags for LIBNL2, overriding pkg-config LIBNL2_LIBS linker flags for LIBNL2, overriding pkg-config @@ -1805,6 +1814,10 @@ Some influential environment variables: GNUTLS_CFLAGS C compiler flags for GNUTLS, overriding pkg-config GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config + MM_GLIB_CFLAGS + C compiler flags for MM_GLIB, overriding pkg-config + MM_GLIB_LIBS + linker flags for MM_GLIB, overriding pkg-config LIBSOUP_CFLAGS C compiler flags for LIBSOUP, overriding pkg-config LIBSOUP_LIBS @@ -1880,7 +1893,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.9.6.4 +NetworkManager configure 0.9.7.995 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2424,7 +2437,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.6.4, which was +It was created by NetworkManager $as_me 0.9.7.995, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3245,7 +3258,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.9.6.4' + VERSION='0.9.7.995' cat >>confdefs.h <<_ACEOF @@ -3389,7 +3402,6 @@ fi MAINT=$MAINTAINER_MODE_TRUE - # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -3398,7 +3410,7 @@ fi case $enable_silent_rules in yes) AM_DEFAULT_VERBOSITY=0;; no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -16446,17 +16458,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test $USE_MAINTAINER_MODE = yes; then - DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED" -else - DISABLE_DEPRECATED="" -fi - - NM_MAJOR_VERSION=0 NM_MINOR_VERSION=9 -NM_MICRO_VERSION=6 -NM_VERSION=0.9.6.4 +NM_MICRO_VERSION=7 +NM_VERSION=0.9.7.995 @@ -19242,29 +19247,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF - -# Check whether --with-docs was given. -if test "${with_docs+set}" = set; then : - withval=$with_docs; -fi - - if test "x$with_docs" = "xyes"; then - WITH_DOCS_TRUE= - WITH_DOCS_FALSE='#' -else - WITH_DOCS_TRUE='#' - WITH_DOCS_FALSE= -fi - -case $with_docs in - yes) - enable_gtk_doc=yes - ;; - *) - with_docs=no - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } if ${ac_cv_c_bigendian+:} false; then : @@ -19490,14 +19472,42 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h esac +# NetworkManager paths +nmbinary="$sbindir/$PACKAGE" + +nmconfdir="$sysconfdir/$PACKAGE" -# Check whether --with-distro was given. -if test "${with_distro+set}" = set; then : - withval=$with_distro; +nmdatadir="$datadir/$PACKAGE" + +nmstatedir="$localstatedir/lib/$PACKAGE" + +nmrundir="$localstatedir/run/$PACKAGE" + + +# Alternative configuration plugins +# Check whether --enable-ifcfg-rh was given. +if test "${enable_ifcfg_rh+set}" = set; then : + enableval=$enable_ifcfg_rh; +fi + +# Check whether --enable-ifcfg-suse was given. +if test "${enable_ifcfg_suse+set}" = set; then : + enableval=$enable_ifcfg_suse; fi -if test "z$with_distro" = "z"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/redhat-release" >&5 +# Check whether --enable-ifupdown was given. +if test "${enable_ifupdown+set}" = set; then : + enableval=$enable_ifupdown; +fi + +# Check whether --enable-ifnet was given. +if test "${enable_ifnet+set}" = set; then : + enableval=$enable_ifnet; +fi + +# Default alternative plugins by distribution +if test -z "$enable_ifcfg_rh"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/redhat-release" >&5 $as_echo_n "checking for /etc/redhat-release... " >&6; } if ${ac_cv_file__etc_redhat_release+:} false; then : $as_echo_n "(cached) " >&6 @@ -19513,29 +19523,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_redhat_release" >&5 $as_echo "$ac_cv_file__etc_redhat_release" >&6; } if test "x$ac_cv_file__etc_redhat_release" = xyes; then : - with_distro="redhat" + enable_ifcfg_rh=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5 -$as_echo_n "checking for /etc/SuSE-release... " >&6; } -if ${ac_cv_file__etc_SuSE_release+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/SuSE-release"; then - ac_cv_file__etc_SuSE_release=yes -else - ac_cv_file__etc_SuSE_release=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5 -$as_echo "$ac_cv_file__etc_SuSE_release" >&6; } -if test "x$ac_cv_file__etc_SuSE_release" = xyes; then : - with_distro="suse" fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/fedora-release" >&5 +if test -z "$enable_ifcfg_rh"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/fedora-release" >&5 $as_echo_n "checking for /etc/fedora-release... " >&6; } if ${ac_cv_file__etc_fedora_release+:} false; then : $as_echo_n "(cached) " >&6 @@ -19551,105 +19544,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_fedora_release" >&5 $as_echo "$ac_cv_file__etc_fedora_release" >&6; } if test "x$ac_cv_file__etc_fedora_release" = xyes; then : - with_distro="redhat" + enable_ifcfg_rh=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/gentoo-release" >&5 -$as_echo_n "checking for /etc/gentoo-release... " >&6; } -if ${ac_cv_file__etc_gentoo_release+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/gentoo-release"; then - ac_cv_file__etc_gentoo_release=yes -else - ac_cv_file__etc_gentoo_release=no fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_gentoo_release" >&5 -$as_echo "$ac_cv_file__etc_gentoo_release" >&6; } -if test "x$ac_cv_file__etc_gentoo_release" = xyes; then : - with_distro="gentoo" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/debian_version" >&5 -$as_echo_n "checking for /etc/debian_version... " >&6; } -if ${ac_cv_file__etc_debian_version+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/debian_version"; then - ac_cv_file__etc_debian_version=yes -else - ac_cv_file__etc_debian_version=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_debian_version" >&5 -$as_echo "$ac_cv_file__etc_debian_version" >&6; } -if test "x$ac_cv_file__etc_debian_version" = xyes; then : - with_distro="debian" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/arch-release" >&5 -$as_echo_n "checking for /etc/arch-release... " >&6; } -if ${ac_cv_file__etc_arch_release+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/arch-release"; then - ac_cv_file__etc_arch_release=yes -else - ac_cv_file__etc_arch_release=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_arch_release" >&5 -$as_echo "$ac_cv_file__etc_arch_release" >&6; } -if test "x$ac_cv_file__etc_arch_release" = xyes; then : - with_distro="arch" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/slackware-version" >&5 -$as_echo_n "checking for /etc/slackware-version... " >&6; } -if ${ac_cv_file__etc_slackware_version+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/slackware-version"; then - ac_cv_file__etc_slackware_version=yes -else - ac_cv_file__etc_slackware_version=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_slackware_version" >&5 -$as_echo "$ac_cv_file__etc_slackware_version" >&6; } -if test "x$ac_cv_file__etc_slackware_version" = xyes; then : - with_distro="slackware" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/frugalware-release" >&5 -$as_echo_n "checking for /etc/frugalware-release... " >&6; } -if ${ac_cv_file__etc_frugalware_release+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/frugalware-release"; then - ac_cv_file__etc_frugalware_release=yes -else - ac_cv_file__etc_frugalware_release=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_frugalware_release" >&5 -$as_echo "$ac_cv_file__etc_frugalware_release" >&6; } -if test "x$ac_cv_file__etc_frugalware_release" = xyes; then : - with_distro="frugalware" -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/mandriva-release" >&5 +if test -z "$enable_ifcfg_rh"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/mandriva-release" >&5 $as_echo_n "checking for /etc/mandriva-release... " >&6; } if ${ac_cv_file__etc_mandriva_release+:} false; then : $as_echo_n "(cached) " >&6 @@ -19665,299 +19565,354 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_mandriva_release" >&5 $as_echo "$ac_cv_file__etc_mandriva_release" >&6; } if test "x$ac_cv_file__etc_mandriva_release" = xyes; then : - with_distro="mandriva" + enable_ifcfg_rh=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/pardus-release" >&5 -$as_echo_n "checking for /etc/pardus-release... " >&6; } -if ${ac_cv_file__etc_pardus_release+:} false; then : +fi +if test -z "$enable_ifcfg_suse"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5 +$as_echo_n "checking for /etc/SuSE-release... " >&6; } +if ${ac_cv_file__etc_SuSE_release+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/pardus-release"; then - ac_cv_file__etc_pardus_release=yes +if test -r "/etc/SuSE-release"; then + ac_cv_file__etc_SuSE_release=yes else - ac_cv_file__etc_pardus_release=no + ac_cv_file__etc_SuSE_release=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_pardus_release" >&5 -$as_echo "$ac_cv_file__etc_pardus_release" >&6; } -if test "x$ac_cv_file__etc_pardus_release" = xyes; then : - with_distro="pardus" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5 +$as_echo "$ac_cv_file__etc_SuSE_release" >&6; } +if test "x$ac_cv_file__etc_SuSE_release" = xyes; then : + enable_ifcfg_suse=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/linexa-release" >&5 -$as_echo_n "checking for /etc/linexa-release... " >&6; } -if ${ac_cv_file__etc_linexa_release+:} false; then : +fi +if test -z "$enable_ifupdown"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/debian_version" >&5 +$as_echo_n "checking for /etc/debian_version... " >&6; } +if ${ac_cv_file__etc_debian_version+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/linexa-release"; then - ac_cv_file__etc_linexa_release=yes +if test -r "/etc/debian_version"; then + ac_cv_file__etc_debian_version=yes else - ac_cv_file__etc_linexa_release=no + ac_cv_file__etc_debian_version=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_linexa_release" >&5 -$as_echo "$ac_cv_file__etc_linexa_release" >&6; } -if test "x$ac_cv_file__etc_linexa_release" = xyes; then : - with_distro="linexa" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_debian_version" >&5 +$as_echo "$ac_cv_file__etc_debian_version" >&6; } +if test "x$ac_cv_file__etc_debian_version" = xyes; then : + enable_ifupdown=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/exherbo-release" >&5 -$as_echo_n "checking for /etc/exherbo-release... " >&6; } -if ${ac_cv_file__etc_exherbo_release+:} false; then : +fi +if test -z "$enable_ifnet"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/gentoo-release" >&5 +$as_echo_n "checking for /etc/gentoo-release... " >&6; } +if ${ac_cv_file__etc_gentoo_release+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/exherbo-release"; then - ac_cv_file__etc_exherbo_release=yes +if test -r "/etc/gentoo-release"; then + ac_cv_file__etc_gentoo_release=yes else - ac_cv_file__etc_exherbo_release=no + ac_cv_file__etc_gentoo_release=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_exherbo_release" >&5 -$as_echo "$ac_cv_file__etc_exherbo_release" >&6; } -if test "x$ac_cv_file__etc_exherbo_release" = xyes; then : - with_distro="exherbo" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_gentoo_release" >&5 +$as_echo "$ac_cv_file__etc_gentoo_release" >&6; } +if test "x$ac_cv_file__etc_gentoo_release" = xyes; then : + enable_ifnet=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/lfs-release" >&5 -$as_echo_n "checking for /etc/lfs-release... " >&6; } -if ${ac_cv_file__etc_lfs_release+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "/etc/lfs-release"; then - ac_cv_file__etc_lfs_release=yes -else - ac_cv_file__etc_lfs_release=no fi +# Otherwise plugins default to "no" +if test -z "$enable_ifcfg_rh"; then : + enable_ifcfg_rh=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_lfs_release" >&5 -$as_echo "$ac_cv_file__etc_lfs_release" >&6; } -if test "x$ac_cv_file__etc_lfs_release" = xyes; then : - with_distro="lfs" +if test -z "$enable_ifcfg_suse"; then : + enable_ifcfg_suse=no fi - - if test "z$with_distro" = "z"; then - with_distro=`lsb_release -is` - fi +if test -z "$enable_ifupdown"; then : + enable_ifupdown=no fi -with_distro=`echo ${with_distro} | tr '[:upper:]' '[:lower:]' ` - -if test "z$with_distro" = "z"; then - echo "Linux distribution autodetection failed, you must specify the distribution to target using --with-distro=DISTRO" - exit 1 -else - case $with_distro in - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|lfs|generic) ;; - *) - echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" - exit 1 - ;; - esac +if test -z "$enable_ifnet"; then : + enable_ifnet=no fi - - if test x"$with_distro" = xgeneric; then - TARGET_GENERIC_TRUE= - TARGET_GENERIC_FALSE='#' +# Create automake conditionals + if test "$enable_ifcfg_rh" = "yes"; then + CONFIG_PLUGIN_IFCFG_RH_TRUE= + CONFIG_PLUGIN_IFCFG_RH_FALSE='#' else - TARGET_GENERIC_TRUE='#' - TARGET_GENERIC_FALSE= + CONFIG_PLUGIN_IFCFG_RH_TRUE='#' + CONFIG_PLUGIN_IFCFG_RH_FALSE= fi -if test x"$with_distro" = xgeneric; then - -$as_echo "#define TARGET_GENERIC 1" >>confdefs.h - -fi - - if test x"$with_distro" = xredhat; then - TARGET_REDHAT_TRUE= - TARGET_REDHAT_FALSE='#' + if test "$enable_ifcfg_suse" = "yes"; then + CONFIG_PLUGIN_IFCFG_SUSE_TRUE= + CONFIG_PLUGIN_IFCFG_SUSE_FALSE='#' else - TARGET_REDHAT_TRUE='#' - TARGET_REDHAT_FALSE= + CONFIG_PLUGIN_IFCFG_SUSE_TRUE='#' + CONFIG_PLUGIN_IFCFG_SUSE_FALSE= fi -if test x"$with_distro" = xredhat; then - -$as_echo "#define TARGET_REDHAT 1" >>confdefs.h - + if test "$enable_ifupdown" = "yes"; then + CONFIG_PLUGIN_IFUPDOWN_TRUE= + CONFIG_PLUGIN_IFUPDOWN_FALSE='#' +else + CONFIG_PLUGIN_IFUPDOWN_TRUE='#' + CONFIG_PLUGIN_IFUPDOWN_FALSE= fi - if test x"$with_distro" = xsuse; then - TARGET_SUSE_TRUE= - TARGET_SUSE_FALSE='#' + if test "$enable_ifnet" = "yes"; then + CONFIG_PLUGIN_IFNET_TRUE= + CONFIG_PLUGIN_IFNET_FALSE='#' else - TARGET_SUSE_TRUE='#' - TARGET_SUSE_FALSE= + CONFIG_PLUGIN_IFNET_TRUE='#' + CONFIG_PLUGIN_IFNET_FALSE= fi -if test x"$with_distro" = xsuse; then - -$as_echo "#define TARGET_SUSE 1" >>confdefs.h +# Code coverage + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 +$as_echo_n "checking whether to build with code coverage support... " >&6; } + # Check whether --enable-code-coverage was given. +if test "${enable_code_coverage+set}" = set; then : + enableval=$enable_code_coverage; +else + enable_code_coverage=no fi - if test x"$with_distro" = xgentoo; then - TARGET_GENTOO_TRUE= - TARGET_GENTOO_FALSE='#' + if test x$enable_code_coverage = xyes; then + CODE_COVERAGE_ENABLED_TRUE= + CODE_COVERAGE_ENABLED_FALSE='#' else - TARGET_GENTOO_TRUE='#' - TARGET_GENTOO_FALSE= + CODE_COVERAGE_ENABLED_TRUE='#' + CODE_COVERAGE_ENABLED_FALSE= fi -if test x"$with_distro" = xgentoo; then - -$as_echo "#define TARGET_GENTOO 1" >>confdefs.h - -fi + CODE_COVERAGE_ENABLED=$enable_code_coverage - if test x"$with_distro" = xdebian; then - TARGET_DEBIAN_TRUE= - TARGET_DEBIAN_FALSE='#' -else - TARGET_DEBIAN_TRUE='#' - TARGET_DEBIAN_FALSE= -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_code_coverage" >&5 +$as_echo "$enable_code_coverage" >&6; } -if test x"$with_distro" = xdebian; then + if test "$enable_code_coverage" = "yes" ; then : -$as_echo "#define TARGET_DEBIAN 1" >>confdefs.h + if test "$GCC" = "no" ; then : -fi + as_fn_error $? "not compiling with gcc, which is required for gcov code coverage" "$LINENO" 5 - if test x"$with_distro" = xslackware; then - TARGET_SLACKWARE_TRUE= - TARGET_SLACKWARE_FALSE='#' -else - TARGET_SLACKWARE_TRUE='#' - TARGET_SLACKWARE_FALSE= fi -if test x"$with_distro" = xslackware; then + # List of supported lcov versions. + lcov_version_list="1.6 1.7 1.8 1.9" -$as_echo "#define TARGET_SLACKWARE 1" >>confdefs.h + # Extract the first word of "lcov", so it can be a program name with args. +set dummy lcov; 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_LCOV+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LCOV"; then + ac_cv_prog_LCOV="$LCOV" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_LCOV="lcov" + $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 fi - - if test x"$with_distro" = xarch; then - TARGET_ARCH_TRUE= - TARGET_ARCH_FALSE='#' +fi +LCOV=$ac_cv_prog_LCOV +if test -n "$LCOV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 +$as_echo "$LCOV" >&6; } else - TARGET_ARCH_TRUE='#' - TARGET_ARCH_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test x"$with_distro" = xarch; then -$as_echo "#define TARGET_ARCH 1" >>confdefs.h + # Extract the first word of "genhtml", so it can be a program name with args. +set dummy genhtml; 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_GENHTML+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GENHTML"; then + ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. +else +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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_GENHTML="genhtml" + $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 fi - - if test x"$with_distro" = xpaldo; then - TARGET_PALDO_TRUE= - TARGET_PALDO_FALSE='#' +fi +GENHTML=$ac_cv_prog_GENHTML +if test -n "$GENHTML"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 +$as_echo "$GENHTML" >&6; } else - TARGET_PALDO_TRUE='#' - TARGET_PALDO_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -if test x"$with_distro" = xpaldo; then -$as_echo "#define TARGET_PALDO 1" >>confdefs.h -fi + if test "$LCOV" ; then : - if test x"$with_distro" = xfrugalware; then - TARGET_FRUGALWARE_TRUE= - TARGET_FRUGALWARE_FALSE='#' + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 +$as_echo_n "checking for lcov version... " >&6; } +if ${gnome_cv_lcov_version+:} false; then : + $as_echo_n "(cached) " >&6 else - TARGET_FRUGALWARE_TRUE='#' - TARGET_FRUGALWARE_FALSE= -fi - -if test x"$with_distro" = xfrugalware; then -$as_echo "#define TARGET_FRUGALWARE 1" >>confdefs.h + gnome_cv_lcov_version=invalid + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` + for lcov_check_version in $lcov_version_list; do + if test "$lcov_version" = "$lcov_check_version"; then + gnome_cv_lcov_version="$lcov_check_version (ok)" + fi + done fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gnome_cv_lcov_version" >&5 +$as_echo "$gnome_cv_lcov_version" >&6; } - if test x"$with_distro" = xmandriva; then - TARGET_MANDRIVA_TRUE= - TARGET_MANDRIVA_FALSE='#' else - TARGET_MANDRIVA_TRUE='#' - TARGET_MANDRIVA_FALSE= -fi -if test x"$with_distro" = xmandriva; then - -$as_echo "#define TARGET_MANDRIVA 1" >>confdefs.h + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" + as_fn_error $? "$lcov_msg" "$LINENO" 5 fi - if test x"$with_distro" = xpardus; then - TARGET_PARDUS_TRUE= - TARGET_PARDUS_FALSE='#' -else - TARGET_PARDUS_TRUE='#' - TARGET_PARDUS_FALSE= -fi + case $gnome_cv_lcov_version in + ""|invalid) + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." + as_fn_error $? "$lcov_msg" "$LINENO" 5 + LCOV="exit 0;" + ;; + esac -if test x"$with_distro" = xpardus; then + if test -z "$GENHTML" ; then : -$as_echo "#define TARGET_PARDUS 1" >>confdefs.h + as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 fi - if test x"$with_distro" = xlinexa; then - TARGET_LINEXA_TRUE= - TARGET_LINEXA_FALSE='#' -else - TARGET_LINEXA_TRUE='#' - TARGET_LINEXA_FALSE= -fi + CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_LDFLAGS="-lgcov" -if test x"$with_distro" = xlinexa; then -$as_echo "#define TARGET_LINEXA 1" >>confdefs.h -fi - if test x"$with_distro" = xexherbo; then - TARGET_EXHERBO_TRUE= - TARGET_EXHERBO_FALSE='#' -else - TARGET_EXHERBO_TRUE='#' - TARGET_EXHERBO_FALSE= fi -if test x"$with_distro" = xexherbo; then - -$as_echo "#define TARGET_EXHERBO 1" >>confdefs.h - -fi +GNOME_CODE_COVERAGE_RULES=' +# Code coverage +# +# Optional: +# - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. +# (Default: $(top_builddir)) +# - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated +# by lcov for code coverage. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info) +# - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage +# reports to be created. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. +# (Default: empty) +# - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml +# instance. (Default: empty) +# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore +# +# The generated report will be titled using the $(PACKAGE_NAME) and +# $(PACKAGE_VERSION). In order to add the current git hash to the title, +# use the git-version-gen script, available online. + +# Optional variables +CODE_COVERAGE_DIRECTORY ?= $(top_builddir) +CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info +CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage +CODE_COVERAGE_LCOV_OPTIONS ?= +CODE_COVERAGE_GENHTML_OPTIONS ?= +CODE_COVERAGE_IGNORE_PATTERN ?= + +code_coverage_quiet = $(code_coverage_quiet_$(V)) +code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) +code_coverage_quiet_0 = --quiet + +# Use recursive makes in order to ignore errors during check +check-code-coverage: +ifdef CODE_COVERAGE_ENABLED + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture +else + @echo "Need to reconfigure with --enable-code-coverage" +endif + +# Capture code coverage data +code-coverage-capture: code-coverage-capture-hook +ifdef CODE_COVERAGE_ENABLED + $(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 + LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) + @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" +else + @echo "Need to reconfigure with --enable-code-coverage" +endif + +# Hook rule executed before code-coverage-capture, overridable by the user +code-coverage-capture-hook: + +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 + +GITIGNOREFILES ?= +GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) + +DISTCHECK_CONFIGURE_FLAGS ?= +DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage + +.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean +' - if test x"$with_distro" = xlfs; then - TARGET_LFS_TRUE= - TARGET_LFS_FALSE='#' -else - TARGET_LFS_TRUE='#' - TARGET_LFS_FALSE= -fi -if test x"$with_distro" = xlfs; then -$as_echo "#define TARGET_LFS 1" >>confdefs.h -fi # Check whether --with-dist-version was given. @@ -20047,7 +20002,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int main () { -int a = NL80211_RATE_INFO_BITRATE; +int a = NL80211_RATE_INFO_BITRATE; a++; ; return 0; } @@ -20538,10 +20493,12 @@ fi +GLIB_VERSION_DEFINES="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 '-DGLIB_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,34)'" + # 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 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26" +DBUS_CFLAGS="$DBUS_CFLAGS $GLIB_VERSION_DEFINES" pkg_failed=no @@ -20552,12 +20509,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 \"gthread-2.0 glib-2.0 >= 2.22 gobject-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0") 2>&5 + { { $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 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0" 2>/dev/null` + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -20568,12 +20525,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 \"gthread-2.0 glib-2.0 >= 2.22 gobject-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0") 2>&5 + { { $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 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0" 2>/dev/null` + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -20593,14 +20550,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 "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-unix-2.0 >= 2.22 gmodule-2.0" 2>&1` else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0 glib-2.0 >= 2.22 gobject-2.0" 2>&1` + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-unix-2.0 >= 2.22 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 (gthread-2.0 glib-2.0 >= 2.22 gobject-2.0) were not met: + as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.22 gmodule-2.0) were not met: $GLIB_PKG_ERRORS @@ -20634,100 +20591,7 @@ else $as_echo "yes" >&6; } fi - - - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 -$as_echo_n "checking for GMODULE... " >&6; } - -if test -n "$GMODULE_CFLAGS"; then - pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GMODULE_LIBS"; then - pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0" 2>/dev/null` -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 - GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0" 2>&1` - else - GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GMODULE_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (gmodule-2.0) were not met: - -$GMODULE_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 GMODULE_CFLAGS -and GMODULE_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 GMODULE_CFLAGS -and GMODULE_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 - GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS - GMODULE_LIBS=$pkg_cv_GMODULE_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi +GLIB_CFLAGS="$GLIB_CFLAGS $GLIB_VERSION_DEFINES" @@ -20740,12 +20604,12 @@ if test -n "$GUDEV_CFLAGS"; then pkg_cv_GUDEV_CFLAGS="$GUDEV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 147\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 147") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 165\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 165") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= 147" 2>/dev/null` + pkg_cv_GUDEV_CFLAGS=`$PKG_CONFIG --cflags "gudev-1.0 >= 165" 2>/dev/null` else pkg_failed=yes fi @@ -20756,12 +20620,12 @@ if test -n "$GUDEV_LIBS"; then pkg_cv_GUDEV_LIBS="$GUDEV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 147\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 147") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gudev-1.0 >= 165\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gudev-1.0 >= 165") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= 147" 2>/dev/null` + pkg_cv_GUDEV_LIBS=`$PKG_CONFIG --libs "gudev-1.0 >= 165" 2>/dev/null` else pkg_failed=yes fi @@ -20781,14 +20645,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= 147" 2>&1` + GUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gudev-1.0 >= 165" 2>&1` else - GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0 >= 147" 2>&1` + GUDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "gudev-1.0 >= 165" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GUDEV_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gudev-1.0 >= 147) were not met: + as_fn_error $? "Package requirements (gudev-1.0 >= 165) were not met: $GUDEV_PKG_ERRORS @@ -20826,100 +20690,6 @@ fi -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5 -$as_echo_n "checking for GIO... " >&6; } - -if test -n "$GIO_CFLAGS"; then - pkg_cv_GIO_CFLAGS="$GIO_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-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GIO_LIBS"; then - pkg_cv_GIO_LIBS="$GIO_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-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0" 2>/dev/null` -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 - GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0" 2>&1` - else - GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GIO_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (gio-2.0) were not met: - -$GIO_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 GIO_CFLAGS -and GIO_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 GIO_CFLAGS -and GIO_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 - GIO_CFLAGS=$pkg_cv_GIO_CFLAGS - GIO_LIBS=$pkg_cv_GIO_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - - - # Check whether --enable-introspection was given. @@ -21170,15 +20940,17 @@ fi # Check whether --with-systemdsystemunitdir was given. if test "${with_systemdsystemunitdir+set}" = set; then : withval=$with_systemdsystemunitdir; -else - with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) fi -if test "x$with_systemdsystemunitdir" != xno; then - systemdsystemunitdir=$with_systemdsystemunitdir - +# default location +if test -z "$with_systemdsystemunitdir" && $PKG_CONFIG systemd; then : + with_systemdsystemunitdir="\$(prefix)/lib/systemd/system" +fi +if test -z "$with_systemdsystemunitdir"; then : + with_systemdsystemunitdir=no fi - if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then +# add conditional and subst + if test "$with_systemdsystemunitdir" != no; then HAVE_SYSTEMD_TRUE= HAVE_SYSTEMD_FALSE='#' else @@ -21186,28 +20958,61 @@ else HAVE_SYSTEMD_FALSE= fi +if test "$with_systemdsystemunitdir" != no; then + systemdsystemunitdir=$with_systemdsystemunitdir + +fi +# session tracking support +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Session tracking support" >&5 +$as_echo_n "checking Session tracking support... " >&6; } # Check whether --with-session-tracking was given. if test "${with_session_tracking+set}" = set; then : withval=$with_session_tracking; fi -if test "z$with_session_tracking" = "z"; then - # Default to ConsoleKit session tracking like we used before - with_session_tracking=ck +# default to consolekit +if test -z "$with_session_tracking"; then : + with_session_tracking=consolekit +fi +if test "$with_session_tracking" = "ck"; then : + with_session_tracking=consolekit +fi +if test "$with_session_tracking" = "none"; then : + with_session_tracking=no +fi +# check value +if ! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$"); then : + as_fn_error $? "--with-session-tracking must be systemd/consolekit/no +else + not $with_session_tracking" "$LINENO" 5 +fi +# add conditionals and subtitutions + if test "$with_session_tracking" = "consolekit"; then + SESSION_TRACKING_CK_TRUE= + SESSION_TRACKING_CK_FALSE='#' +else + SESSION_TRACKING_CK_TRUE='#' + SESSION_TRACKING_CK_FALSE= fi -case $with_session_tracking in - ck|none|no) ;; - systemd) + if test "xwith_session_tracking" = "systemd"; then + SESSION_TRACKING_SYSTEMD_TRUE= + SESSION_TRACKING_SYSTEMD_FALSE='#' +else + SESSION_TRACKING_SYSTEMD_TRUE='#' + SESSION_TRACKING_SYSTEMD_FALSE= +fi + +if test "$with_session_tracking" = "systemd"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 -$as_echo_n "checking for SYSTEMD... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } -if test -n "$SYSTEMD_CFLAGS"; then - pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" +if test -n "$SYSTEMD_LOGIN_CFLAGS"; then + pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5 @@ -21215,15 +21020,15 @@ if test -n "$SYSTEMD_CFLAGS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null` + pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$SYSTEMD_LIBS"; then - pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" +if test -n "$SYSTEMD_LOGIN_LIBS"; then + pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5 @@ -21231,7 +21036,7 @@ if test -n "$SYSTEMD_LIBS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 2>/dev/null` + pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 2>/dev/null` else pkg_failed=yes fi @@ -21251,22 +21056,22 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsystemd-login" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsystemd-login" 2>&1` else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsystemd-login" 2>&1` + SYSTEMD_LOGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsystemd-login" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$SYSTEMD_PKG_ERRORS" >&5 + echo "$SYSTEMD_LOGIN_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (libsystemd-login) were not met: -$SYSTEMD_PKG_ERRORS +$SYSTEMD_LOGIN_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 SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables SYSTEMD_LOGIN_CFLAGS +and SYSTEMD_LOGIN_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 @@ -21278,77 +21083,90 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su 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 SYSTEMD_CFLAGS -and SYSTEMD_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables SYSTEMD_LOGIN_CFLAGS +and SYSTEMD_LOGIN_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 - SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS - SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS + SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS + SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - ;; - *) - as_fn_error $? "--with-session-tracking must be one of none, ck, systemd" "$LINENO" 5 - ;; -esac - if test "x$with_session_tracking" = "xck"; then - SESSION_TRACKING_CK_TRUE= - SESSION_TRACKING_CK_FALSE='#' -else - SESSION_TRACKING_CK_TRUE='#' - SESSION_TRACKING_CK_FALSE= fi +if test "$with_session_tracking" = "consolekit"; then + CKDB_PATH=/var/run/ConsoleKit/database - if test "x$with_session_tracking" = "xsystemd"; then - SESSION_TRACKING_SYSTEMD_TRUE= - SESSION_TRACKING_SYSTEMD_FALSE='#' -else - SESSION_TRACKING_SYSTEMD_TRUE='#' - SESSION_TRACKING_SYSTEMD_FALSE= fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_session_tracking" >&5 +$as_echo "$with_session_tracking" >&6; } +# Check whether --with-suspend-resume was given. +if test "${with_suspend_resume+set}" = set; then : + withval=$with_suspend_resume; +fi -have_libnl="no" +if test "z$with_suspend_resume" = "z"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 183\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd >= 183") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_systemd_inhibit=yes +else + have_systemd_inhibit=no +fi + if test "z${have_systemd_inhibit}" = "zyes"; then + # Use systemd if it's new enough + with_suspend_resume="systemd" + else + # Fall back to upower + with_suspend_resume="upower" + fi +fi + +case $with_suspend_resume in + upower) ;; + systemd) pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL3" >&5 -$as_echo_n "checking for LIBNL3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 +$as_echo_n "checking for SYSTEMD_INHIBIT... " >&6; } -if test -n "$LIBNL3_CFLAGS"; then - pkg_cv_LIBNL3_CFLAGS="$LIBNL3_CFLAGS" +if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then + pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_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\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 183\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd >= 183") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNL3_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0" 2>/dev/null` + pkg_cv_SYSTEMD_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "systemd >= 183" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$LIBNL3_LIBS"; then - pkg_cv_LIBNL3_LIBS="$LIBNL3_LIBS" +if test -n "$SYSTEMD_INHIBIT_LIBS"; then + pkg_cv_SYSTEMD_INHIBIT_LIBS="$SYSTEMD_INHIBIT_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\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 183\""; } >&5 + ($PKG_CONFIG --exists --print-errors "systemd >= 183") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBNL3_LIBS=`$PKG_CONFIG --libs "libnl-3.0" 2>/dev/null` + pkg_cv_SYSTEMD_INHIBIT_LIBS=`$PKG_CONFIG --libs "systemd >= 183" 2>/dev/null` else pkg_failed=yes fi @@ -21368,125 +21186,113 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNL3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "systemd >= 183" 2>&1` else - LIBNL3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0" 2>&1` + SYSTEMD_INHIBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "systemd >= 183" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LIBNL3_PKG_ERRORS" >&5 + echo "$SYSTEMD_INHIBIT_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (systemd >= 183) were not met: + +$SYSTEMD_INHIBIT_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 SYSTEMD_INHIBIT_CFLAGS +and SYSTEMD_INHIBIT_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 - have_libnl3=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_libnl3=no + { { $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 SYSTEMD_INHIBIT_CFLAGS +and SYSTEMD_INHIBIT_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 - LIBNL3_CFLAGS=$pkg_cv_LIBNL3_CFLAGS - LIBNL3_LIBS=$pkg_cv_LIBNL3_LIBS + SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS + SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_libnl3=yes -fi -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL_ROUTE3" >&5 -$as_echo_n "checking for LIBNL_ROUTE3... " >&6; } - -if test -n "$LIBNL_ROUTE3_CFLAGS"; then - pkg_cv_LIBNL_ROUTE3_CFLAGS="$LIBNL_ROUTE3_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-route-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-route-3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBNL_ROUTE3_CFLAGS=`$PKG_CONFIG --cflags "libnl-route-3.0" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried fi -if test -n "$LIBNL_ROUTE3_LIBS"; then - pkg_cv_LIBNL_ROUTE3_LIBS="$LIBNL_ROUTE3_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-route-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-route-3.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBNL_ROUTE3_LIBS=`$PKG_CONFIG --libs "libnl-route-3.0" 2>/dev/null` + ;; + *) + as_fn_error $? "--with-suspend-resume must be one of upower, systemd" "$LINENO" 5 + ;; +esac + if test "x$with_suspend_resume" = "xupower"; then + SUSPEND_RESUME_UPOWER_TRUE= + SUSPEND_RESUME_UPOWER_FALSE='#' else - pkg_failed=yes + SUSPEND_RESUME_UPOWER_TRUE='#' + SUSPEND_RESUME_UPOWER_FALSE= fi - else - pkg_failed=untried + + if test "x$with_suspend_resume" = "xsystemd"; then + SUSPEND_RESUME_SYSTEMD_TRUE= + SUSPEND_RESUME_SYSTEMD_FALSE='#' +else + SUSPEND_RESUME_SYSTEMD_TRUE='#' + SUSPEND_RESUME_SYSTEMD_FALSE= fi +# libnl support for the linux platform -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 +# Check whether --with-libnl was given. +if test "${with_libnl+set}" = set; then : + withval=$with_libnl; fi - if test $_pkg_short_errors_supported = yes; then - LIBNL_ROUTE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-route-3.0" 2>&1` - else - LIBNL_ROUTE3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-route-3.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBNL_ROUTE3_PKG_ERRORS" >&5 - have_libnl_route3=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - have_libnl_route3=no -else - LIBNL_ROUTE3_CFLAGS=$pkg_cv_LIBNL_ROUTE3_CFLAGS - LIBNL_ROUTE3_LIBS=$pkg_cv_LIBNL_ROUTE3_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_libnl_route3=yes +# default to "yes" +if test -z "$with_libnl"; then : + with_libnl=yes fi +# test for various libnl versions +if test "$with_libnl" = "yes" -o "$with_libnl" = "3"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL_GENL3" >&5 -$as_echo_n "checking for LIBNL_GENL3... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL3" >&5 +$as_echo_n "checking for LIBNL3... " >&6; } -if test -n "$LIBNL_GENL3_CFLAGS"; then - pkg_cv_LIBNL_GENL3_CFLAGS="$LIBNL_GENL3_CFLAGS" +if test -n "$LIBNL3_CFLAGS"; then + pkg_cv_LIBNL3_CFLAGS="$LIBNL3_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-genl-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-genl-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 libnl-route-3.0 libnl-genl-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnl-3.0 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_GENL3_CFLAGS=`$PKG_CONFIG --cflags "libnl-genl-3.0" 2>/dev/null` + pkg_cv_LIBNL3_CFLAGS=`$PKG_CONFIG --cflags "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$LIBNL_GENL3_LIBS"; then - pkg_cv_LIBNL_GENL3_LIBS="$LIBNL_GENL3_LIBS" +if test -n "$LIBNL3_LIBS"; then + pkg_cv_LIBNL3_LIBS="$LIBNL3_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-genl-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnl-genl-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-3.0 libnl-route-3.0 libnl-genl-3.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnl-3.0 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_GENL3_LIBS=`$PKG_CONFIG --libs "libnl-genl-3.0" 2>/dev/null` + pkg_cv_LIBNL3_LIBS=`$PKG_CONFIG --libs "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>/dev/null` else pkg_failed=yes fi @@ -21506,34 +21312,30 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBNL_GENL3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-genl-3.0" 2>&1` + LIBNL3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>&1` else - LIBNL_GENL3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-genl-3.0" 2>&1` + LIBNL3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-3.0 libnl-route-3.0 libnl-genl-3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LIBNL_GENL3_PKG_ERRORS" >&5 + echo "$LIBNL3_PKG_ERRORS" >&5 - have_libnl_genl3=no + test "$with_libnl" = "3" && with_libnl=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_libnl_genl3=no + test "$with_libnl" = "3" && with_libnl=no else - LIBNL_GENL3_CFLAGS=$pkg_cv_LIBNL_GENL3_CFLAGS - LIBNL_GENL3_LIBS=$pkg_cv_LIBNL_GENL3_LIBS + LIBNL3_CFLAGS=$pkg_cv_LIBNL3_CFLAGS + LIBNL3_LIBS=$pkg_cv_LIBNL3_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_libnl_genl3=yes + with_libnl=3 fi -if (test "${have_libnl3}" = "yes" -a "${have_libnl_route3}" = "yes" -a "${have_libnl_genl3}" = "yes"); then - -$as_echo "#define HAVE_LIBNL3 1" >>confdefs.h - - LIBNL_CFLAGS="$LIBNL3_CFLAGS $LIBNL_ROUTE3_CFLAGS $LIBNL_GENL3_CFLAGS" - LIBNL_LIBS="$LIBNL3_LIBS $LIBNL_ROUTE3_LIBS $LIBNL_GENL3_LIBS" - libnl_version="3" - have_libnl="yes" -else + if test "$with_libnl" = "no"; then : + as_fn_error $? "libnl 3.x could not be found" "$LINENO" 5 +fi +fi +if test "$with_libnl" = "yes" -o "$with_libnl" = "2"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL2" >&5 @@ -21591,27 +21393,23 @@ fi # Put the nasty error message in config.log where it belongs echo "$LIBNL2_PKG_ERRORS" >&5 - have_libnl2=no + test "$with_libnl" = "2" && with_libnl=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_libnl2=no + test "$with_libnl" = "2" && with_libnl=no else LIBNL2_CFLAGS=$pkg_cv_LIBNL2_CFLAGS LIBNL2_LIBS=$pkg_cv_LIBNL2_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_libnl2=yes + with_libnl=2 fi - if (test "${have_libnl2}" = "yes"); then - -$as_echo "#define HAVE_LIBNL2 1" >>confdefs.h - - LIBNL_CFLAGS="$LIBNL2_CFLAGS" - LIBNL_LIBS="$LIBNL2_LIBS" - libnl_version="2" - have_libnl="yes" - else + if test "$with_libnl" = "no"; then : + as_fn_error $? "libnl 2.x could not be found" "$LINENO" 5 +fi +fi +if test "$with_libnl" = "yes" -o "$with_libnl" = "1"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL1" >&5 @@ -21669,37 +21467,43 @@ fi # Put the nasty error message in config.log where it belongs echo "$LIBNL1_PKG_ERRORS" >&5 - have_libnl1=no + test "$with_libnl" = "1" && with_libnl=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_libnl1=no + test "$with_libnl" = "1" && with_libnl=no else LIBNL1_CFLAGS=$pkg_cv_LIBNL1_CFLAGS LIBNL1_LIBS=$pkg_cv_LIBNL1_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_libnl1=yes + with_libnl=1 fi - if (test "${have_libnl1}" = "yes"); then - -$as_echo "#define HAVE_LIBNL1 1" >>confdefs.h - - LIBNL_CFLAGS="$LIBNL1_CFLAGS" - LIBNL_LIBS="$LIBNL1_LIBS" - libnl_version="1" - have_libnl="yes" - fi - fi + if test "$with_libnl" = "no"; then : + as_fn_error $? "libnl 1.x could not be found" "$LINENO" 5 fi - -if (test "${have_libnl}" = "no"); then - as_fn_error $? "libnl development header are required" "$LINENO" 5 fi +if test "$with_libnl" = "yes"; then + as_fn_error $? "libnl library could not be found" "$LINENO" 5 + with_libnl=no +fi +if ! echo "$with_libnl" | grep -q "^[1-3]$"; then + as_fn_error $? "unsupported libnl version: $with_libnl" "$LINENO" 5 +fi +# add variables, conditionals and defines +if test "$with_libnl" != "no"; then +cat >>confdefs.h <<_ACEOF +#define HAVE_LIBNL $with_libnl +_ACEOF + LIBNL_CFLAGS="$LIBNL3_CFLAGS$LIBNL2_CFLAGS$LIBNL1_CFLAGS" -if (test "${libnl_version}" = "1"); then + LIBNL_LIBS="$LIBNL3_LIBS$LIBNL2_LIBS$LIBNL1_LIBS" + +fi +# additional tests +if test "with_libnl" = "1"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl address caching bug" >&5 $as_echo_n "checking for libnl address caching bug... " >&6; } @@ -22086,6 +21890,21 @@ else fi +# Check whether --enable-modify-system was given. +if test "${enable_modify_system+set}" = set; then : + enableval=$enable_modify_system; +fi + +if test "${enable_modify_system}" = "yes"; then + if ! test "${enable_polkit}" = "yes"; then + as_fn_error $? "--enable-modify-system requires --enable-polkit" "$LINENO" 5 + fi + NM_MODIFY_SYSTEM_POLICY="yes" +else + NM_MODIFY_SYSTEM_POLICY="auth_admin_keep" +fi + + # Check whether --with-crypto was given. if test "${with_crypto+set}" = set; then : @@ -22456,7 +22275,7 @@ if test "x$ac_cv_header_pppd_pppd_h" = xyes; then : _ACEOF else - as_fn_error $? "couldn't find pppd.h. pppd development headers are required." "$LINENO" 5 + as_fn_error $? "\"couldn't find pppd.h. pppd development headers are required.\"" "$LINENO" 5 fi done @@ -22493,149 +22312,417 @@ else fi +# ModemManager1 with libmm-glib + +# Check whether --with-modem-manager-1 was given. +if test "${with_modem_manager_1+set}" = set; then : + withval=$with_modem_manager_1; +else + with_modem_manager_1=auto +fi -# dhclient support +if (test "${with_modem_manager_1}" != "no"); then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM_GLIB" >&5 +$as_echo_n "checking for MM_GLIB... " >&6; } + +if test -n "$MM_GLIB_CFLAGS"; then + pkg_cv_MM_GLIB_CFLAGS="$MM_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 \"mm-glib\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mm-glib") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_MM_GLIB_CFLAGS=`$PKG_CONFIG --cflags "mm-glib" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$MM_GLIB_LIBS"; then + pkg_cv_MM_GLIB_LIBS="$MM_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 \"mm-glib\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mm-glib") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_MM_GLIB_LIBS=`$PKG_CONFIG --libs "mm-glib" 2>/dev/null` +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 + MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mm-glib" 2>&1` + else + MM_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "mm-glib" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MM_GLIB_PKG_ERRORS" >&5 + + have_libmm_glib=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_libmm_glib=no +else + MM_GLIB_CFLAGS=$pkg_cv_MM_GLIB_CFLAGS + MM_GLIB_LIBS=$pkg_cv_MM_GLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_libmm_glib=yes +fi + + + + if (test "${have_libmm_glib}" = "no"); then + if (test "${with_modem_manager_1}" = "yes"); then + as_fn_error $? "Couldn't find libmm-glib" "$LINENO" 5 + fi + else + with_modem_manager_1="yes" + fi +fi + +if (test "${with_modem_manager_1}" = "yes"); then + +$as_echo "#define WITH_MODEM_MANAGER_1 1" >>confdefs.h + +else + +$as_echo "#define WITH_MODEM_MANAGER_1 0" >>confdefs.h + +fi + if test "${with_modem_manager_1}" = "yes"; then + WITH_MODEM_MANAGER_1_TRUE= + WITH_MODEM_MANAGER_1_FALSE='#' +else + WITH_MODEM_MANAGER_1_TRUE='#' + WITH_MODEM_MANAGER_1_FALSE= +fi + + +# DHCP client support # Check whether --with-dhclient was given. if test "${with_dhclient+set}" = set; then : withval=$with_dhclient; fi -# If a full path is given, use that and do not test if it works or not. -case "${with_dhclient}" in - # NM only works with ISC dhclient - other derivatives don't have - # the same userland. dhclient 4.x is required for IPv6 support; - # with older versions NM won't be able to use DHCPv6. - - /*) - DHCLIENT_PATH="${with_dhclient}" - DHCLIENT_VERSION=4 - if test -x "${with_dhclient}"; then - case `"${with_dhclient}" --version 2>&1` in - "isc-dhclient-4"*) DHCLIENT_VERSION=4; break;; - "isc-dhclient-V3"*) DHCLIENT_VERSION=3; break;; - esac - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: using dhclient at ${DHCLIENT_PATH}" >&5 -$as_echo "$as_me: using dhclient at ${DHCLIENT_PATH}" >&6;} - ;; - no) { $as_echo "$as_me:${as_lineno-$LINENO}: dhclient support disabled" >&5 -$as_echo "$as_me: dhclient support disabled" >&6;} - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dhclient" >&5 -$as_echo_n "checking for dhclient... " >&6; } - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do - test -x "${path}/dhclient" || continue - case `"$path/dhclient" --version 2>&1` in - "isc-dhclient-4"*) DHCLIENT_PATH="$path/dhclient"; DHCLIENT_VERSION=4; break;; - "isc-dhclient-V3"*) DHCLIENT_PATH="$path/dhclient"; DHCLIENT_VERSION=3; break;; - esac - done - if test -n "${DHCLIENT_PATH}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DHCLIENT_PATH" >&5 -$as_echo "$DHCLIENT_PATH" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; -esac - -# dhcpcd support # Check whether --with-dhcpcd was given. if test "${with_dhcpcd+set}" = set; then : withval=$with_dhcpcd; fi -# If a full path is given, use that and do not test if it works or not. -case "${with_dhcpcd}" in - /*) - DHCPCD_PATH="${with_dhcpcd}" - { $as_echo "$as_me:${as_lineno-$LINENO}: using dhcpcd at ${DHCPCD_PATH}" >&5 -$as_echo "$as_me: using dhcpcd at ${DHCPCD_PATH}" >&6;} - ;; - no) { $as_echo "$as_me:${as_lineno-$LINENO}: dhcpcd support disabled" >&5 -$as_echo "$as_me: dhcpcd support disabled" >&6;} - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dhcpcd" >&5 -$as_echo_n "checking for dhcpcd... " >&6; } - # We fully work with upstream dhcpcd-4 - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do - test -x "${path}/dhcpcd" || continue - case `"$path/dhcpcd" --version 2>/dev/null` in - "dhcpcd "123*);; - "dhcpcd "*) DHCPCD_PATH="$path/dhcpcd"; break;; - esac - done - if test -n "${DHCPCD_PATH}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DHCPCD_PATH" >&5 -$as_echo "$DHCPCD_PATH" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +# Default to "yes" +if test -z "$with_dhclient"; then : + with_dhclient=yes +fi +if test -z "$with_dhcpcd"; then : + with_dhcpcd=yes +fi +# Search and check the executables +if test "$with_dhclient" = "yes"; then + for ac_prog in dhclient +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_path_with_dhclient+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $with_dhclient in + [\\/]* | ?:[\\/]*) + ac_cv_path_with_dhclient="$with_dhclient" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/sbin:/usr/sbin:/usr/local/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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_with_dhclient="$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 +with_dhclient=$ac_cv_path_with_dhclient +if test -n "$with_dhclient"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dhclient" >&5 +$as_echo "$with_dhclient" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } +fi + + + test -n "$with_dhclient" && break +done +test -n "$with_dhclient" || with_dhclient="no" + + if test "$with_dhclient" != "no"; then + if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use dhclient, version 4.x is required" >&5 +$as_echo "$as_me: WARNING: Cannot use dhclient, version 4.x is required" >&2;} + with_dhclient=no fi - ;; -esac + fi +fi +if test "$with_dhcpcd" = "yes"; then + for ac_prog in dhcpcd +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_path_with_dhcpcd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $with_dhcpcd in + [\\/]* | ?:[\\/]*) + ac_cv_path_with_dhcpcd="$with_dhcpcd" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/sbin:/usr/sbin:/usr/local/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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_with_dhcpcd="$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 -if test -z "$DHCPCD_PATH" -a -z "$DHCLIENT_PATH"; then - # DHCP clients are not a build time dependency, only runtime. - # dhclient has been the longtime default for NM and it's in /sbin - # in most distros, so use it. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a suitable DHCP client" >&5 -$as_echo "$as_me: WARNING: Could not find a suitable DHCP client" >&2;} - DHCLIENT_PATH=/sbin/dhclient - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Falling back to ISC dhclient, ${DHCLIENT_PATH}" >&5 -$as_echo "$as_me: WARNING: Falling back to ISC dhclient, ${DHCLIENT_PATH}" >&2;} + ;; +esac +fi +with_dhcpcd=$ac_cv_path_with_dhcpcd +if test -n "$with_dhcpcd"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dhcpcd" >&5 +$as_echo "$with_dhcpcd" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$with_dhcpcd" && break +done +test -n "$with_dhcpcd" || with_dhcpcd="no" + + if test "$with_dhcpcd" != "no"; then + if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [45]\."; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use dhcpcd, version 4.x or 5.x is required" >&5 +$as_echo "$as_me: WARNING: Cannot use dhcpcd, version 4.x or 5.x is required" >&2;} + with_dhcpcd=no + fi + fi +fi +# Fallback +if test "$with_dhclient" = "no" -a "$with_dhcpcd" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a suitable DHCP client, falling back to dhclient" >&5 +$as_echo "$as_me: WARNING: Could not find a suitable DHCP client, falling back to dhclient" >&2;} + with_dhclient=/sbin/dhclient +fi +# Add substitutions +if test "$with_dhclient" != "no"; then + DHCLIENT_PATH=$with_dhclient +fi +if test "$with_dhcpcd" != "no"; then + DHCPCD_PATH=$with_dhcpcd + +fi -# resolvconf support +# resolvconf and netconfig support # Check whether --with-resolvconf was given. if test "${with_resolvconf+set}" = set; then : - withval=$with_resolvconf; with_resolvconf="$withval" + withval=$with_resolvconf; +fi + + +# Check whether --with-netconfig was given. +if test "${with_netconfig+set}" = set; then : + withval=$with_netconfig; +fi + +# Use netconfig by default on SUSE +if test -z "$with_netconfig"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /etc/SuSE-release" >&5 +$as_echo_n "checking for /etc/SuSE-release... " >&6; } +if ${ac_cv_file__etc_SuSE_release+:} false; then : + $as_echo_n "(cached) " >&6 else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r "/etc/SuSE-release"; then + ac_cv_file__etc_SuSE_release=yes +else + ac_cv_file__etc_SuSE_release=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__etc_SuSE_release" >&5 +$as_echo "$ac_cv_file__etc_SuSE_release" >&6; } +if test "x$ac_cv_file__etc_SuSE_release" = xyes; then : + with_netconfig=yes +fi + +fi +# Otherwise default to "no" +if test -z "$with_resolvconf"; then : with_resolvconf=no fi +if test -z "$with_netconfig"; then : + with_netconfig=no +fi +# Find resolvconf and netconfig +if test "$with_resolvconf" = "yes"; then + for ac_prog in resolvconf +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_path_with_resolvconf+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $with_resolvconf in + [\\/]* | ?:[\\/]*) + ac_cv_path_with_resolvconf="$with_resolvconf" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/sbin:/usr/sbin:/usr/local/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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_with_resolvconf="$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 -# If a full path is given, use that and do not test if it works or not. -case "${with_resolvconf}" in - /*) - RESOLVCONF_PATH="${with_resolvconf}" - { $as_echo "$as_me:${as_lineno-$LINENO}: setting resolvconf path to ${RESOLVCONF_PATH}" >&5 -$as_echo "$as_me: setting resolvconf path to ${RESOLVCONF_PATH}" >&6;} - ;; - no) { $as_echo "$as_me:${as_lineno-$LINENO}: resolvconf support disabled" >&5 -$as_echo "$as_me: resolvconf support disabled" >&6;} - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for resolvconf" >&5 -$as_echo_n "checking for resolvconf... " >&6; } - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do - if test -x "${path}/resolvconf"; then - RESOLVCONF_PATH="${path}/resolvconf" - break - fi - done - if test -n "${RESOLVCONF_PATH}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RESOLVCONF_PATH" >&5 -$as_echo "$RESOLVCONF_PATH" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ;; +esac +fi +with_resolvconf=$ac_cv_path_with_resolvconf +if test -n "$with_resolvconf"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_resolvconf" >&5 +$as_echo "$with_resolvconf" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi - ;; +fi + + + test -n "$with_resolvconf" && break +done +test -n "$with_resolvconf" || with_resolvconf="no" + +fi +if test "$with_netconfig" = "yes"; then + for ac_prog in netconfig +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_path_with_netconfig+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $with_netconfig in + [\\/]* | ?:[\\/]*) + ac_cv_path_with_netconfig="$with_netconfig" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/sbin:/usr/sbin:/usr/local/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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_with_netconfig="$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 +with_netconfig=$ac_cv_path_with_netconfig +if test -n "$with_netconfig"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_netconfig" >&5 +$as_echo "$with_netconfig" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$with_netconfig" && break +done +test -n "$with_netconfig" || with_netconfig="no" -if test -n "${RESOLVCONF_PATH}"; then +fi +# Define resolvconf and netconfig paths +if test "$with_resolvconf" != "no"; then cat >>confdefs.h <<_ACEOF -#define RESOLVCONF_PATH "$RESOLVCONF_PATH" +#define RESOLVCONF_PATH "$with_resolvconf" +_ACEOF + +fi +if test "$with_netconfig" != "no"; then + +cat >>confdefs.h <<_ACEOF +#define NETCONFIG_PATH "$with_netconfig" _ACEOF fi @@ -22915,6 +23002,317 @@ fi + + + # Check whether --enable-vala was given. +if test "${enable_vala+set}" = set; then : + enableval=$enable_vala; +else + enable_vala=auto +fi + + + case $enable_vala in #( + no) : + ;; #( + yes) : + + if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : + + as_fn_error $? "Vala bindings require GObject Introspection" "$LINENO" 5 + +fi + ;; #( + auto) : + + if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : + + enable_vala=no + +fi + ;; #( + *) : + + as_fn_error $? "Invalid argument passed to --enable-vala, should be one of [no/auto/yes]" "$LINENO" 5 + ;; +esac + + if test "x" = "x"; then : + + vapigen_pkg_name=vapigen + +else + + vapigen_pkg_name=vapigen- + +fi + if test "x0.17.1.24" = "x"; then : + + vapigen_pkg="$vapigen_pkg_name" + +else + + vapigen_pkg="$vapigen_pkg_name >= 0.17.1.24" + +fi + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$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 +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; 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_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$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 +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$vapigen_pkg\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$vapigen_pkg") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + + if test "$enable_vala" = "auto"; then : + + enable_vala=yes + +fi + +else + + case $enable_vala in #( + yes) : + + as_fn_error $? "$vapigen_pkg not found" "$LINENO" 5 + ;; #( + auto) : + + enable_vala=no + ;; #( + *) : + ;; +esac + +fi + + case $enable_vala in #( + yes) : + + VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` + VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen + if test "x" = "x"; then : + + VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` + +else + + VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` + +fi + ;; #( + *) : + ;; +esac + + + + + + if test "x$enable_vala" = "xyes"; then + ENABLE_VAPIGEN_TRUE= + ENABLE_VAPIGEN_FALSE='#' +else + ENABLE_VAPIGEN_TRUE='#' + ENABLE_VAPIGEN_FALSE= +fi + + + +# Tests, utilities and documentation +# Check whether --enable-tests was given. +if test "${enable_tests+set}" = set; then : + enableval=$enable_tests; +fi + +# Check whether --enable-doc was given. +if test "${enable_doc+set}" = set; then : + enableval=$enable_doc; +fi + +# Fallback to --with-tests and with-docs + +# Check whether --with-tests was given. +if test "${with_tests+set}" = set; then : + withval=$with_tests; +fi + + +# Check whether --with-docs was given. +if test "${with_docs+set}" = set; then : + withval=$with_docs; +fi + +if test -n "$with_tests"; then : + enable_tests="$with_tests" +fi +if test -n "$with_docs"; then : + enable_doc="$with_docs" +fi +# Default to --enable-tests and --disable-docs +if test -z "$enable_tests"; then : + enable_tests="yes" +fi +if test -z "$enable_doc"; then : + enable_doc="no" +fi +# Normalize values +if test "$enable_tests" != "yes" -a "$enable_tests" != "root"; then : + enable_tests="no" +fi +if test "$enable_doc" != "yes"; then : + enable_doc="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 + + if test "$enable_doc" = "yes"; then + ENABLE_DOC_TRUE= + ENABLE_DOC_FALSE='#' +else + ENABLE_DOC_TRUE='#' + ENABLE_DOC_FALSE= +fi + +# Add gtk-doc conditionals +enable_gtk_doc="$enable_doc" + + + # 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 @@ -23234,272 +23632,7 @@ fi - - - - - - - # Check whether --enable-vala was given. -if test "${enable_vala+set}" = set; then : - enableval=$enable_vala; -else - enable_vala=auto -fi - - - case $enable_vala in #( - no) : - ;; #( - yes) : - - if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : - - as_fn_error $? "Vala bindings require GObject Introspection" "$LINENO" 5 - -fi - ;; #( - auto) : - - if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : - - enable_vala=no - -fi - ;; #( - *) : - - as_fn_error $? "Invalid argument passed to --enable-vala, should be one of [no/auto/yes]" "$LINENO" 5 - ;; -esac - - if test "x" = "x"; then : - - vapigen_pkg_name=vapigen - -else - - vapigen_pkg_name=vapigen- - -fi - if test "x0.17.1.24" = "x"; then : - - vapigen_pkg="$vapigen_pkg_name" - -else - - vapigen_pkg="$vapigen_pkg_name >= 0.17.1.24" - -fi - - - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$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 -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; 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_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$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 -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi -fi - - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$vapigen_pkg\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$vapigen_pkg") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - - if test "$enable_vala" = "auto"; then : - - enable_vala=yes - -fi - -else - - case $enable_vala in #( - yes) : - - as_fn_error $? "$vapigen_pkg not found" "$LINENO" 5 - ;; #( - auto) : - - enable_vala=no - ;; #( - *) : - ;; -esac - -fi - - case $enable_vala in #( - yes) : - - VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen - if test "x" = "x"; then : - - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` - -else - - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` - -fi - ;; #( - *) : - ;; -esac - - - - - - if test "x$enable_vala" = "xyes"; then - ENABLE_VAPIGEN_TRUE= - ENABLE_VAPIGEN_FALSE='#' -else - ENABLE_VAPIGEN_TRUE='#' - ENABLE_VAPIGEN_FALSE= -fi - - - - -# Check whether --with-tests was given. -if test "${with_tests+set}" = set; then : - withval=$with_tests; -fi - - if test "x$with_tests" = "xyes"; then - WITH_TESTS_TRUE= - WITH_TESTS_FALSE='#' -else - WITH_TESTS_TRUE='#' - WITH_TESTS_FALSE= -fi - -case $with_tests in - yes) - with_tests=yes - ;; - *) - with_tests=no - ;; -esac - - -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 src/backends/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 test/Makefile initscript/Makefile initscript/RedHat/Makefile initscript/RedHat/NetworkManager initscript/Gentoo/Makefile initscript/Gentoo/NetworkManager initscript/Debian/Makefile initscript/Debian/NetworkManager initscript/Slackware/Makefile initscript/Slackware/rc.networkmanager initscript/SUSE/Makefile initscript/SUSE/networkmanager initscript/Arch/Makefile initscript/Arch/networkmanager initscript/paldo/Makefile initscript/paldo/NetworkManager initscript/Mandriva/Makefile initscript/Mandriva/networkmanager initscript/linexa/Makefile 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 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 vapi/Makefile" +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 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" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -23642,65 +23775,25 @@ fi ac_config_commands="$ac_config_commands po/stamp-it" -if test -z "${WITH_DOCS_TRUE}" && test -z "${WITH_DOCS_FALSE}"; then - as_fn_error $? "conditional \"WITH_DOCS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_GENERIC_TRUE}" && test -z "${TARGET_GENERIC_FALSE}"; then - as_fn_error $? "conditional \"TARGET_GENERIC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_REDHAT_TRUE}" && test -z "${TARGET_REDHAT_FALSE}"; then - as_fn_error $? "conditional \"TARGET_REDHAT\" was never defined. +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 fi -if test -z "${TARGET_SUSE_TRUE}" && test -z "${TARGET_SUSE_FALSE}"; then - as_fn_error $? "conditional \"TARGET_SUSE\" was never defined. +if test -z "${CONFIG_PLUGIN_IFCFG_SUSE_TRUE}" && test -z "${CONFIG_PLUGIN_IFCFG_SUSE_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_PLUGIN_IFCFG_SUSE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${TARGET_GENTOO_TRUE}" && test -z "${TARGET_GENTOO_FALSE}"; then - as_fn_error $? "conditional \"TARGET_GENTOO\" was never defined. +if test -z "${CONFIG_PLUGIN_IFUPDOWN_TRUE}" && test -z "${CONFIG_PLUGIN_IFUPDOWN_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_PLUGIN_IFUPDOWN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${TARGET_DEBIAN_TRUE}" && test -z "${TARGET_DEBIAN_FALSE}"; then - as_fn_error $? "conditional \"TARGET_DEBIAN\" was never defined. +if test -z "${CONFIG_PLUGIN_IFNET_TRUE}" && test -z "${CONFIG_PLUGIN_IFNET_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_PLUGIN_IFNET\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${TARGET_SLACKWARE_TRUE}" && test -z "${TARGET_SLACKWARE_FALSE}"; then - as_fn_error $? "conditional \"TARGET_SLACKWARE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_ARCH_TRUE}" && test -z "${TARGET_ARCH_FALSE}"; then - as_fn_error $? "conditional \"TARGET_ARCH\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_PALDO_TRUE}" && test -z "${TARGET_PALDO_FALSE}"; then - as_fn_error $? "conditional \"TARGET_PALDO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_FRUGALWARE_TRUE}" && test -z "${TARGET_FRUGALWARE_FALSE}"; then - as_fn_error $? "conditional \"TARGET_FRUGALWARE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_MANDRIVA_TRUE}" && test -z "${TARGET_MANDRIVA_FALSE}"; then - as_fn_error $? "conditional \"TARGET_MANDRIVA\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_PARDUS_TRUE}" && test -z "${TARGET_PARDUS_FALSE}"; then - as_fn_error $? "conditional \"TARGET_PARDUS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_LINEXA_TRUE}" && test -z "${TARGET_LINEXA_FALSE}"; then - as_fn_error $? "conditional \"TARGET_LINEXA\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_EXHERBO_TRUE}" && test -z "${TARGET_EXHERBO_FALSE}"; then - as_fn_error $? "conditional \"TARGET_EXHERBO\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${TARGET_LFS_TRUE}" && test -z "${TARGET_LFS_FALSE}"; then - as_fn_error $? "conditional \"TARGET_LFS\" was never defined. +if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_FALSE}"; then + as_fn_error $? "conditional \"CODE_COVERAGE_ENABLED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${WITH_WEXT_TRUE}" && test -z "${WITH_WEXT_FALSE}"; then @@ -23727,6 +23820,14 @@ if test -z "${SESSION_TRACKING_SYSTEMD_TRUE}" && test -z "${SESSION_TRACKING_SYS as_fn_error $? "conditional \"SESSION_TRACKING_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${SUSPEND_RESUME_UPOWER_TRUE}" && test -z "${SUSPEND_RESUME_UPOWER_FALSE}"; then + as_fn_error $? "conditional \"SUSPEND_RESUME_UPOWER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${SUSPEND_RESUME_SYSTEMD_TRUE}" && test -z "${SUSPEND_RESUME_SYSTEMD_FALSE}"; then + 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 "${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 @@ -23747,10 +23848,30 @@ if test -z "${WITH_PPP_TRUE}" && test -z "${WITH_PPP_FALSE}"; then as_fn_error $? "conditional \"WITH_PPP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITH_MODEM_MANAGER_1_TRUE}" && test -z "${WITH_MODEM_MANAGER_1_FALSE}"; then + as_fn_error $? "conditional \"WITH_MODEM_MANAGER_1\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi 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 "${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 +fi +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 "${ENABLE_DOC_TRUE}" && test -z "${ENABLE_DOC_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_DOC\" 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 as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23771,14 +23892,6 @@ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}" as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${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 -fi -if test -z "${WITH_TESTS_TRUE}" && test -z "${WITH_TESTS_FALSE}"; then - as_fn_error $? "conditional \"WITH_TESTS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -24188,7 +24301,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.6.4, which was +This file was extended by NetworkManager $as_me 0.9.7.995, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24254,7 +24367,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.6.4 +NetworkManager config.status 0.9.7.995 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -24806,7 +24919,6 @@ do "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/backends/Makefile") CONFIG_FILES="$CONFIG_FILES src/backends/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" ;; @@ -24821,24 +24933,13 @@ do "cli/Makefile") CONFIG_FILES="$CONFIG_FILES cli/Makefile" ;; "cli/src/Makefile") CONFIG_FILES="$CONFIG_FILES cli/src/Makefile" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "initscript/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Makefile" ;; - "initscript/RedHat/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/RedHat/Makefile" ;; "initscript/RedHat/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/RedHat/NetworkManager" ;; - "initscript/Gentoo/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Gentoo/Makefile" ;; - "initscript/Gentoo/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/Gentoo/NetworkManager" ;; - "initscript/Debian/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Debian/Makefile" ;; "initscript/Debian/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/Debian/NetworkManager" ;; - "initscript/Slackware/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Slackware/Makefile" ;; "initscript/Slackware/rc.networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Slackware/rc.networkmanager" ;; - "initscript/SUSE/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/SUSE/Makefile" ;; "initscript/SUSE/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/SUSE/networkmanager" ;; - "initscript/Arch/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Arch/Makefile" ;; "initscript/Arch/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Arch/networkmanager" ;; - "initscript/paldo/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/paldo/Makefile" ;; "initscript/paldo/NetworkManager") CONFIG_FILES="$CONFIG_FILES initscript/paldo/NetworkManager" ;; - "initscript/Mandriva/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/Mandriva/Makefile" ;; "initscript/Mandriva/networkmanager") CONFIG_FILES="$CONFIG_FILES initscript/Mandriva/networkmanager" ;; - "initscript/linexa/Makefile") CONFIG_FILES="$CONFIG_FILES initscript/linexa/Makefile" ;; "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" ;; @@ -24851,6 +24952,7 @@ do "man/nmcli.1") CONFIG_FILES="$CONFIG_FILES man/nmcli.1" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "policy/Makefile") CONFIG_FILES="$CONFIG_FILES policy/Makefile" ;; + "policy/org.freedesktop.NetworkManager.policy.in") CONFIG_FILES="$CONFIG_FILES policy/org.freedesktop.NetworkManager.policy.in" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; "docs/api/Makefile") CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;; @@ -24867,6 +24969,7 @@ do "examples/C/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/Makefile" ;; "examples/C/glib/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/glib/Makefile" ;; "examples/C/qt/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/qt/Makefile" ;; + "examples/dispatcher/Makefile") CONFIG_FILES="$CONFIG_FILES examples/dispatcher/Makefile" ;; "vapi/Makefile") CONFIG_FILES="$CONFIG_FILES vapi/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -26528,67 +26631,62 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi +# Print build configuration echo -echo Distribution target: ${with_distro} -echo 'if this is not correct, please specifiy your distro with --with-distro=DISTRO' - +echo "System paths:" +echo " prefix: $prefix" +echo " exec_prefix: $exec_prefix" +echo " systemdunitdir: $with_systemdsystemunitdir" +echo " nmbinary: $nmbinary" +echo " nmconfdir: $nmconfdir" +echo " nmdatadir: $nmdatadir" +echo " nmstatedir: $nmstatedir" +echo " nmrundir: $nmrundir" echo -if test -n "${DHCLIENT_PATH}"; then - echo ISC dhclient support: ${DHCLIENT_PATH} - echo ISC dhclient version: ${DHCLIENT_VERSION} -else - echo ISC dhclient support: no -fi - -if test -n "${DHCPCD_PATH}"; then - echo dhcpcd support: ${DHCPCD_PATH} -else - echo dhcpcd support: no -fi - -if test -n "${with_systemdsystemunitdir}"; then - echo systemd unit support: ${with_systemdsystemunitdir} -else - echo systemd unit support: no -fi - +echo "Platform:" +echo " libnl: $with_libnl" +echo " session tracking: $with_session_tracking" +echo " suspend/resume: $with_suspend_resume" if test "${enable_polkit}" = "yes"; then - echo PolicyKit support: yes -else - echo PolicyKit support: no -fi - - echo Session tracking: ${with_session_tracking} - -if test "${enable_wimax}" = "yes"; then - echo WiMAX support: yes -else - echo WiMAX support: no -fi - -if test "${enable_ppp}" = "yes"; then - echo PPP support: yes + if test "${enable_modify_system}"; then + echo " policykit: yes (permissive modify.system)" + else + echo " policykit: yes (restrictive modify.system)" + fi else - echo PPP support: no + echo " policykit: no" fi +echo -if test "${enable_concheck}" = "yes"; then - echo Connectivity checking support: yes -else - echo Connectivity checking support: no -fi +echo "Features:" +echo " wext: $ac_with_wext" +echo " wimax: $enable_wimax" +echo " ppp: $enable_ppp" +echo " modemmanager-1: $with_modem_manager_1" +echo " concheck: $enable_concheck" +echo -echo libnl version: ${libnl_version} +echo "Configuration plugins" +echo " ifcfg-rh: ${enable_ifcfg_rh}" +echo " ifcfg-suse: ${enable_ifcfg_suse}" +echo " ifupdown: ${enable_ifupdown}" +echo " ifnet: ${enable_ifnet}" +echo -if test "${ac_with_wext}" = "yes"; then - echo WEXT support: yes -else - echo WEXT support: no -fi +echo "Handlers for /etc/resolv.conf:" +echo " resolvconf: ${with_resolvconf}" +echo " netconfig: ${with_netconfig}" +echo +echo "DHCP clients:" +echo " dhclient: $with_dhclient" +echo " dhcpcd: $with_dhcpcd" echo -echo Building documentation: ${with_docs} -echo Building tests: ${with_tests} + +echo "Miscellaneous:" +echo " documentation: $enable_doc" +echo " tests: $enable_tests" +echo " code coverage: $enable_code_coverage" echo |