diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 188 |
1 files changed, 55 insertions, 133 deletions
diff --git a/configure b/configure index ce3a3ab9..b9515c99 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.13.90. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.14.0. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.13.90' -PACKAGE_STRING='NetworkManager 1.13.90' +PACKAGE_VERSION='1.14.0' +PACKAGE_STRING='NetworkManager 1.14.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -705,20 +705,17 @@ LIBPSL_LIBS LIBPSL_CFLAGS KERNEL_FIRMWARE_DIR SYSTEM_CA_PATH -DNSSEC_TRIGGER_SCRIPT +DNSSEC_TRIGGER_PATH DNSMASQ_PATH IPTABLES_PATH NM_CONFIG_DEFAULT_MAIN_RC_MANAGER with_netconfig with_resolvconf NM_CONFIG_DEFAULT_MAIN_DHCP -DHCPCD_PATH with_dhcpcd -DHCLIENT_PATH with_dhclient WITH_OPENVSWITCH_FALSE WITH_OPENVSWITCH_TRUE -DHCPCANON_PATH with_dhcpcanon WITH_OFONO_FALSE WITH_OFONO_TRUE @@ -1091,7 +1088,6 @@ with_dhcpcanon enable_ovs with_dhclient with_dhcpcd -with_dhcpcd_supports_ipv6 with_config_dhcp_default with_resolvconf with_netconfig @@ -1731,7 +1727,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.13.90 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.14.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1801,7 +1797,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.13.90:";; + short | recursive ) echo "Configuration of NetworkManager 1.14.0:";; esac cat <<\_ACEOF @@ -1932,11 +1928,9 @@ Optional Packages: --with-dhcpcanon=yes|no|path Enable dhcpcanon support (experimental) --with-dhclient=yes|no|path - Enable dhclient 4.x support + Enable dhclient 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 @@ -2142,7 +2136,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.13.90 +NetworkManager configure 1.14.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2915,7 +2909,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.13.90, which was +It was created by NetworkManager $as_me 1.14.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3785,7 +3779,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.13.90' + VERSION='1.14.0' cat >>confdefs.h <<_ACEOF @@ -17968,9 +17962,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 -NM_MINOR_VERSION=13 -NM_MICRO_VERSION=90 -NM_VERSION=1.13.90 +NM_MINOR_VERSION=14 +NM_MICRO_VERSION=0 +NM_VERSION=1.14.0 @@ -17978,7 +17972,7 @@ NM_VERSION=1.13.90 -NM_GIT_SHA=16ad82f967cdef4a1bbea8d799c6a28fb1c2f09e +NM_GIT_SHA=2979c891c4af7584780924e92b6d448b7d6cd328 if test """" != "no-config-h" ; then @@ -24259,13 +24253,6 @@ if (test "${enable_teamdctl}" = "yes"); then fi # temporary bug workaround LIBTEAMDCTL_CFLAGS=`echo $LIBTEAMDCTL_CFLAGS | sed -e 's:/teamdctl.h::'` - -$as_echo "#define WITH_TEAMDCTL 1" >>confdefs.h - -else - -$as_echo "#define WITH_TEAMDCTL 0" >>confdefs.h - fi if test "${enable_teamdctl}" = "yes"; then WITH_TEAMDCTL_TRUE= @@ -24607,24 +24594,6 @@ else HAVE_CRYPTO_NSS_FALSE= fi -if test "${have_crypto_gnutls}" = 'yes'; then - -$as_echo "#define HAVE_CRYPTO_GNUTLS 1" >>confdefs.h - -else - -$as_echo "#define HAVE_CRYPTO_GNUTLS 0" >>confdefs.h - -fi -if test "${have_crypto_nss}" = 'yes'; then - -$as_echo "#define HAVE_CRYPTO_NSS 1" >>confdefs.h - -else - -$as_echo "#define HAVE_CRYPTO_NSS 0" >>confdefs.h - -fi # Check whether --with-crypto was given. @@ -24886,16 +24855,6 @@ fi 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='#' @@ -25100,7 +25059,10 @@ if test "$with_dhcpcanon" != "no"; then $as_echo "#define WITH_DHCPCANON 1" >>confdefs.h - DHCPCANON_PATH=$with_dhcpcanon + +cat >>confdefs.h <<_ACEOF +#define DHCPCANON_PATH "$with_dhcpcanon" +_ACEOF else @@ -25119,13 +25081,6 @@ if test "${enable_ovs}" != "no"; then if test "$have_jansson" = "no"; then as_fn_error $? "Jansson is required for ovs support" "$LINENO" 5 fi - -$as_echo "#define WITH_OPENVSWITCH 1" >>confdefs.h - -else - -$as_echo "#define WITH_OPENVSWITCH 0" >>confdefs.h - fi if test "${enable_ovs}" = "yes"; then WITH_OPENVSWITCH_TRUE= @@ -25198,18 +25153,16 @@ test -n "$with_dhclient" || with_dhclient="no" $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: 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_dhclient" != "no"; then $as_echo "#define WITH_DHCLIENT 1" >>confdefs.h - DHCLIENT_PATH=$with_dhclient + +cat >>confdefs.h <<_ACEOF +#define DHCLIENT_PATH "$with_dhclient" +_ACEOF else @@ -25223,14 +25176,6 @@ 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 @@ -25285,46 +25230,17 @@ test -n "$with_dhcpcd" || with_dhcpcd="no" { $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: 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 -else - with_dhcpcd_supports_ipv6=no fi if test "$with_dhcpcd" != "no"; then $as_echo "#define WITH_DHCPCD 1" >>confdefs.h - DHCPCD_PATH=$with_dhcpcd + +cat >>confdefs.h <<_ACEOF +#define DHCPCD_PATH "$with_dhcpcd" +_ACEOF else @@ -25355,7 +25271,6 @@ _ACEOF NM_CONFIG_DEFAULT_MAIN_DHCP=$config_dhcp_default -# resolvconf and netconfig support # Check whether --with-resolvconf was given. if test "${with_resolvconf+set}" = set; then : @@ -25374,9 +25289,9 @@ if test "${with_config_dns_rc_manager_default+set}" = set; then : withval=$with_config_dns_rc_manager_default; config_dns_rc_manager_default=$withval fi -if test "$config_dns_rc_manager_default" != symlink -a \ +if test "$config_dns_rc_manager_default" != "" -a \ "$config_dns_rc_manager_default" != file -a \ - "$config_dns_rc_manager_default" != "" -a \ + "$config_dns_rc_manager_default" != symlink -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 @@ -25394,7 +25309,7 @@ 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 @@ -25441,14 +25356,18 @@ fi test -n "$with_resolvconf" && break done -test -n "$with_resolvconf" || with_resolvconf="no" +test -n "$with_resolvconf" || with_resolvconf="'yes'" + if test "$with_resolvconf" = "yes"; then + as_fn_error $? "cannot find resolvconf in path. Set the path explicitly via --with-resolvconf=PATH." "$LINENO" 5 + fi fi if test "$with_resolvconf" != "no"; then if test -z "$config_dns_rc_manager_default"; then : config_dns_rc_manager_default=resolvconf fi fi + if test "$with_netconfig" = "yes"; then for ac_prog in netconfig do @@ -25495,18 +25414,22 @@ fi test -n "$with_netconfig" && break done -test -n "$with_netconfig" || with_netconfig="no" +test -n "$with_netconfig" || with_netconfig="yes" + if test "$with_netconfig" = "yes"; then + as_fn_error $? "cannot find netconfig in path. Set the path explicitly via --with-netconfig=PATH." "$LINENO" 5 + fi fi if test "$with_netconfig" != "no"; then if test -z "$config_dns_rc_manager_default"; then : config_dns_rc_manager_default=netconfig fi fi + if test -z "$config_dns_rc_manager_default"; then : config_dns_rc_manager_default=symlink fi -# Define resolvconf and netconfig paths + if test "$with_resolvconf" != "no"; then cat >>confdefs.h <<_ACEOF @@ -25662,12 +25585,12 @@ if test "x${with_dnssec_trigger}" = x; then set dummy dnssec-trigger-script; 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_DNSSEC_TRIGGER_SCRIPT+:} false; then : +if ${ac_cv_path_DNSSEC_TRIGGER_PATH+:} false; then : $as_echo_n "(cached) " >&6 else - case $DNSSEC_TRIGGER_SCRIPT in + case $DNSSEC_TRIGGER_PATH in [\\/]* | ?:[\\/]*) - ac_cv_path_DNSSEC_TRIGGER_SCRIPT="$DNSSEC_TRIGGER_SCRIPT" # Let the user override the test with a path. + ac_cv_path_DNSSEC_TRIGGER_PATH="$DNSSEC_TRIGGER_PATH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -25678,7 +25601,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_DNSSEC_TRIGGER_SCRIPT="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_DNSSEC_TRIGGER_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -25686,14 +25609,14 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_DNSSEC_TRIGGER_SCRIPT" && ac_cv_path_DNSSEC_TRIGGER_SCRIPT="/usr/libexec/dnssec-trigger-script" + test -z "$ac_cv_path_DNSSEC_TRIGGER_PATH" && ac_cv_path_DNSSEC_TRIGGER_PATH="/usr/libexec/dnssec-trigger-script" ;; esac fi -DNSSEC_TRIGGER_SCRIPT=$ac_cv_path_DNSSEC_TRIGGER_SCRIPT -if test -n "$DNSSEC_TRIGGER_SCRIPT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DNSSEC_TRIGGER_SCRIPT" >&5 -$as_echo "$DNSSEC_TRIGGER_SCRIPT" >&6; } +DNSSEC_TRIGGER_PATH=$ac_cv_path_DNSSEC_TRIGGER_PATH +if test -n "$DNSSEC_TRIGGER_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DNSSEC_TRIGGER_PATH" >&5 +$as_echo "$DNSSEC_TRIGGER_PATH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -25701,11 +25624,11 @@ fi else - DNSSEC_TRIGGER_SCRIPT="$with_dnssec_trigger" + DNSSEC_TRIGGER_PATH="$with_dnssec_trigger" fi cat >>confdefs.h <<_ACEOF -#define DNSSEC_TRIGGER_SCRIPT "$DNSSEC_TRIGGER_SCRIPT" +#define DNSSEC_TRIGGER_PATH "$DNSSEC_TRIGGER_PATH" _ACEOF @@ -28248,7 +28171,7 @@ 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 + as_fn_error $? "\"--enable-gtk-doc requires --enable-introspection\"" "$LINENO" 5 fi have_introspection=no fi @@ -29006,7 +28929,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.13.90, which was +This file was extended by NetworkManager $as_me 1.14.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29072,7 +28995,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.13.90 +NetworkManager config.status 1.14.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -31219,7 +31142,7 @@ echo echo "Features:" echo " wext: $ac_with_wext" echo " wifi: $enable_wifi" -echo " ppp: $enable_ppp ${PPPD_PLUGIN_DIR}" +echo " ppp: $enable_ppp ${PPPD_PATH} plugins:${PPPD_PLUGIN_DIR}" echo " modemmanager-1: $with_modem_manager_1" echo " ofono: $with_ofono" echo " concheck: $enable_concheck" @@ -31247,7 +31170,6 @@ echo "DHCP clients (default $config_dhcp_default):" echo " dhcpcanon: $with_dhcpcanon" echo " dhclient: $with_dhclient" echo " dhcpcd: $with_dhcpcd" -echo " dhcpcd-supports-ipv6: $with_dhcpcd_supports_ipv6" echo echo "Miscellaneous:" |