diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 817 |
1 files changed, 450 insertions, 367 deletions
diff --git a/configure b/configure index 73b65af3..a93d16eb 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.4.4. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.5.90. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.4.4' -PACKAGE_STRING='NetworkManager 1.4.4' +PACKAGE_VERSION='1.5.90' +PACKAGE_STRING='NetworkManager 1.5.90' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -633,17 +633,25 @@ ac_includes_default="\ #endif" gt_needs= -enable_option_checking=no ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -subdirs SETTING_DOCS_AVAILABLE_FALSE SETTING_DOCS_AVAILABLE_TRUE BUILD_SETTING_DOCS_FALSE BUILD_SETTING_DOCS_TRUE +XSLTPROC PERL +pkgpyexecdir +pyexecdir +pkgpythondir +pythondir +PYTHON_PLATFORM +PYTHON_EXEC_PREFIX +PYTHON_PREFIX +PYTHON_VERSION +PYTHON INSTALL_PREGEN_MANPAGES_FALSE INSTALL_PREGEN_MANPAGES_TRUE GTK_DOC_USE_REBASE_FALSE @@ -665,9 +673,7 @@ GTKDOC_MKPDF GTKDOC_REBASE GTKDOC_CHECK_PATH GTKDOC_CHECK -WITH_VALGRIND_FALSE -WITH_VALGRIND_TRUE -VALGRIND_RULES +NM_LOG_COMPILER REQUIRE_ROOT_TESTS_FALSE REQUIRE_ROOT_TESTS_TRUE ENABLE_TESTS_FALSE @@ -700,12 +706,13 @@ SYSTEM_CA_PATH DNSSEC_TRIGGER_SCRIPT DNSMASQ_PATH IPTABLES_PATH -NM_CONFIG_DEFAULT_DNS_RC_MANAGER +NM_CONFIG_DEFAULT_MAIN_RC_MANAGER with_netconfig with_resolvconf +NM_CONFIG_DEFAULT_MAIN_DHCP DHCPCD_PATH -DHCLIENT_PATH with_dhcpcd +DHCLIENT_PATH with_dhclient WITH_OFONO_FALSE WITH_OFONO_TRUE @@ -738,7 +745,7 @@ WITH_POLKIT_AGENT_FALSE WITH_POLKIT_AGENT_TRUE POLKIT_LIBS POLKIT_CFLAGS -NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT +NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT JANSSON_LIBS JANSSON_CFLAGS WITH_TEAMDCTL_FALSE @@ -758,7 +765,7 @@ SYSTEMD_INHIBIT_LIBS SYSTEMD_INHIBIT_CFLAGS SYSTEMD_LOGIN_LIBS SYSTEMD_LOGIN_CFLAGS -NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT +NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT SYSTEMD_JOURNAL_LIBS SYSTEMD_JOURNAL_CFLAGS LIBSYSTEMD_LIBS @@ -1064,6 +1071,8 @@ enable_bluez5_dun with_ofono with_dhclient with_dhcpcd +with_dhcpcd_supports_ipv6 +with_config_dhcp_default with_resolvconf with_netconfig with_config_dns_rc_manager_default @@ -1158,8 +1167,9 @@ LIBNDP_LIBS NEWT_CFLAGS NEWT_LIBS GTKDOC_DEPS_CFLAGS -GTKDOC_DEPS_LIBS' -ac_subdirs_all='libndp' +GTKDOC_DEPS_LIBS +PYTHON' + # Initialize some variables set by options. ac_init_help= @@ -1699,7 +1709,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 1.4.4 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.5.90 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1769,7 +1779,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.4.4:";; + short | recursive ) echo "Configuration of NetworkManager 1.5.90:";; esac cat <<\_ACEOF @@ -1904,6 +1914,12 @@ Optional Packages: Enable dhclient 4.x support --with-dhcpcd=yes|no|path Enable dhcpcd 4.x support + --with-dhcpcd-supports-ipv6=yes|no|auto + Whether using dhcpcd >= 6.x which has IPv6 support + --with-config-dhcp-default=dhclient|dhcpcd|internal + Default configuration option for main.dhcp setting, + used as fallback if the configuration option is + unset --with-resolvconf=yes|no|path Enable resolvconf support --with-netconfig=yes|no Enable SUSE netconfig support @@ -2029,6 +2045,7 @@ Some influential environment variables: C compiler flags for GTKDOC_DEPS, overriding pkg-config GTKDOC_DEPS_LIBS linker flags for GTKDOC_DEPS, overriding pkg-config + PYTHON the Python interpreter Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -2096,7 +2113,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.4.4 +NetworkManager configure 1.5.90 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2823,7 +2840,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 1.4.4, which was +It was created by NetworkManager $as_me 1.5.90, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3693,7 +3710,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.4.4' + VERSION='1.5.90' cat >>confdefs.h <<_ACEOF @@ -17775,9 +17792,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 -NM_MINOR_VERSION=4 -NM_MICRO_VERSION=4 -NM_VERSION=1.4.4 +NM_MINOR_VERSION=5 +NM_MICRO_VERSION=90 +NM_VERSION=1.5.90 @@ -17785,7 +17802,7 @@ NM_VERSION=1.4.4 -NM_GIT_SHA=3c70a03cf5be420afaaf44f3a0bab5d00cc4e993 +NM_GIT_SHA=ba414491b7c4307a06267d4898ff0fd8b80f7df8 if test """" != "no-config-h" ; then @@ -20777,7 +20794,7 @@ distro_plugins="${distro_plugins#,}" cat >>confdefs.h <<_ACEOF -#define CONFIG_PLUGINS_DEFAULT "$config_plugins_default" +#define NM_CONFIG_DEFAULT_MAIN_PLUGINS "$config_plugins_default" _ACEOF if test "${enable_config_plugin_ibft}" = yes; then @@ -22777,10 +22794,10 @@ if test "$nm_config_logging_backend_default" = ""; then fi cat >>confdefs.h <<_ACEOF -#define NM_CONFIG_LOGGING_BACKEND_DEFAULT "$nm_config_logging_backend_default" +#define NM_CONFIG_DEFAULT_LOGGING_BACKEND "$nm_config_logging_backend_default" _ACEOF -NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT="$nm_config_logging_backend_default" +NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT="$nm_config_logging_backend_default" # Session tracking support @@ -23569,23 +23586,23 @@ if test "$have_libaudit" = "yes"; then $as_echo "#define HAVE_LIBAUDIT 1" >>confdefs.h - if test "$with_libaudit" = "yes-disabled-by-default"; then + if test "$with_libaudit" = "yes-disabled-by-default"; then -$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT FALSE" >>confdefs.h +$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"false\"" >>confdefs.h - NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false' - else + NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false' + else -$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT TRUE" >>confdefs.h +$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"true\"" >>confdefs.h - NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='true' - fi + NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='true' + fi else $as_echo "#define HAVE_LIBAUDIT 0" >>confdefs.h -$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT FALSE" >>confdefs.h +$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"false\"" >>confdefs.h NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false' fi @@ -23879,6 +23896,17 @@ else fi +# Jansson for team configuration validation +# Check whether --enable-json-validation was given. +if test "${enable_json_validation+set}" = set; then : + enableval=$enable_json_validation; +fi + +if (test "${enable_json_validation}" == "no"); then + +$as_echo "#define WITH_JANSSON 0" >>confdefs.h + +else pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5 @@ -23938,36 +23966,21 @@ fi # Put the nasty error message in config.log where it belongs echo "$JANSSON_PKG_ERRORS" >&5 - have_jansson=no + as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_jansson=no + as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5 else JANSSON_CFLAGS=$pkg_cv_JANSSON_CFLAGS JANSSON_LIBS=$pkg_cv_JANSSON_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_jansson=yes -fi -# Check whether --enable-json-validation was given. -if test "${enable_json_validation+set}" = set; then : - enableval=$enable_json_validation; enable_json_validation=${enableval} -else - enable_json_validation=${have_jansson} -fi -if (test "${enable_json_validation}" = "yes"); then - if test x"$have_jansson" = x"no"; then - as_fn_error $? "Jansson is required for JSON validation" "$LINENO" 5 - fi +fi $as_echo "#define WITH_JANSSON 1" >>confdefs.h -else - -$as_echo "#define WITH_JANSSON 0" >>confdefs.h - fi # we usually compile with polkit support. --enable-polkit=yes|no only sets the @@ -23985,14 +23998,16 @@ fi if (test "${enable_polkit}" != "no" -a "${enable_polkit}" != "disabled"); then enable_polkit=yes -$as_echo "#define NM_CONFIG_DEFAULT_AUTH_POLKIT TRUE" >>confdefs.h +$as_echo "#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT \"true\"" >>confdefs.h + + NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT=true - NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT='true' else -$as_echo "#define NM_CONFIG_DEFAULT_AUTH_POLKIT FALSE" >>confdefs.h +$as_echo "#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT \"false\"" >>confdefs.h + + NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT=false - NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT='false' fi if (test "${enable_polkit}" != "disabled"); then @@ -24005,7 +24020,6 @@ $as_echo "#define WITH_POLKIT 0" >>confdefs.h fi - pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5 $as_echo_n "checking for POLKIT... " >&6; } @@ -24730,21 +24744,8 @@ if test "${with_dhclient+set}" = set; then : withval=$with_dhclient; fi - -# Check whether --with-dhcpcd was given. -if test "${with_dhcpcd+set}" = set; then : - withval=$with_dhcpcd; -fi - -# 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 +if test "$with_dhclient" != "no"; then + with_dhclient_="$with_dhclient" for ac_prog in dhclient do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -24792,15 +24793,47 @@ fi done test -n "$with_dhclient" || with_dhclient="no" - if test "$with_dhclient" != "no"; then + if test "$with_dhclient" == "no"; then + if test "$with_dhclient_" == yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dhclient not found, assume path /usr/sbin/dhclient" >&5 +$as_echo "$as_me: WARNING: dhclient not found, assume path /usr/sbin/dhclient" >&2;} + with_dhclient=/usr/sbin/dhclient + fi + else 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 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Seems version of dhclient $with_dhclient is too old, version 4.x or newer is required." >&5 +$as_echo "$as_me: WARNING: Seems version of dhclient $with_dhclient is too old, version 4.x or newer is required." >&2;} fi fi fi -if test "$with_dhcpcd" = "yes"; then +if test "$with_dhclient" != "no"; then + +$as_echo "#define WITH_DHCLIENT 1" >>confdefs.h + + DHCLIENT_PATH=$with_dhclient + +else + +$as_echo "#define WITH_DHCLIENT 0" >>confdefs.h + +fi + + +# Check whether --with-dhcpcd was given. +if test "${with_dhcpcd+set}" = set; then : + withval=$with_dhcpcd; +fi + + +# Check whether --with-dhcpcd-supports-ipv6 was given. +if test "${with_dhcpcd_supports_ipv6+set}" = set; then : + withval=$with_dhcpcd_supports_ipv6; with_dhcpcd_supports_ipv6=$withval +else + with_dhcpcd_supports_ipv6=auto +fi + +if test "$with_dhcpcd" != "no"; then + with_dhcpcd_="$with_dhcpcd" for ac_prog in dhcpcd do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -24848,47 +24881,79 @@ fi done test -n "$with_dhcpcd" || with_dhcpcd="no" - if test "$with_dhcpcd" != "no"; then + if test "$with_dhcpcd" == "no"; then + if test "$with_dhcpcd_" == yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dhcpcd not found, assume path /usr/sbin/dhcpcd" >&5 +$as_echo "$as_me: WARNING: dhcpcd not found, assume path /usr/sbin/dhcpcd" >&2;} + with_dhcpcd=/usr/sbin/dhcpcd + if test "$with_dhcpcd_supports_ipv6" == auto; then + with_dhcpcd_supports_ipv6=yes + fi + fi + else if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [456789]\."; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use dhcpcd, version 4.x or higher is required" >&5 -$as_echo "$as_me: WARNING: Cannot use dhcpcd, version 4.x or higher is required" >&2;} - with_dhcpcd=no - elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Seems version of dhcpcd $with_dhcpcd is too old, version 4.x or newer is required" >&5 +$as_echo "$as_me: WARNING: Seems version of dhcpcd $with_dhcpcd is too old, version 4.x or newer is required" >&2;} + fi + fi +fi +if test "$with_dhcpcd" != "no"; then + if $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then + if test "$with_dhcpcd_supports_ipv6" == no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Seems version of dhcpcd $with_dhcpcd supports IPv6, but compiling --with-dhcpcd-supports-ipv6=no" >&5 +$as_echo "$as_me: WARNING: Seems version of dhcpcd $with_dhcpcd supports IPv6, but compiling --with-dhcpcd-supports-ipv6=no" >&2;} + else + with_dhcpcd_supports_ipv6=yes + fi + else + if test "$with_dhcpcd_supports_ipv6" == yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Seems version of dhcpcd $with_dhcpcd does not support IPv6, but compiling --with-dhcpcd-supports-ipv6=yes" >&5 +$as_echo "$as_me: WARNING: Seems version of dhcpcd $with_dhcpcd does not support IPv6, but compiling --with-dhcpcd-supports-ipv6=yes" >&2;} + else + with_dhcpcd_supports_ipv6=no + fi + fi + if test "$with_dhcpcd_supports_ipv6" != no; then $as_echo "#define DHCPCD_SUPPORTS_IPV6 1" >>confdefs.h - fi fi +else + with_dhcpcd_supports_ipv6=no 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 +if test "$with_dhcpcd" != "no"; then -$as_echo "#define WITH_DHCLIENT TRUE" >>confdefs.h +$as_echo "#define WITH_DHCPCD 1" >>confdefs.h - DHCLIENT_PATH=$with_dhclient + DHCPCD_PATH=$with_dhcpcd else -$as_echo "#define WITH_DHCLIENT FALSE" >>confdefs.h +$as_echo "#define WITH_DHCPCD 0" >>confdefs.h fi -if test "$with_dhcpcd" != "no"; then -$as_echo "#define WITH_DHCPCD TRUE" >>confdefs.h - - DHCPCD_PATH=$with_dhcpcd +# Check whether --with-config-dhcp-default was given. +if test "${with_config_dhcp_default+set}" = set; then : + withval=$with_config_dhcp_default; config_dhcp_default="$withval" else + config_dhcp_default="" +fi -$as_echo "#define WITH_DHCPCD FALSE" >>confdefs.h - +if test "$config_dhcp_default" = yes -o "$config_dhcp_default" = no; then + config_dhcp_default='' fi +test -z "$config_dhcp_default" -a "$with_dhclient" != "no" && config_dhcp_default='dhclient' +test -z "$config_dhcp_default" -a "$with_dhcpcd" != "no" && config_dhcp_default='dhcpcd' +test -z "$config_dhcp_default" && config_dhcp_default='internal' + +cat >>confdefs.h <<_ACEOF +#define NM_CONFIG_DEFAULT_MAIN_DHCP "$config_dhcp_default" +_ACEOF + +NM_CONFIG_DEFAULT_MAIN_DHCP=$config_dhcp_default + # resolvconf and netconfig support @@ -24911,6 +24976,7 @@ fi if test "$config_dns_rc_manager_default" != symlink -a \ "$config_dns_rc_manager_default" != file -a \ + "$config_dns_rc_manager_default" != "" -a \ "$config_dns_rc_manager_default" != netconfig -a \ "$config_dns_rc_manager_default" != resolvconf; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&5 @@ -25075,10 +25141,10 @@ _ACEOF fi cat >>confdefs.h <<_ACEOF -#define NM_CONFIG_DEFAULT_DNS_RC_MANAGER "$config_dns_rc_manager_default" +#define NM_CONFIG_DEFAULT_MAIN_RC_MANAGER "$config_dns_rc_manager_default" _ACEOF -NM_CONFIG_DEFAULT_DNS_RC_MANAGER=$config_dns_rc_manager_default +NM_CONFIG_DEFAULT_MAIN_RC_MANAGER=$config_dns_rc_manager_default # iptables path @@ -25877,7 +25943,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS_MORE_WARNINGS="-Wall -std=gnu89" + CFLAGS_MORE_WARNINGS="-Wall -std=gnu99" if test "x$set_more_warnings" = xerror; then CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror" @@ -26657,6 +26723,8 @@ else fi +ac_config_commands="$ac_config_commands vapi" + # Tests, utilities and documentation # Check whether --enable-tests was given. @@ -26770,17 +26838,7 @@ else with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions' fi fi -if test "$with_valgrind" != "no"; then : - VALGRIND_RULES='LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions" - -fi - if test "${with_valgrind}" != "no"; then - WITH_VALGRIND_TRUE= - WITH_VALGRIND_FALSE='#' -else - WITH_VALGRIND_TRUE='#' - WITH_VALGRIND_FALSE= -fi +NM_LOG_COMPILER='LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" "'"$with_valgrind_suppressions"'" --launch-dbus=auto' @@ -27177,14 +27235,229 @@ else fi + + + + + + + # Find any Python interpreter. + if test -z "$PYTHON"; then + for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 +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_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$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 +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$PYTHON" && break +done +test -n "$PYTHON" || PYTHON=":" + + fi + am_display_PYTHON=python + + + if test "$PYTHON" = :; then + PYTHON=python + else + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +if ${am_cv_python_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +$as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version + + + + PYTHON_PREFIX='${prefix}' + + PYTHON_EXEC_PREFIX='${exec_prefix}' + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +if ${am_cv_python_platform+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +$as_echo "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + + + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# <https://github.com/pypa/virtualenv/issues/118> +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[:3] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +if ${am_cv_python_pythondir+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +$as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir + + + + pkgpythondir=\${pythondir}/$PACKAGE + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +if ${am_cv_python_pyexecdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +$as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + + + + pkgpyexecdir=\${pyexecdir}/$PACKAGE + + + + fi + + +PYTHON=$PYTHON + + +cat >>confdefs.h <<_ACEOF +#define TEST_NM_PYTHON "$PYTHON" +_ACEOF + + # check if we can build setting property documentation -if test -n "$INTROSPECTION_MAKEFILE" -a "$enable_gtk_doc" = "yes"; then +build_setting_docs=no +if test -n "$INTROSPECTION_MAKEFILE"; then # If g-i is installed we know we have python, but we might not have pygobject - if python -c 'from gi.repository import GObject' >& /dev/null; then - have_pyobject=yes + if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then + as_fn_error $? "\"--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)" "$LINENO" 5 fi - # gtk-doc depends on perl, but we can check for it anyway # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -27226,28 +27499,59 @@ $as_echo "no" >&6; } fi - # check for needed perl modules (use YAML; YAML::XS is better, but may not be so widespread) - required_perl_modules="YAML" - for module in $required_perl_modules; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking for perl module '$module'" >&5 -$as_echo_n "checking checking for perl module '$module'... " >&6; } - if ${PERL} -e 'use '$module 2>/dev/null ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ok" >&5 -$as_echo "Ok" >&6; } - have_perl_modules=yes - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Failed" >&5 -$as_echo "Failed" >&6; } - as_fn_error $? "You must have Perl modules to build settings plugin docs: $required_perl_modules." "$LINENO" 5 - fi - done + # Extract the first word of "xsltproc", so it can be a program name with args. +set dummy xsltproc; 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_XSLTPROC+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $XSLTPROC in + [\\/]* | ?:[\\/]*) + ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XSLTPROC="$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 "$have_pyobject" = "yes" -a "$have_perl_modules" = "yes"; then + test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no" + ;; +esac +fi +XSLTPROC=$ac_cv_path_XSLTPROC +if test -n "$XSLTPROC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +$as_echo "$XSLTPROC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -$as_echo "#define BUILD_SETTING_DOCS 1" >>confdefs.h + + have_introspection=yes + if test "$enable_gtk_doc" = "yes"; then build_setting_docs=yes fi +else + if test "$enable_gtk_doc" = "yes"; then + # large parts of the documentation require introspection/pygobject to extract + # the documentation out of the source files. You cannot enable gtk-doc without alone. + as_fn_error $? "\"--with-gtk-doc requires --enable-introspection\"" "$LINENO" 5 + fi + have_introspection=no fi # check for pre-built setting docs @@ -27255,11 +27559,7 @@ if test "$build_setting_docs" != "yes" \ -a -f man/nm-settings.xml \ -a -f man/nm-settings-keyfile.xml \ -a -f man/nm-settings-ifcfg-rh.xml \ - -a -f docs/api/settings-spec.xml \ - -a -f clients/cli/settings-docs.c; then - -$as_echo "#define HAVE_SETTING_DOCS 1" >>confdefs.h - + -a -f docs/api/settings-spec.xml; then have_setting_docs=yes fi @@ -27280,11 +27580,7 @@ else fi -ac_config_files="$ac_config_files Makefile shared/Makefile shared/nm-version-macros.h src/Makefile src/tests/Makefile src/tests/config/Makefile src/dhcp-manager/Makefile src/dhcp-manager/tests/Makefile src/dnsmasq-manager/tests/Makefile src/supplicant-manager/tests/Makefile src/supplicant-manager/tests/certs/Makefile src/ppp-manager/Makefile src/settings/plugins/Makefile src/settings/plugins/ifupdown/Makefile src/settings/plugins/ifupdown/tests/Makefile src/settings/plugins/ifnet/Makefile src/settings/plugins/ifnet/tests/Makefile src/settings/plugins/ifcfg-rh/Makefile src/settings/plugins/ifcfg-rh/tests/Makefile src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile src/settings/plugins/ibft/Makefile src/settings/plugins/ibft/tests/Makefile src/settings/plugins/keyfile/Makefile src/settings/plugins/keyfile/tests/Makefile src/settings/plugins/keyfile/tests/keyfiles/Makefile src/platform/Makefile src/platform/tests/Makefile src/rdisc/Makefile src/rdisc/tests/Makefile src/devices/Makefile src/devices/tests/Makefile src/devices/adsl/Makefile src/devices/bluetooth/Makefile src/devices/team/Makefile src/devices/wifi/Makefile src/devices/wifi/tests/Makefile src/devices/wwan/Makefile libnm-core/Makefile libnm-core/tests/Makefile libnm/libnm.pc libnm/Makefile libnm/tests/Makefile libnm-util/libnm-util.pc libnm-util/Makefile libnm-util/tests/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 clients/Makefile clients/cli/Makefile clients/tui/Makefile clients/tui/newt/Makefile introspection/Makefile man/Makefile man/common.ent 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 docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc examples/Makefile examples/shell/Makefile examples/python/Makefile examples/python/dbus/Makefile examples/python/gi/Makefile examples/python/python-networkmanager/Makefile examples/ruby/Makefile examples/lua/Makefile examples/lua/lgi/Makefile examples/C/Makefile examples/C/glib/Makefile examples/C/qt/Makefile examples/dispatcher/Makefile vapi/Makefile" - - - -subdirs="$subdirs libndp" +ac_config_files="$ac_config_files Makefile shared/nm-version-macros.h libnm/libnm.pc libnm-util/libnm-util.pc libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc man/common.ent po/Makefile.in data/org.freedesktop.NetworkManager.policy.in docs/api/Makefile docs/api/version.xml docs/libnm-glib/Makefile docs/libnm-glib/version.xml docs/libnm-util/Makefile docs/libnm-util/version.xml docs/libnm/Makefile docs/libnm/version.xml NetworkManager.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -27548,10 +27844,6 @@ if test -z "${REQUIRE_ROOT_TESTS_TRUE}" && test -z "${REQUIRE_ROOT_TESTS_FALSE}" as_fn_error $? "conditional \"REQUIRE_ROOT_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WITH_VALGRIND_TRUE}" && test -z "${WITH_VALGRIND_FALSE}"; then - as_fn_error $? "conditional \"WITH_VALGRIND\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -27985,7 +28277,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 1.4.4, which was +This file was extended by NetworkManager $as_me 1.5.90, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28051,7 +28343,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 1.4.4 +NetworkManager config.status 1.5.90 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -28572,70 +28864,16 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; + "vapi") CONFIG_COMMANDS="$CONFIG_COMMANDS vapi" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "shared/Makefile") CONFIG_FILES="$CONFIG_FILES shared/Makefile" ;; "shared/nm-version-macros.h") CONFIG_FILES="$CONFIG_FILES shared/nm-version-macros.h" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;; - "src/tests/config/Makefile") CONFIG_FILES="$CONFIG_FILES src/tests/config/Makefile" ;; - "src/dhcp-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/dhcp-manager/Makefile" ;; - "src/dhcp-manager/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/dhcp-manager/tests/Makefile" ;; - "src/dnsmasq-manager/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/dnsmasq-manager/tests/Makefile" ;; - "src/supplicant-manager/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/supplicant-manager/tests/Makefile" ;; - "src/supplicant-manager/tests/certs/Makefile") CONFIG_FILES="$CONFIG_FILES src/supplicant-manager/tests/certs/Makefile" ;; - "src/ppp-manager/Makefile") CONFIG_FILES="$CONFIG_FILES src/ppp-manager/Makefile" ;; - "src/settings/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/Makefile" ;; - "src/settings/plugins/ifupdown/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifupdown/Makefile" ;; - "src/settings/plugins/ifupdown/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifupdown/tests/Makefile" ;; - "src/settings/plugins/ifnet/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifnet/Makefile" ;; - "src/settings/plugins/ifnet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifnet/tests/Makefile" ;; - "src/settings/plugins/ifcfg-rh/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifcfg-rh/Makefile" ;; - "src/settings/plugins/ifcfg-rh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifcfg-rh/tests/Makefile" ;; - "src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile" ;; - "src/settings/plugins/ibft/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ibft/Makefile" ;; - "src/settings/plugins/ibft/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/ibft/tests/Makefile" ;; - "src/settings/plugins/keyfile/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/keyfile/Makefile" ;; - "src/settings/plugins/keyfile/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/keyfile/tests/Makefile" ;; - "src/settings/plugins/keyfile/tests/keyfiles/Makefile") CONFIG_FILES="$CONFIG_FILES src/settings/plugins/keyfile/tests/keyfiles/Makefile" ;; - "src/platform/Makefile") CONFIG_FILES="$CONFIG_FILES src/platform/Makefile" ;; - "src/platform/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/platform/tests/Makefile" ;; - "src/rdisc/Makefile") CONFIG_FILES="$CONFIG_FILES src/rdisc/Makefile" ;; - "src/rdisc/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/rdisc/tests/Makefile" ;; - "src/devices/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/Makefile" ;; - "src/devices/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/tests/Makefile" ;; - "src/devices/adsl/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/adsl/Makefile" ;; - "src/devices/bluetooth/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/bluetooth/Makefile" ;; - "src/devices/team/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/team/Makefile" ;; - "src/devices/wifi/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wifi/Makefile" ;; - "src/devices/wifi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wifi/tests/Makefile" ;; - "src/devices/wwan/Makefile") CONFIG_FILES="$CONFIG_FILES src/devices/wwan/Makefile" ;; - "libnm-core/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-core/Makefile" ;; - "libnm-core/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-core/tests/Makefile" ;; "libnm/libnm.pc") CONFIG_FILES="$CONFIG_FILES libnm/libnm.pc" ;; - "libnm/Makefile") CONFIG_FILES="$CONFIG_FILES libnm/Makefile" ;; - "libnm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libnm/tests/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" ;; "libnm-glib/libnm-glib.pc") CONFIG_FILES="$CONFIG_FILES libnm-glib/libnm-glib.pc" ;; "libnm-glib/libnm-glib-vpn.pc") CONFIG_FILES="$CONFIG_FILES libnm-glib/libnm-glib-vpn.pc" ;; - "libnm-glib/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-glib/Makefile" ;; - "libnm-glib/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libnm-glib/tests/Makefile" ;; - "callouts/Makefile") CONFIG_FILES="$CONFIG_FILES callouts/Makefile" ;; - "callouts/tests/Makefile") CONFIG_FILES="$CONFIG_FILES callouts/tests/Makefile" ;; - "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; - "clients/Makefile") CONFIG_FILES="$CONFIG_FILES clients/Makefile" ;; - "clients/cli/Makefile") CONFIG_FILES="$CONFIG_FILES clients/cli/Makefile" ;; - "clients/tui/Makefile") CONFIG_FILES="$CONFIG_FILES clients/tui/Makefile" ;; - "clients/tui/newt/Makefile") CONFIG_FILES="$CONFIG_FILES clients/tui/newt/Makefile" ;; - "introspection/Makefile") CONFIG_FILES="$CONFIG_FILES introspection/Makefile" ;; - "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "man/common.ent") CONFIG_FILES="$CONFIG_FILES man/common.ent" ;; "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" ;; + "data/org.freedesktop.NetworkManager.policy.in") CONFIG_FILES="$CONFIG_FILES data/org.freedesktop.NetworkManager.policy.in" ;; "docs/api/Makefile") CONFIG_FILES="$CONFIG_FILES docs/api/Makefile" ;; "docs/api/version.xml") CONFIG_FILES="$CONFIG_FILES docs/api/version.xml" ;; "docs/libnm-glib/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm-glib/Makefile" ;; @@ -28645,20 +28883,6 @@ do "docs/libnm/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libnm/Makefile" ;; "docs/libnm/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libnm/version.xml" ;; "NetworkManager.pc") CONFIG_FILES="$CONFIG_FILES NetworkManager.pc" ;; - "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; - "examples/shell/Makefile") CONFIG_FILES="$CONFIG_FILES examples/shell/Makefile" ;; - "examples/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/Makefile" ;; - "examples/python/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/dbus/Makefile" ;; - "examples/python/gi/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/gi/Makefile" ;; - "examples/python/python-networkmanager/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/python-networkmanager/Makefile" ;; - "examples/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES examples/ruby/Makefile" ;; - "examples/lua/Makefile") CONFIG_FILES="$CONFIG_FILES examples/lua/Makefile" ;; - "examples/lua/lgi/Makefile") CONFIG_FILES="$CONFIG_FILES examples/lua/lgi/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" ;; - "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" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -30171,6 +30395,7 @@ _LT_EOF ;; esac done ;; + "vapi":C) $MKDIR_P vapi ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 @@ -30224,151 +30449,6 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || as_fn_exit 1 fi - -# -# CONFIG_SUBDIRS section. -# -if test "$no_recursion" != yes; then - - # Remove --cache-file, --srcdir, and --disable-option-checking arguments - # so they do not pile up. - ac_sub_configure_args= - ac_prev= - eval "set x $ac_configure_args" - shift - for ac_arg - do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case $ac_arg in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ - | --c=*) - ;; - --config-cache | -C) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - ;; - --disable-option-checking) - ;; - *) - case $ac_arg in - *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_sub_configure_args " '$ac_arg'" ;; - esac - done - - # Always prepend --prefix to ensure using the same prefix - # in subdir configurations. - ac_arg="--prefix=$prefix" - case $ac_arg in - *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" - - # Pass --silent - if test "$silent" = yes; then - ac_sub_configure_args="--silent $ac_sub_configure_args" - fi - - # Always prepend --disable-option-checking to silence warnings, since - # different subdirs can have different --enable and --with options. - ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args" - - ac_popdir=`pwd` - for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - test -d "$srcdir/$ac_dir" || continue - - ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" - $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 - $as_echo "$ac_msg" >&6 - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - cd "$ac_dir" - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f "$ac_srcdir/configure.gnu"; then - ac_sub_configure=$ac_srcdir/configure.gnu - elif test -f "$ac_srcdir/configure"; then - ac_sub_configure=$ac_srcdir/configure - elif test -f "$ac_srcdir/configure.in"; then - # This should be Cygnus configure. - ac_sub_configure=$ac_aux_dir/configure - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 -$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} - ac_sub_configure= - fi - - # The recursion is here. - if test -n "$ac_sub_configure"; then - # Make the cache file name correct relative to the subdirectory. - case $cache_file in - [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; - *) # Relative name. - ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} - # The eval makes quoting arguments work. - eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ - --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || - as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 - fi - - cd "$ac_popdir" - done -fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} @@ -30434,13 +30514,16 @@ echo " netconfig: ${with_netconfig}" echo " config-dns-rc-manager-default: ${config_dns_rc_manager_default}" echo -echo "DHCP clients:" +echo "DHCP clients (default $config_dhcp_default):" echo " dhclient: $with_dhclient" echo " dhcpcd: $with_dhcpcd" +echo " dhcpcd-supports-ipv6: $with_dhcpcd_supports_ipv6" echo echo "Miscellaneous:" echo " documentation: $enable_gtk_doc" +echo " documentation-settings: $build_setting_docs" +echo " introspection: $have_introspection" echo " tests: $enable_tests" echo " more-asserts: $more_asserts" echo " valgrind: $with_valgrind $with_valgrind_suppressions" |