diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 616 |
1 files changed, 553 insertions, 63 deletions
diff --git a/configure b/configure index 7e31eb6e..3663c681 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.2.0. +# Generated by GNU Autoconf 2.68 for NetworkManager 0.9.4.0. # # 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.2.0' -PACKAGE_STRING='NetworkManager 0.9.2.0' +PACKAGE_VERSION='0.9.4.0' +PACKAGE_STRING='NetworkManager 0.9.4.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -634,6 +634,10 @@ HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE GTKDOC_CHECK +WITH_CONCHECK_FALSE +WITH_CONCHECK_TRUE +LIBSOUP_LIBS +LIBSOUP_CFLAGS KERNEL_FIRMWARE_DIR SYSTEM_CA_PATH IPTABLES_PATH @@ -645,7 +649,9 @@ PPPD_PLUGIN_DIR WITH_PPP_FALSE WITH_PPP_TRUE DBUS_SYS_DIR +GLIB_MKENUMS GLIB_GENMARSHAL +GLIB_MAKEFILE WITH_GNUTLS_FALSE WITH_GNUTLS_TRUE WITH_NSS_FALSE @@ -674,18 +680,25 @@ LIBNL1_LIBS LIBNL1_CFLAGS LIBNL2_LIBS LIBNL2_CFLAGS +LIBNL_GENL3_LIBS +LIBNL_GENL3_CFLAGS LIBNL_ROUTE3_LIBS LIBNL_ROUTE3_CFLAGS LIBNL3_LIBS LIBNL3_CFLAGS -WITH_CONSOLEKIT_FALSE -WITH_CONSOLEKIT_TRUE +SESSION_TRACKING_SYSTEMD_FALSE +SESSION_TRACKING_SYSTEMD_TRUE +SESSION_TRACKING_CK_FALSE +SESSION_TRACKING_CK_TRUE +SYSTEMD_LIBS +SYSTEMD_CFLAGS HAVE_SYSTEMD_FALSE HAVE_SYSTEMD_TRUE systemdsystemunitdir UDEV_BASE_DIR WITH_QT_FALSE WITH_QT_TRUE +MOC QT_LIBS QT_CFLAGS HAVE_INTROSPECTION_FALSE @@ -713,6 +726,8 @@ PKG_CONFIG_PATH PKG_CONFIG LIBDL LIBM +WITH_WEXT_FALSE +WITH_WEXT_TRUE TARGET_EXHERBO_FALSE TARGET_EXHERBO_TRUE TARGET_LINEXA_FALSE @@ -737,6 +752,8 @@ TARGET_SUSE_FALSE TARGET_SUSE_TRUE TARGET_REDHAT_FALSE TARGET_REDHAT_TRUE +TARGET_GENERIC_FALSE +TARGET_GENERIC_TRUE WITH_DOCS_FALSE WITH_DOCS_TRUE GETTEXT_PACKAGE @@ -927,11 +944,12 @@ with_libintl_prefix with_docs with_distro with_dist_version +with_wext enable_introspection enable_qt with_udev_dir with_systemdsystemunitdir -with_ck +with_session_tracking enable_wimax enable_polkit with_crypto @@ -945,6 +963,7 @@ with_iptables with_system_ca_path with_kernel_firmware_dir enable_crashtrace +enable_concheck enable_more_warnings with_html_dir enable_gtk_doc @@ -980,10 +999,14 @@ GIO_CFLAGS GIO_LIBS QT_CFLAGS QT_LIBS +SYSTEMD_CFLAGS +SYSTEMD_LIBS LIBNL3_CFLAGS LIBNL3_LIBS LIBNL_ROUTE3_CFLAGS LIBNL_ROUTE3_LIBS +LIBNL_GENL3_CFLAGS +LIBNL_GENL3_LIBS LIBNL2_CFLAGS LIBNL2_LIBS LIBNL1_CFLAGS @@ -998,6 +1021,8 @@ NSS_CFLAGS NSS_LIBS GNUTLS_CFLAGS GNUTLS_LIBS +LIBSOUP_CFLAGS +LIBSOUP_LIBS GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS' @@ -1542,7 +1567,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.2.0 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.9.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1612,7 +1637,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.9.2.0:";; + short | recursive ) echo "Configuration of NetworkManager 0.9.4.0:";; esac cat <<\_ACEOF @@ -1640,7 +1665,8 @@ Optional Features: --enable-polkit enable PolicyKit support --enable-ppp enable PPP/PPPoE support --disable-crashtrace Disable GNU backtrace extensions - --enable-more-warnings Maximum compiler warnings + --enable-concheck enable connectivity checking support + --enable-more-warnings Possible values: no/yes/error --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]] @@ -1664,11 +1690,13 @@ Optional Packages: paldo, mandriva, pardus, linexa or exherbo --with-dist-version=<NM-distribution-version> 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 - --without-ck Build NetworkManager without ConsoleKit session - tracking support + --with-session-tracking=systemd + Build NetworkManager with specific session tracking + support --with-crypto=nss | gnutls Cryptography library to use for certificate and key operations @@ -1723,6 +1751,10 @@ Some influential environment variables: 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 LIBNL3_CFLAGS C compiler flags for LIBNL3, overriding pkg-config LIBNL3_LIBS linker flags for LIBNL3, overriding pkg-config @@ -1730,6 +1762,10 @@ Some influential environment variables: 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 @@ -1750,6 +1786,10 @@ Some influential environment variables: GNUTLS_CFLAGS C compiler flags for GNUTLS, overriding pkg-config GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config + LIBSOUP_CFLAGS + C compiler flags for LIBSOUP, overriding pkg-config + LIBSOUP_LIBS + linker flags for LIBSOUP, overriding pkg-config GTKDOC_DEPS_CFLAGS C compiler flags for GTKDOC_DEPS, overriding pkg-config GTKDOC_DEPS_LIBS @@ -1821,7 +1861,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.9.2.0 +NetworkManager configure 0.9.4.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2365,7 +2405,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.2.0, which was +It was created by NetworkManager $as_me 0.9.4.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3186,7 +3226,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.9.2.0' + VERSION='0.9.4.0' cat >>confdefs.h <<_ACEOF @@ -16313,8 +16353,8 @@ fi NM_MAJOR_VERSION=0 NM_MINOR_VERSION=9 -NM_MICRO_VERSION=2 -NM_VERSION=0.9.2.0 +NM_MICRO_VERSION=4 +NM_VERSION=0.9.4.0 @@ -19573,7 +19613,7 @@ if test "z$with_distro" = "z"; then exit 1 else case $with_distro in - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;; + redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|generic) ;; *) echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" exit 1 @@ -19581,6 +19621,20 @@ else esac fi + if test x"$with_distro" = xgeneric; then + TARGET_GENERIC_TRUE= + TARGET_GENERIC_FALSE='#' +else + TARGET_GENERIC_TRUE='#' + TARGET_GENERIC_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='#' @@ -19765,8 +19819,66 @@ _ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux Wireless Extensions >= 18" >&5 -$as_echo_n "checking Linux Wireless Extensions >= 18... " >&6; } + +# Check whether --with-wext was given. +if test "${with_wext+set}" = set; then : + withval=$with_wext; ac_with_wext=$withval +else + ac_with_wext="yes" +fi + +if test x"$ac_with_wext" = x"yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel WEXT headers" >&5 +$as_echo_n "checking Linux kernel WEXT headers... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __user + #define __user + #endif + #include <sys/types.h> + #include <linux/types.h> + #include <sys/socket.h> + #include <linux/wireless.h> +int +main () +{ +#ifndef IWEVGENIE + #error "not found" + #endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_have_iwevgenie=yes +else + ac_have_iwevgenie=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_iwevgenie" >&5 +$as_echo "$ac_have_iwevgenie" >&6; } + if test "$ac_have_iwevgenie" = no; then + as_fn_error $? "Linux kernel development header linux/wireless.h not installed or not functional" "$LINENO" 5 + fi + +$as_echo "#define HAVE_WEXT 1" >>confdefs.h + +else + +$as_echo "#define HAVE_WEXT 0" >>confdefs.h + +fi + if test x"${ac_with_wext}" = x"yes"; then + WITH_WEXT_TRUE= + WITH_WEXT_FALSE='#' +else + WITH_WEXT_TRUE='#' + WITH_WEXT_FALSE= +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel nl80211 headers" >&5 +$as_echo_n "checking Linux kernel nl80211 headers... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __user @@ -19775,28 +19887,61 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include <sys/types.h> #include <linux/types.h> #include <sys/socket.h> - #include <net/if.h> - #include <wireless.h> + #include <linux/nl80211.h> int main () { -#ifndef IWEVGENIE - #error "not found" +int a = NL80211_RATE_INFO_BITRATE; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_have_nl80211=yes +else + ac_have_nl80211=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_nl80211" >&5 +$as_echo "$ac_have_nl80211" >&6; } +if test "$ac_have_nl80211" = no; then + as_fn_error $? "Linux kernel development header linux/nl80211.h not installed or not functional" "$LINENO" 5 +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel VLAN_FLAG_LOOSE_BINDING enum value" >&5 +$as_echo_n "checking Linux kernel VLAN_FLAG_LOOSE_BINDING enum value... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __user + #define __user #endif + #include <sys/types.h> + #include <linux/types.h> + #include <linux/if_vlan.h> +int +main () +{ +unsigned int a = VLAN_FLAG_LOOSE_BINDING; ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - ac_have_iwevgenie=yes + ac_have_vlan_flag_loose_binding=yes else - ac_have_iwevgenie=no + ac_have_vlan_flag_loose_binding=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_iwevgenie" >&5 -$as_echo "$ac_have_iwevgenie" >&6; } -if test "$ac_have_iwevgenie" = no; then - as_fn_error $? "wireless-tools or libiw development headers >= 28pre9 not installed or not functional" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_vlan_flag_loose_binding" >&5 +$as_echo "$ac_have_vlan_flag_loose_binding" >&6; } +if test "$ac_have_vlan_flag_loose_binding" = yes; then + +$as_echo "#define HAVE_VLAN_FLAG_LOOSE_BINDING 1" >>confdefs.h + +else + +$as_echo "#define HAVE_VLAN_FLAG_LOOSE_BINDING 0" >>confdefs.h + fi LIBM= @@ -20790,6 +20935,51 @@ if (test "${enable_qt}" = "yes"); then fi + # Check for moc-qt4 and if not found then moc + QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir` + for ac_prog in moc-qt4 moc +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MOC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MOC"; then + ac_cv_prog_MOC="$MOC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$QT4_BINDIR:$PATH" +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_prog_MOC="$ac_prog" + $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 +fi +MOC=$ac_cv_prog_MOC +if test -n "$MOC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5 +$as_echo "$MOC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$MOC" && break +done + fi if test "${enable_qt}" = "yes"; then WITH_QT_TRUE= @@ -20814,7 +21004,7 @@ else fi -# systemd +# systemd unit support # Check whether --with-systemdsystemunitdir was given. if test "${with_systemdsystemunitdir+set}" = set; then : @@ -20837,29 +21027,133 @@ fi -# Check whether --with-ck was given. -if test "${with_ck+set}" = set; then : - withval=$with_ck; +# Check whether --with-session-tracking was given. +if test "${with_session_tracking+set}" = set; then : + withval=$with_session_tracking; fi - if test x"$with_ck" != xno; then - WITH_CONSOLEKIT_TRUE= - WITH_CONSOLEKIT_FALSE='#' +if test "z$with_session_tracking" = "z"; then + # Default to ConsoleKit session tracking like we used before + with_session_tracking=ck +fi + +case $with_session_tracking in + ck|none) ;; + systemd) + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 +$as_echo_n "checking for SYSTEMD... " >&6; } + +if test -n "$SYSTEMD_CFLAGS"; then + pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_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 + ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5 + 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` else - WITH_CONSOLEKIT_TRUE='#' - WITH_CONSOLEKIT_FALSE= + pkg_failed=yes fi + else + pkg_failed=untried +fi +if test -n "$SYSTEMD_LIBS"; then + pkg_cv_SYSTEMD_LIBS="$SYSTEMD_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 + ($PKG_CONFIG --exists --print-errors "libsystemd-login") 2>&5 + 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` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + -no_ck=0 -if test x"$with_ck" = x"no"; then - no_ck="1" +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 - with_ck="yes" + _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` + else + SYSTEMD_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 + + as_fn_error $? "Package requirements (libsystemd-login) were not met: + +$SYSTEMD_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. +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 SYSTEMD_CFLAGS +and SYSTEMD_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 + { $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 "x$with_session_tracking" = "xsystemd"; then + SESSION_TRACKING_SYSTEMD_TRUE= + SESSION_TRACKING_SYSTEMD_FALSE='#' +else + SESSION_TRACKING_SYSTEMD_TRUE='#' + SESSION_TRACKING_SYSTEMD_FALSE= fi -cat >>confdefs.h <<_ACEOF -#define NO_CONSOLEKIT $no_ck -_ACEOF have_libnl="no" @@ -21001,12 +21295,81 @@ else $as_echo "yes" >&6; } have_libnl_route3=yes fi -if (test "${have_libnl3}" = "yes" -a "${have_libnl_route3}" = "yes"); then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNL_GENL3" >&5 +$as_echo_n "checking for LIBNL_GENL3... " >&6; } + +if test -n "$LIBNL_GENL3_CFLAGS"; then + pkg_cv_LIBNL_GENL3_CFLAGS="$LIBNL_GENL3_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 + 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` +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" + 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 + 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` +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 + LIBNL_GENL3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnl-genl-3.0" 2>&1` + else + LIBNL_GENL3_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnl-genl-3.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBNL_GENL3_PKG_ERRORS" >&5 + + have_libnl_genl3=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 +else + LIBNL_GENL3_CFLAGS=$pkg_cv_LIBNL_GENL3_CFLAGS + LIBNL_GENL3_LIBS=$pkg_cv_LIBNL_GENL3_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_libnl_genl3=yes +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_LIBS="$LIBNL3_LIBS $LIBNL_ROUTE3_LIBS" + 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 @@ -21893,8 +22256,12 @@ if test x"$ac_nss" = xno -a x"$ac_gnutls" = xno; then as_fn_error $? "Could not find required development headers and libraries for '$ac_crypto'" "$LINENO" 5 fi +GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' + GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` +GLIB_MKENUMS='$(top_srcdir)/tools/glib-mkenums' + # Check whether --with-dbus-sys-dir was given. @@ -22225,11 +22592,110 @@ $as_echo "#define ENABLE_CRASHTRACE 1" >>confdefs.h fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP" >&5 +$as_echo_n "checking for LIBSOUP... " >&6; } + +if test -n "$LIBSOUP_CFLAGS"; then + pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.26\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.26") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBSOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.26" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBSOUP_LIBS"; then + pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.26\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.26") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBSOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.26" 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 + LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4 >= 2.26" 2>&1` + else + LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4 >= 2.26" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBSOUP_PKG_ERRORS" >&5 + + have_libsoup=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_libsoup=no +else + LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS + LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_libsoup=yes +fi +# Check whether --enable-concheck was given. +if test "${enable_concheck+set}" = set; then : + enableval=$enable_concheck; enable_concheck=${enableval} +else + enable_concheck=${have_libsoup} +fi + +if (test "${enable_concheck}" = "yes"); then + if test x"$have_concheck" = x"no"; then + as_fn_error $? "Connectivity checking requires libsoup development headers" "$LINENO" 5 + fi + + + +$as_echo "#define WITH_CONCHECK 1" >>confdefs.h + +else + +$as_echo "#define WITH_CONCHECK 0" >>confdefs.h + +fi + if test "${enable_concheck}" = "yes"; then + WITH_CONCHECK_TRUE= + WITH_CONCHECK_FALSE='#' +else + WITH_CONCHECK_TRUE='#' + WITH_CONCHECK_FALSE= +fi + + # Check whether --enable-more-warnings was given. if test "${enable_more_warnings+set}" = set; then : enableval=$enable_more_warnings; set_more_warnings="$enableval" else - set_more_warnings=yes + set_more_warnings=error fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5 @@ -22274,7 +22740,9 @@ $as_echo "$has_option" >&6; } unset SAVE_CFLAGS done unset option - CFLAGS="$CFLAGS -Werror" + if test "x$set_more_warnings" = xerror; then + CFLAGS="$CFLAGS -Werror" + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -22627,7 +23095,7 @@ case $with_tests in esac -ac_config_files="$ac_config_files Makefile include/Makefile include/nm-version.h src/Makefile src/tests/Makefile marshallers/Makefile src/logging/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/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/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-util/Makefile NetworkManager.pc examples/Makefile examples/python/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/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/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/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-util/Makefile NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/ruby/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22775,6 +23243,10 @@ if test -z "${WITH_DOCS_TRUE}" && test -z "${WITH_DOCS_FALSE}"; then 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. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -22823,6 +23295,10 @@ 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 "${WITH_WEXT_TRUE}" && test -z "${WITH_WEXT_FALSE}"; then + as_fn_error $? "conditional \"WITH_WEXT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -22835,8 +23311,12 @@ if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WITH_CONSOLEKIT_TRUE}" && test -z "${WITH_CONSOLEKIT_FALSE}"; then - as_fn_error $? "conditional \"WITH_CONSOLEKIT\" was never defined. +if test -z "${SESSION_TRACKING_CK_TRUE}" && test -z "${SESSION_TRACKING_CK_FALSE}"; then + as_fn_error $? "conditional \"SESSION_TRACKING_CK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${SESSION_TRACKING_SYSTEMD_TRUE}" && test -z "${SESSION_TRACKING_SYSTEMD_FALSE}"; then + 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 "${WITH_WIMAX_TRUE}" && test -z "${WITH_WIMAX_FALSE}"; then @@ -22859,6 +23339,10 @@ 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_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_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 @@ -23292,7 +23776,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.2.0, which was +This file was extended by NetworkManager $as_me 0.9.4.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23358,7 +23842,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.2.0 +NetworkManager config.status 0.9.4.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -23880,7 +24364,7 @@ do "include/nm-version.h") CONFIG_FILES="$CONFIG_FILES include/nm-version.h" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;; - "marshallers/Makefile") CONFIG_FILES="$CONFIG_FILES marshallers/Makefile" ;; + "src/generated/Makefile") CONFIG_FILES="$CONFIG_FILES src/generated/Makefile" ;; "src/logging/Makefile") CONFIG_FILES="$CONFIG_FILES src/logging/Makefile" ;; "src/dns-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/dns-manager/Makefile" ;; "src/vpn-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/vpn-manager/Makefile" ;; @@ -23893,6 +24377,8 @@ do "src/dnsmasq-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/dnsmasq-manager/Makefile" ;; "src/modem-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/modem-manager/Makefile" ;; "src/bluez-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/bluez-manager/Makefile" ;; + "src/wifi/Makefile") CONFIG_FILES="$CONFIG_FILES src/wifi/Makefile" ;; + "src/firewall-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/firewall-manager/Makefile" ;; "src/settings/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/Makefile" ;; "src/settings/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/Makefile" ;; "src/settings/plugins/ifupdown/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifupdown/Makefile" ;; @@ -23961,7 +24447,9 @@ do "docs/libnm-util/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm-util/Makefile" ;; "NetworkManager.pc") CONFIG_FILES="$CONFIG_FILES NetworkManager.pc" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; + "examples/shell/Makefile") CONFIG_FILES="$CONFIG_FILES examples/shell/Makefile" ;; "examples/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/Makefile" ;; + "examples/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES examples/ruby/Makefile" ;; "examples/C/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/Makefile" ;; "examples/C/glib/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/glib/Makefile" ;; "examples/C/qt/Makefile") CONFIG_FILES="$CONFIG_FILES examples/C/qt/Makefile" ;; @@ -25650,9 +26138,9 @@ else fi if test -n "${with_systemdsystemunitdir}"; then - echo systemd support: ${with_systemdsystemunitdir} + echo systemd unit support: ${with_systemdsystemunitdir} else - echo systemd support: no + echo systemd unit support: no fi if test "${enable_polkit}" = "yes"; then @@ -25661,11 +26149,7 @@ else echo PolicyKit support: no fi -if test -n "${with_ck}"; then - echo ConsoleKit support: ${with_ck} -else - echo ConsoleKit support: no -fi + echo Session tracking: ${with_session_tracking} if test "${enable_wimax}" = "yes"; then echo WiMAX support: yes @@ -25679,6 +26163,12 @@ else echo PPP support: no fi +if test "${enable_concheck}" = "yes"; then + echo Connectivity checking support: yes +else + echo Connectivity checking support: no +fi + echo libnl version: ${libnl_version} echo |