From 6accbd3ec0e42d8633bbde4d47ed7bfe854e7e0b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 12 Aug 2022 19:21:11 +0200 Subject: New upstream version 1.38.4 --- Makefile.am | 4 + Makefile.in | 45 +- NEWS | 10 + aclocal.m4 | 345 +- build-aux/compile | 2 +- build-aux/config.guess | 1458 +- build-aux/config.sub | 710 +- build-aux/depcomp | 2 +- build-aux/install-sh | 148 +- build-aux/ltmain.sh | 855 +- build-aux/missing | 2 +- build-aux/tap-driver.sh | 4 +- build-aux/test-driver | 19 +- config.h.in | 100 +- configure | 13269 +++++++++++-------- configure.ac | 2 +- docs/api/Makefile.in | 10 +- ...-org.freedesktop.NetworkManager.AccessPoint.xml | 56 +- ...org.freedesktop.NetworkManager.AgentManager.xml | 31 +- ...reedesktop.NetworkManager.Connection.Active.xml | 126 +- ...-org.freedesktop.NetworkManager.DHCP4Config.xml | 6 +- ...-org.freedesktop.NetworkManager.DHCP6Config.xml | 6 +- ...-org.freedesktop.NetworkManager.Device.Adsl.xml | 12 +- ...freedesktop.NetworkManager.Device.Bluetooth.xml | 19 +- ...-org.freedesktop.NetworkManager.Device.Bond.xml | 26 +- ...rg.freedesktop.NetworkManager.Device.Bridge.xml | 26 +- ...org.freedesktop.NetworkManager.Device.Dummy.xml | 9 +- ...g.freedesktop.NetworkManager.Device.Generic.xml | 12 +- ....freedesktop.NetworkManager.Device.IPTunnel.xml | 48 +- ...reedesktop.NetworkManager.Device.Infiniband.xml | 19 +- ...rg.freedesktop.NetworkManager.Device.Macsec.xml | 55 +- ...g.freedesktop.NetworkManager.Device.Macvlan.xml | 16 +- ...org.freedesktop.NetworkManager.Device.Modem.xml | 39 +- ....freedesktop.NetworkManager.Device.OlpcMesh.xml | 16 +- ...reedesktop.NetworkManager.Device.Statistics.xml | 19 +- ...-org.freedesktop.NetworkManager.Device.Team.xml | 29 +- ...s-org.freedesktop.NetworkManager.Device.Tun.xml | 33 +- ...-org.freedesktop.NetworkManager.Device.Veth.xml | 7 +- ...-org.freedesktop.NetworkManager.Device.Vlan.xml | 25 +- ...org.freedesktop.NetworkManager.Device.Vxlan.xml | 71 +- ...g.freedesktop.NetworkManager.Device.WifiP2P.xml | 55 +- ...freedesktop.NetworkManager.Device.WireGuard.xml | 15 +- ...org.freedesktop.NetworkManager.Device.Wired.xml | 29 +- ....freedesktop.NetworkManager.Device.Wireless.xml | 84 +- .../dbus-org.freedesktop.NetworkManager.Device.xml | 361 +- ...s-org.freedesktop.NetworkManager.DnsManager.xml | 24 +- ...us-org.freedesktop.NetworkManager.IP4Config.xml | 69 +- ...us-org.freedesktop.NetworkManager.IP6Config.xml | 46 +- .../dbus-org.freedesktop.NetworkManager.PPP.xml | 48 +- ...-org.freedesktop.NetworkManager.SecretAgent.xml | 95 +- ...edesktop.NetworkManager.Settings.Connection.xml | 249 +- ...bus-org.freedesktop.NetworkManager.Settings.xml | 251 +- ...g.freedesktop.NetworkManager.VPN.Connection.xml | 23 +- ...s-org.freedesktop.NetworkManager.VPN.Plugin.xml | 145 +- docs/api/dbus-org.freedesktop.NetworkManager.xml | 553 +- docs/api/html/NetworkManager-dispatcher.html | 4 +- .../html/NetworkManager-wait-online.service.html | 4 +- docs/api/html/NetworkManager.conf.html | 4 +- docs/api/html/NetworkManager.html | 4 +- docs/api/html/ch01.html | 4 +- docs/api/html/dbus-secret-agent.html | 4 +- docs/api/html/dbus-types.html | 4 +- docs/api/html/dbus-vpn-plugin.html | 4 +- docs/api/html/dbus-vpn-types.html | 4 +- ...org.freedesktop.NetworkManager.AccessPoint.html | 61 +- ...rg.freedesktop.NetworkManager.AgentManager.html | 36 +- ...-org.freedesktop.NetworkManager.Checkpoint.html | 18 +- ...eedesktop.NetworkManager.Connection.Active.html | 130 +- ...org.freedesktop.NetworkManager.DHCP4Config.html | 10 +- ...org.freedesktop.NetworkManager.DHCP6Config.html | 10 +- ...org.freedesktop.NetworkManager.Device.Adsl.html | 17 +- ...reedesktop.NetworkManager.Device.Bluetooth.html | 24 +- ...org.freedesktop.NetworkManager.Device.Bond.html | 31 +- ...g.freedesktop.NetworkManager.Device.Bridge.html | 31 +- ...rg.freedesktop.NetworkManager.Device.Dummy.html | 14 +- ....freedesktop.NetworkManager.Device.Generic.html | 17 +- ...freedesktop.NetworkManager.Device.IPTunnel.html | 53 +- ...eedesktop.NetworkManager.Device.Infiniband.html | 24 +- ...g.freedesktop.NetworkManager.Device.Lowpan.html | 18 +- ...g.freedesktop.NetworkManager.Device.Macsec.html | 60 +- ....freedesktop.NetworkManager.Device.Macvlan.html | 21 +- ...rg.freedesktop.NetworkManager.Device.Modem.html | 44 +- ...freedesktop.NetworkManager.Device.OlpcMesh.html | 21 +- ...reedesktop.NetworkManager.Device.OvsBridge.html | 16 +- ...desktop.NetworkManager.Device.OvsInterface.html | 9 +- ....freedesktop.NetworkManager.Device.OvsPort.html | 16 +- ...-org.freedesktop.NetworkManager.Device.Ppp.html | 9 +- ...eedesktop.NetworkManager.Device.Statistics.html | 24 +- ...org.freedesktop.NetworkManager.Device.Team.html | 34 +- ...-org.freedesktop.NetworkManager.Device.Tun.html | 38 +- ...org.freedesktop.NetworkManager.Device.Veth.html | 12 +- ...org.freedesktop.NetworkManager.Device.Vlan.html | 30 +- ...-org.freedesktop.NetworkManager.Device.Vrf.html | 12 +- ...rg.freedesktop.NetworkManager.Device.Vxlan.html | 76 +- ....freedesktop.NetworkManager.Device.WifiP2P.html | 48 +- ...reedesktop.NetworkManager.Device.WireGuard.html | 20 +- ...rg.freedesktop.NetworkManager.Device.Wired.html | 34 +- ...freedesktop.NetworkManager.Device.Wireless.html | 89 +- ...org.freedesktop.NetworkManager.Device.Wpan.html | 15 +- ...dbus-org.freedesktop.NetworkManager.Device.html | 367 +- ...-org.freedesktop.NetworkManager.DnsManager.html | 28 +- ...s-org.freedesktop.NetworkManager.IP4Config.html | 74 +- ...s-org.freedesktop.NetworkManager.IP6Config.html | 51 +- .../gdbus-org.freedesktop.NetworkManager.PPP.html | 76 +- ...org.freedesktop.NetworkManager.SecretAgent.html | 99 +- ...desktop.NetworkManager.Settings.Connection.html | 185 +- ...us-org.freedesktop.NetworkManager.Settings.html | 217 +- ....freedesktop.NetworkManager.VPN.Connection.html | 27 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 149 +- ...org.freedesktop.NetworkManager.WifiP2PPeer.html | 46 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 554 +- docs/api/html/index.html | 6 +- docs/api/html/ix01.html | 4 +- docs/api/html/license.html | 4 +- docs/api/html/manpages.html | 4 +- docs/api/html/nm-cloud-setup.html | 4 +- docs/api/html/nm-dbus-types.html | 6 +- docs/api/html/nm-initrd-generator.html | 4 +- docs/api/html/nm-online.html | 4 +- docs/api/html/nm-openvswitch.html | 4 +- docs/api/html/nm-settings-dbus.html | 4 +- docs/api/html/nm-settings-ifcfg-rh.html | 4 +- docs/api/html/nm-settings-keyfile.html | 4 +- docs/api/html/nm-settings-nmcli.html | 4 +- docs/api/html/nm-vpn-dbus-types.html | 4 +- docs/api/html/nmcli-examples.html | 4 +- docs/api/html/nmcli.html | 4 +- docs/api/html/nmtui.html | 4 +- docs/api/html/ref-dbus-access-points.html | 4 +- docs/api/html/ref-dbus-active-connections.html | 4 +- docs/api/html/ref-dbus-agent-manager.html | 4 +- docs/api/html/ref-dbus-checkpoint.html | 4 +- docs/api/html/ref-dbus-devices.html | 4 +- docs/api/html/ref-dbus-dhcp4-configs.html | 4 +- docs/api/html/ref-dbus-dhcp6-configs.html | 4 +- docs/api/html/ref-dbus-dns-manager.html | 4 +- docs/api/html/ref-dbus-ip4-configs.html | 4 +- docs/api/html/ref-dbus-ip6-configs.html | 4 +- docs/api/html/ref-dbus-manager.html | 4 +- docs/api/html/ref-dbus-settings-manager.html | 4 +- docs/api/html/ref-dbus-settings.html | 4 +- docs/api/html/ref-dbus-wifi-p2p-peers.html | 4 +- docs/api/html/ref-settings.html | 4 +- docs/api/html/secret-agents.html | 4 +- docs/api/html/secrets-flags.html | 4 +- docs/api/html/settings-6lowpan.html | 4 +- docs/api/html/settings-802-11-olpc-mesh.html | 4 +- .../html/settings-802-11-wireless-security.html | 4 +- docs/api/html/settings-802-11-wireless.html | 4 +- docs/api/html/settings-802-1x.html | 4 +- docs/api/html/settings-802-3-ethernet.html | 4 +- docs/api/html/settings-adsl.html | 4 +- docs/api/html/settings-bluetooth.html | 4 +- docs/api/html/settings-bond-port.html | 4 +- docs/api/html/settings-bond.html | 4 +- docs/api/html/settings-bridge-port.html | 4 +- docs/api/html/settings-bridge.html | 4 +- docs/api/html/settings-cdma.html | 4 +- docs/api/html/settings-connection.html | 4 +- docs/api/html/settings-dcb.html | 4 +- docs/api/html/settings-dummy.html | 4 +- docs/api/html/settings-ethtool.html | 4 +- docs/api/html/settings-generic.html | 4 +- docs/api/html/settings-gsm.html | 4 +- docs/api/html/settings-hostname.html | 4 +- docs/api/html/settings-infiniband.html | 4 +- docs/api/html/settings-ip-tunnel.html | 4 +- docs/api/html/settings-ipv4.html | 4 +- docs/api/html/settings-ipv6.html | 4 +- docs/api/html/settings-macsec.html | 4 +- docs/api/html/settings-macvlan.html | 4 +- docs/api/html/settings-match.html | 4 +- docs/api/html/settings-ovs-bridge.html | 4 +- docs/api/html/settings-ovs-dpdk.html | 4 +- docs/api/html/settings-ovs-external-ids.html | 4 +- docs/api/html/settings-ovs-interface.html | 4 +- docs/api/html/settings-ovs-patch.html | 4 +- docs/api/html/settings-ovs-port.html | 4 +- docs/api/html/settings-ppp.html | 4 +- docs/api/html/settings-pppoe.html | 4 +- docs/api/html/settings-proxy.html | 4 +- docs/api/html/settings-serial.html | 4 +- docs/api/html/settings-sriov.html | 4 +- docs/api/html/settings-tc.html | 4 +- docs/api/html/settings-team-port.html | 4 +- docs/api/html/settings-team.html | 4 +- docs/api/html/settings-tun.html | 4 +- docs/api/html/settings-user.html | 4 +- docs/api/html/settings-veth.html | 4 +- docs/api/html/settings-vlan.html | 4 +- docs/api/html/settings-vpn.html | 4 +- docs/api/html/settings-vrf.html | 4 +- docs/api/html/settings-vxlan.html | 4 +- docs/api/html/settings-wifi-p2p.html | 4 +- docs/api/html/settings-wimax.html | 4 +- docs/api/html/settings-wireguard.html | 4 +- docs/api/html/settings-wpan.html | 4 +- docs/api/html/spec.html | 4 +- docs/api/html/style.css | 34 +- docs/api/html/vpn-plugins.html | 4 +- docs/api/version.xml | 2 +- docs/libnm/Makefile.in | 10 +- docs/libnm/html/NMAccessPoint.html | 12 +- docs/libnm/html/NMActiveConnection.html | 16 +- docs/libnm/html/NMCheckpoint.html | 4 +- docs/libnm/html/NMClient.html | 84 +- docs/libnm/html/NMConnection.html | 98 +- docs/libnm/html/NMDevice.html | 42 +- docs/libnm/html/NMDevice6Lowpan.html | 6 +- docs/libnm/html/NMDeviceAdsl.html | 4 +- docs/libnm/html/NMDeviceBond.html | 4 +- docs/libnm/html/NMDeviceBridge.html | 4 +- docs/libnm/html/NMDeviceBt.html | 4 +- docs/libnm/html/NMDeviceDummy.html | 4 +- docs/libnm/html/NMDeviceEthernet.html | 6 +- docs/libnm/html/NMDeviceGeneric.html | 4 +- docs/libnm/html/NMDeviceIPTunnel.html | 6 +- docs/libnm/html/NMDeviceInfiniband.html | 4 +- docs/libnm/html/NMDeviceMacsec.html | 6 +- docs/libnm/html/NMDeviceMacvlan.html | 6 +- docs/libnm/html/NMDeviceModem.html | 4 +- docs/libnm/html/NMDeviceOlpcMesh.html | 6 +- docs/libnm/html/NMDeviceOvsBridge.html | 4 +- docs/libnm/html/NMDeviceOvsInterface.html | 4 +- docs/libnm/html/NMDeviceOvsPort.html | 4 +- docs/libnm/html/NMDevicePpp.html | 4 +- docs/libnm/html/NMDeviceTeam.html | 4 +- docs/libnm/html/NMDeviceTun.html | 4 +- docs/libnm/html/NMDeviceVeth.html | 6 +- docs/libnm/html/NMDeviceVlan.html | 6 +- docs/libnm/html/NMDeviceVrf.html | 4 +- docs/libnm/html/NMDeviceVxlan.html | 6 +- docs/libnm/html/NMDeviceWifi.html | 10 +- docs/libnm/html/NMDeviceWifiP2P.html | 8 +- docs/libnm/html/NMDeviceWimax.html | 10 +- docs/libnm/html/NMDeviceWireGuard.html | 6 +- docs/libnm/html/NMDeviceWpan.html | 4 +- docs/libnm/html/NMDhcpConfig.html | 6 +- docs/libnm/html/NMIPConfig.html | 18 +- docs/libnm/html/NMObject.html | 6 +- docs/libnm/html/NMRemoteConnection.html | 10 +- docs/libnm/html/NMSecretAgentOld.html | 42 +- docs/libnm/html/NMSetting.html | 12 +- docs/libnm/html/NMSetting6Lowpan.html | 6 +- docs/libnm/html/NMSetting8021x.html | 100 +- docs/libnm/html/NMSettingAdsl.html | 18 +- docs/libnm/html/NMSettingBluetooth.html | 6 +- docs/libnm/html/NMSettingBond.html | 14 +- docs/libnm/html/NMSettingBondPort.html | 6 +- docs/libnm/html/NMSettingBridge.html | 26 +- docs/libnm/html/NMSettingBridgePort.html | 14 +- docs/libnm/html/NMSettingCdma.html | 12 +- docs/libnm/html/NMSettingConnection.html | 36 +- docs/libnm/html/NMSettingDcb.html | 44 +- docs/libnm/html/NMSettingDummy.html | 6 +- docs/libnm/html/NMSettingEthtool.html | 8 +- docs/libnm/html/NMSettingGeneric.html | 8 +- docs/libnm/html/NMSettingGsm.html | 22 +- docs/libnm/html/NMSettingHostname.html | 6 +- docs/libnm/html/NMSettingIP4Config.html | 8 +- docs/libnm/html/NMSettingIP6Config.html | 8 +- docs/libnm/html/NMSettingIPConfig.html | 54 +- docs/libnm/html/NMSettingIPTunnel.html | 6 +- docs/libnm/html/NMSettingInfiniband.html | 14 +- docs/libnm/html/NMSettingMacsec.html | 6 +- docs/libnm/html/NMSettingMacvlan.html | 6 +- docs/libnm/html/NMSettingMatch.html | 14 +- docs/libnm/html/NMSettingOlpcMesh.html | 6 +- docs/libnm/html/NMSettingOvsBridge.html | 6 +- docs/libnm/html/NMSettingOvsDpdk.html | 6 +- docs/libnm/html/NMSettingOvsExternalIDs.html | 10 +- docs/libnm/html/NMSettingOvsInterface.html | 6 +- docs/libnm/html/NMSettingOvsPatch.html | 6 +- docs/libnm/html/NMSettingOvsPort.html | 6 +- docs/libnm/html/NMSettingPpp.html | 6 +- docs/libnm/html/NMSettingPppoe.html | 6 +- docs/libnm/html/NMSettingProxy.html | 4 +- docs/libnm/html/NMSettingSerial.html | 16 +- docs/libnm/html/NMSettingSriov.html | 20 +- docs/libnm/html/NMSettingTCConfig.html | 34 +- docs/libnm/html/NMSettingTeam.html | 20 +- docs/libnm/html/NMSettingTeamPort.html | 10 +- docs/libnm/html/NMSettingTun.html | 6 +- docs/libnm/html/NMSettingUser.html | 8 +- docs/libnm/html/NMSettingVeth.html | 6 +- docs/libnm/html/NMSettingVlan.html | 40 +- docs/libnm/html/NMSettingVpn.html | 10 +- docs/libnm/html/NMSettingVrf.html | 6 +- docs/libnm/html/NMSettingVxlan.html | 6 +- docs/libnm/html/NMSettingWifiP2P.html | 8 +- docs/libnm/html/NMSettingWimax.html | 4 +- docs/libnm/html/NMSettingWireGuard.html | 28 +- docs/libnm/html/NMSettingWired.html | 32 +- docs/libnm/html/NMSettingWireless.html | 36 +- docs/libnm/html/NMSettingWirelessSecurity.html | 26 +- docs/libnm/html/NMSettingWpan.html | 6 +- docs/libnm/html/NMSimpleConnection.html | 10 +- docs/libnm/html/NMVpnConnection.html | 4 +- docs/libnm/html/NMVpnEditor.html | 6 +- docs/libnm/html/NMVpnEditorPlugin.html | 14 +- docs/libnm/html/NMVpnPluginInfo.html | 36 +- docs/libnm/html/NMVpnPluginOld.html | 10 +- docs/libnm/html/NMVpnServicePlugin.html | 10 +- docs/libnm/html/NMWifiP2PPeer.html | 12 +- docs/libnm/html/NMWimaxNsp.html | 10 +- docs/libnm/html/annotation-glossary.html | 14 +- docs/libnm/html/api-index-full.html | 1030 +- docs/libnm/html/ch02.html | 4 +- docs/libnm/html/ch03.html | 4 +- docs/libnm/html/ch04.html | 4 +- docs/libnm/html/ch05.html | 4 +- docs/libnm/html/ch06.html | 4 +- docs/libnm/html/index.html | 6 +- docs/libnm/html/libnm-nm-dbus-interface.html | 4 +- docs/libnm/html/libnm-nm-errors.html | 10 +- docs/libnm/html/libnm-nm-keyfile.html | 20 +- docs/libnm/html/libnm-nm-utils.html | 64 +- docs/libnm/html/libnm-nm-version.html | 4 +- docs/libnm/html/license.html | 4 +- docs/libnm/html/object-tree.html | 4 +- docs/libnm/html/ref-overview.html | 4 +- docs/libnm/html/style.css | 34 +- docs/libnm/html/usage.html | 42 +- docs/libnm/version.xml | 2 +- gtk-doc.make | 1 + m4/libtool.m4 | 227 +- m4/ltoptions.m4 | 4 +- m4/ltsugar.m4 | 2 +- m4/ltversion.m4 | 13 +- m4/lt~obsolete.m4 | 4 +- man/NetworkManager-dispatcher.8 | 4 +- man/NetworkManager-wait-online.service.8 | 4 +- man/NetworkManager.8 | 6 +- man/NetworkManager.conf.5 | 6 +- man/nm-cloud-setup.8 | 6 +- man/nm-initrd-generator.8 | 6 +- man/nm-online.1 | 6 +- man/nm-openvswitch.7 | 6 +- man/nm-settings-dbus.5 | 6 +- man/nm-settings-dbus.xml | 2 +- man/nm-settings-ifcfg-rh.5 | 6 +- man/nm-settings-ifcfg-rh.xml | 2 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings-nmcli.5 | 6 +- man/nm-settings-nmcli.xml | 2 +- man/nmcli-examples.7 | 6 +- man/nmcli.1 | 6 +- man/nmtui.1 | 6 +- meson.build | 2 +- src/core/devices/nm-device-bridge.c | 3 +- src/core/devices/nm-device.c | 37 +- src/core/devices/nm-device.h | 2 +- src/core/devices/ovs/nm-device-ovs-bridge.c | 2 +- src/core/devices/ovs/nm-device-ovs-interface.c | 2 +- src/core/devices/ovs/nm-device-ovs-port.c | 2 +- src/core/devices/ovs/nm-ovs-factory.c | 6 +- src/core/devices/wifi/nm-device-wifi.c | 41 +- src/core/devices/wifi/nm-iwd-manager.c | 2 +- src/core/devices/wwan/nm-device-modem.c | 8 +- src/core/devices/wwan/nm-modem-broadband.c | 5 +- src/core/dhcp/nm-dhcp-client.c | 740 +- src/core/dhcp/nm-dhcp-client.h | 73 +- src/core/dhcp/nm-dhcp-helper.c | 19 +- src/core/dhcp/nm-dhcp-listener.c | 22 +- src/core/dhcp/nm-dhcp-manager.c | 11 +- src/core/dhcp/nm-dhcp-nettools.c | 173 +- src/core/dhcp/nm-dhcp-systemd.c | 25 +- src/core/dhcp/nm-dhcp-utils.c | 3 +- src/core/nm-core-utils.c | 9 +- src/core/nm-policy.c | 17 +- src/core/platform/tests/test-route.c | 5 + src/core/ppp/nm-ppp-manager.c | 2 - src/core/supplicant/nm-supplicant-config.c | 8 + src/core/supplicant/nm-supplicant-interface.c | 43 + .../supplicant/nm-supplicant-settings-verify.c | 1 + src/libnm-client-impl/nm-client.c | 8 +- src/libnm-client-impl/nm-libnm-utils.c | 4 +- src/libnm-core-impl/nm-setting-wireless.c | 4 + .../tests/certs/test-aes-128-ec-key.pem | 8 + .../tests/certs/test-aes-256-ec-key.pem | 8 + .../tests/certs/test-ec-key-only-decrypted.der | Bin 0 -> 121 bytes .../tests/certs/test-ec-key-only-decrypted.pem | 5 + src/libnm-core-impl/tests/test-crypto.c | 15 +- src/libnm-core-public/nm-version-macros.h | 2 +- src/libnm-crypto/nm-crypto.c | 7 + src/libnm-crypto/nm-crypto.h | 3 +- src/libnm-glib-aux/nm-hash-utils.c | 2 +- src/libnm-glib-aux/nm-random-utils.c | 340 +- src/libnm-glib-aux/nm-random-utils.h | 10 +- src/libnm-glib-aux/nm-shared-utils.c | 9 + src/libnm-glib-aux/nm-shared-utils.h | 29 + src/libnm-glib-aux/nm-uuid.c | 4 +- src/libnm-glib-aux/tests/test-shared-general.c | 2 +- src/nmcli/devices.c | 5 +- src/nmcli/nmcli-completion | 2 +- 396 files changed, 16661 insertions(+), 11293 deletions(-) create mode 100644 src/libnm-core-impl/tests/certs/test-aes-128-ec-key.pem create mode 100644 src/libnm-core-impl/tests/certs/test-aes-256-ec-key.pem create mode 100644 src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.der create mode 100644 src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.pem diff --git a/Makefile.am b/Makefile.am index a0bd0e07..919c2d38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1632,6 +1632,8 @@ EXTRA_DIST += \ src/libnm-core-impl/tests/certs/test2_key_and_cert.pem \ src/libnm-core-impl/tests/certs/test-aes-128-key.pem \ src/libnm-core-impl/tests/certs/test-aes-256-key.pem \ + src/libnm-core-impl/tests/certs/test-aes-128-ec-key.pem \ + src/libnm-core-impl/tests/certs/test-aes-256-ec-key.pem \ src/libnm-core-impl/tests/certs/test_ca_cert.der \ src/libnm-core-impl/tests/certs/test_ca_cert.pem \ src/libnm-core-impl/tests/certs/test-ca-cert.pem \ @@ -1640,6 +1642,8 @@ EXTRA_DIST += \ src/libnm-core-impl/tests/certs/test-key-and-cert.pem \ src/libnm-core-impl/tests/certs/test-key-only-decrypted.der \ src/libnm-core-impl/tests/certs/test-key-only-decrypted.pem \ + src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.der \ + src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.pem \ src/libnm-core-impl/tests/certs/test-key-only.pem \ src/libnm-core-impl/tests/certs/test-tpm2wrapped-key.pem \ src/libnm-core-impl/tests/nm-core-tests-enum-types.c.template \ diff --git a/Makefile.in b/Makefile.in index 5a0008c8..11714ba8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3639,9 +3639,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -3797,6 +3794,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) TEST_SUITE_LOG = test-suite.log TEST_EXTENSIONS = @EXEEXT@ .test @@ -3833,7 +3831,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.examples $(srcdir)/Makefile.in \ $(top_srcdir)/data/org.freedesktop.NetworkManager.policy.in.in \ $(top_srcdir)/src/libnm-client-impl/libnm.pc.in \ $(top_srcdir)/src/libnm-core-public/nm-version-macros.h.in \ - ABOUT-NLS AUTHORS COPYING ChangeLog NEWS TODO \ + ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README.md TODO \ build-aux/compile build-aux/config.guess \ build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ build-aux/install-sh build-aux/ltmain.sh build-aux/missing @@ -3875,6 +3873,8 @@ am__relativize = \ GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.xz DIST_TARGETS = dist-xz +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -3900,6 +3900,8 @@ CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -3921,8 +3923,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELOGIND_INHIBIT_CFLAGS = @ELOGIND_INHIBIT_CFLAGS@ ELOGIND_INHIBIT_LIBS = @ELOGIND_INHIBIT_LIBS@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -4342,6 +4346,8 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \ src/libnm-core-impl/tests/certs/test2_key_and_cert.pem \ src/libnm-core-impl/tests/certs/test-aes-128-key.pem \ src/libnm-core-impl/tests/certs/test-aes-256-key.pem \ + src/libnm-core-impl/tests/certs/test-aes-128-ec-key.pem \ + src/libnm-core-impl/tests/certs/test-aes-256-ec-key.pem \ src/libnm-core-impl/tests/certs/test_ca_cert.der \ src/libnm-core-impl/tests/certs/test_ca_cert.pem \ src/libnm-core-impl/tests/certs/test-ca-cert.pem \ @@ -4350,6 +4356,8 @@ EXTRA_DIST = src/c-stdaux/src/c-stdaux.h $(NULL) \ src/libnm-core-impl/tests/certs/test-key-and-cert.pem \ src/libnm-core-impl/tests/certs/test-key-only-decrypted.der \ src/libnm-core-impl/tests/certs/test-key-only-decrypted.pem \ + src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.der \ + src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.pem \ src/libnm-core-impl/tests/certs/test-key-only.pem \ src/libnm-core-impl/tests/certs/test-tpm2wrapped-key.pem \ src/libnm-core-impl/tests/nm-core-tests-enum-types.c.template \ @@ -18806,7 +18814,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -19211,7 +19219,6 @@ src/nm-cloud-setup/tests/test-cloud-setup-general.log: src/nm-cloud-setup/tests/ @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -19360,7 +19367,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -19420,6 +19427,20 @@ all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(LTLIBRARIES) $(SCRIPTS) \ $(MANS) $(DATA) $(HEADERS) config.h install-binPROGRAMS: install-libLTLIBRARIES +install-checkPROGRAMS: install-libLTLIBRARIES + +install-libexecPROGRAMS: install-libLTLIBRARIES + +install-sbinPROGRAMS: install-libLTLIBRARIES + +install-EXTRALTLIBRARIES: install-libLTLIBRARIES + +install-checkLTLIBRARIES: install-libLTLIBRARIES + +install-pluginLTLIBRARIES: install-libLTLIBRARIES + +install-pppdpluginLTLIBRARIES: install-libLTLIBRARIES + installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(pppd_plugindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusinterfacesdir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(firewalldzonedir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(polkit_policydir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdnmunitdir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(libnmincludedir)" "$(DESTDIR)$(libnmincludedir)"; do \ @@ -19427,7 +19448,8 @@ installdirs-am: done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -20976,7 +20998,8 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \ uninstall-man8 .MAKE: $(am__recursive_targets) all check check-am install install-am \ - install-data-am install-exec-am install-strip uninstall-am + install-data-am install-exec install-exec-am install-strip \ + uninstall-am .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ am--depfiles am--refresh check check-TESTS check-am \ diff --git a/NEWS b/NEWS index cc1ef679..7a317d8c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +=============================================== +NetworkManager-1.38.4 +Overview of changes since NetworkManager-1.38.2 +=============================================== + +* Fix DAD for DHCPv6 addresses. +* Wi-Fi: improvements for OWE networks. +* Support EC private keys +* Various bugfixes. + =============================================== NetworkManager-1.38.2 Overview of changes since NetworkManager-1.38.0 diff --git a/aclocal.m4 b/aclocal.m4 index 5f476190..52655d70 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.2 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,8 +14,8 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) @@ -364,7 +364,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -379,7 +379,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.2], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -395,14 +395,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.2])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -454,7 +454,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -485,7 +485,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -676,7 +676,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -744,7 +744,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -772,6 +772,10 @@ m4_defn([AC_PROG_CC]) # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -808,7 +812,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -860,6 +864,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -941,7 +959,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -962,7 +980,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2020 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -984,7 +1002,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1019,7 +1037,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1062,7 +1080,7 @@ AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1083,12 +1101,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -1099,7 +1112,7 @@ else fi ]) -# Copyright (C) 2003-2020 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1133,7 +1146,7 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1162,7 +1175,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1209,7 +1222,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1288,7 +1301,7 @@ AC_DEFUN([AM_PATH_PYTHON], ]) if test "$PYTHON" = :; then - dnl Run any user-specified action, or abort. + dnl Run any user-specified action, or abort. m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) else @@ -1297,27 +1310,132 @@ AC_DEFUN([AM_PATH_PYTHON], dnl trailing zero was eliminated. So now we output just the major dnl and minor version numbers, as numbers. Apparently the tertiary dnl version is not of interest. - + dnl AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], - [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`]) + [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`]) AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) - dnl Use the values of $prefix and $exec_prefix for the corresponding - dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made - dnl distinct variables so they can be overridden if need be. However, - dnl general consensus is that you shouldn't need this ability. - - AC_SUBST([PYTHON_PREFIX], ['${prefix}']) - AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) - - dnl At times (like when building shared libraries) you may want + dnl At times, e.g., when building shared libraries, you may want dnl to know which OS platform Python thinks this is. - + dnl AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) - # Just factor out some code duplication. + dnl emacs-page + dnl If --with-python-sys-prefix is given, use the values of sys.prefix + dnl and sys.exec_prefix for the corresponding values of PYTHON_PREFIX + dnl and PYTHON_EXEC_PREFIX. Otherwise, use the GNU ${prefix} and + dnl ${exec_prefix} variables. + dnl + dnl The two are made distinct variables so they can be overridden if + dnl need be, although general consensus is that you shouldn't need + dnl this separation. + dnl + dnl Also allow directly setting the prefixes via configure options, + dnl overriding any default. + dnl + if test "x$prefix" = xNONE; then + am__usable_prefix=$ac_default_prefix + else + am__usable_prefix=$prefix + fi + + # Allow user to request using sys.* values from Python, + # instead of the GNU $prefix values. + AC_ARG_WITH([python-sys-prefix], + [AS_HELP_STRING([--with-python-sys-prefix], + [use Python's sys.prefix and sys.exec_prefix values])], + [am_use_python_sys=:], + [am_use_python_sys=false]) + + # Allow user to override whatever the default Python prefix is. + AC_ARG_WITH([python_prefix], + [AS_HELP_STRING([--with-python_prefix], + [override the default PYTHON_PREFIX])], + [am_python_prefix_subst=$withval + am_cv_python_prefix=$withval + AC_MSG_CHECKING([for explicit $am_display_PYTHON prefix]) + AC_MSG_RESULT([$am_cv_python_prefix])], + [ + if $am_use_python_sys; then + # using python sys.prefix value, not GNU + AC_CACHE_CHECK([for python default $am_display_PYTHON prefix], + [am_cv_python_prefix], + [am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`]) + + dnl If sys.prefix is a subdir of $prefix, replace the literal value of + dnl $prefix with a variable reference so it can be overridden. + case $am_cv_python_prefix in + $am__usable_prefix*) + am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'` + am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"` + ;; + *) + am_python_prefix_subst=$am_cv_python_prefix + ;; + esac + else # using GNU prefix value, not python sys.prefix + am_python_prefix_subst='${prefix}' + am_python_prefix=$am_python_prefix_subst + AC_MSG_CHECKING([for GNU default $am_display_PYTHON prefix]) + AC_MSG_RESULT([$am_python_prefix]) + fi]) + # Substituting python_prefix_subst value. + AC_SUBST([PYTHON_PREFIX], [$am_python_prefix_subst]) + + # emacs-page Now do it all over again for Python exec_prefix, but with yet + # another conditional: fall back to regular prefix if that was specified. + AC_ARG_WITH([python_exec_prefix], + [AS_HELP_STRING([--with-python_exec_prefix], + [override the default PYTHON_EXEC_PREFIX])], + [am_python_exec_prefix_subst=$withval + am_cv_python_exec_prefix=$withval + AC_MSG_CHECKING([for explicit $am_display_PYTHON exec_prefix]) + AC_MSG_RESULT([$am_cv_python_exec_prefix])], + [ + # no explicit --with-python_exec_prefix, but if + # --with-python_prefix was given, use its value for python_exec_prefix too. + AS_IF([test -n "$with_python_prefix"], + [am_python_exec_prefix_subst=$with_python_prefix + am_cv_python_exec_prefix=$with_python_prefix + AC_MSG_CHECKING([for python_prefix-given $am_display_PYTHON exec_prefix]) + AC_MSG_RESULT([$am_cv_python_exec_prefix])], + [ + # Set am__usable_exec_prefix whether using GNU or Python values, + # since we use that variable for pyexecdir. + if test "x$exec_prefix" = xNONE; then + am__usable_exec_prefix=$am__usable_prefix + else + am__usable_exec_prefix=$exec_prefix + fi + # + if $am_use_python_sys; then # using python sys.exec_prefix, not GNU + AC_CACHE_CHECK([for python default $am_display_PYTHON exec_prefix], + [am_cv_python_exec_prefix], + [am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`]) + dnl If sys.exec_prefix is a subdir of $exec_prefix, replace the + dnl literal value of $exec_prefix with a variable reference so it can + dnl be overridden. + case $am_cv_python_exec_prefix in + $am__usable_exec_prefix*) + am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'` + am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"` + ;; + *) + am_python_exec_prefix_subst=$am_cv_python_exec_prefix + ;; + esac + else # using GNU $exec_prefix, not python sys.exec_prefix + am_python_exec_prefix_subst='${exec_prefix}' + am_python_exec_prefix=$am_python_exec_prefix_subst + AC_MSG_CHECKING([for GNU default $am_display_PYTHON exec_prefix]) + AC_MSG_RESULT([$am_python_exec_prefix]) + fi])]) + # Substituting python_exec_prefix_subst. + AC_SUBST([PYTHON_EXEC_PREFIX], [$am_python_exec_prefix_subst]) + + # Factor out some code duplication into this shell variable. am_python_setup_sysconfig="\ import sys # Prefer sysconfig over distutils.sysconfig, for better compatibility @@ -1337,96 +1455,95 @@ try: except ImportError: pass" - dnl Set up 4 directories: + dnl emacs-page Set up 4 directories: - dnl pythondir -- where to install python scripts. This is the - dnl site-packages directory, not the python standard library - dnl directory like in previous automake betas. This behavior - dnl is more consistent with lispdir.m4 for example. + dnl 1. pythondir: where to install python scripts. This is the + dnl site-packages directory, not the python standard library + dnl directory like in previous automake betas. This behavior + dnl is more consistent with lispdir.m4 for example. dnl Query distutils for this directory. - AC_CACHE_CHECK([for $am_display_PYTHON script directory], - [am_cv_python_pythondir], - [if test "x$prefix" = xNONE - then - am_py_prefix=$ac_default_prefix - else - am_py_prefix=$prefix - fi - am_cv_python_pythondir=`$PYTHON -c " + dnl + AC_CACHE_CHECK([for $am_display_PYTHON script directory (pythondir)], + [am_cv_python_pythondir], + [if test "x$am_cv_python_prefix" = x; then + am_py_prefix=$am__usable_prefix + else + am_py_prefix=$am_cv_python_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'}) + 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') + 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 - ;; + # + 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 + ]) AC_SUBST([pythondir], [$am_cv_python_pythondir]) - dnl pkgpythondir -- $PACKAGE directory under pythondir. Was - dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is - dnl more consistent with the rest of automake. - + dnl 2. pkgpythondir: $PACKAGE directory under pythondir. Was + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is + dnl more consistent with the rest of automake. + dnl AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) - dnl pyexecdir -- directory for installing python extension modules - dnl (shared libraries) + dnl 3. pyexecdir: directory for installing python extension modules + dnl (shared libraries). dnl Query distutils for this directory. - AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], - [am_cv_python_pyexecdir], - [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 " + dnl + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory (pyexecdir)], + [am_cv_python_pyexecdir], + [if test "x$am_cv_python_exec_prefix" = x; then + am_py_exec_prefix=$am__usable_exec_prefix + else + am_py_exec_prefix=$am_cv_python_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'}) + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) else: - from distutils import sysconfig - sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_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 - ;; + # + 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 + ]) AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) - dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) - + dnl 4. pkgpyexecdir: $(pyexecdir)/$(PACKAGE) + dnl AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) dnl Run any user-specified action. $2 fi - ]) @@ -1449,7 +1566,7 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1468,7 +1585,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1549,7 +1666,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1609,7 +1726,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1637,7 +1754,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2020 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1656,7 +1773,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2020 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/build-aux/compile b/build-aux/compile index 23fcba01..df363c8f 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/config.guess b/build-aux/config.guess index b33c9e89..c7f17e8f 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,12 +1,14 @@ -#! /bin/sh +#!/usr/bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2018 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. -timestamp='2018-08-29' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2022-05-25' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -27,11 +29,19 @@ timestamp='2018-08-29' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -50,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2018 Free Software Foundation, Inc. +Copyright 1992-2022 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -84,6 +94,9 @@ if test $# != 0; then exit 1 fi +# Just in case it came from the environment. +GUESS= + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -96,12 +109,13 @@ fi tmp= # shellcheck disable=SC2172 -trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 -trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039 + # shellcheck disable=SC2039,SC3028 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || @@ -111,7 +125,7 @@ set_cc_for_build() { ,,) echo "int x;" > "$dummy.c" for driver in cc gcc c89 c99 ; do if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$driver" + CC_FOR_BUILD=$driver break fi done @@ -132,14 +146,12 @@ fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "$UNAME_SYSTEM" in +case $UNAME_SYSTEM in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown set_cc_for_build cat <<-EOF > "$dummy.c" @@ -148,24 +160,37 @@ Linux|GNU|GNU/*) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -177,12 +202,12 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ echo unknown)` - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -191,13 +216,13 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine="${arch}${endian}"-unknown + machine=${arch}${endian}-unknown ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) os=netbsdelf ;; @@ -218,7 +243,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in ;; esac # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -229,7 +254,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; @@ -240,45 +265,57 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi-}" - exit ;; + GUESS=$machine-${os}${release}${abi-} + ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; + *:OS108:*:*) + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix - exit ;; + GUESS=$UNAME_MACHINE-unknown-sortix + ;; + *:Twizzler:*:*) + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox - exit ;; + GUESS=$UNAME_MACHINE-unknown-redox + ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + GUESS=mips-dec-osf1 + ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -292,7 +329,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -329,112 +366,121 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; + GUESS=m68k-unknown-sysv4 + ;; *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos - exit ;; + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos - exit ;; + GUESS=$UNAME_MACHINE-unknown-morphos + ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; + GUESS=i370-ibm-openedition + ;; *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + GUESS=s390-ibm-zvmoe + ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + GUESS=powerpc-ibm-os400 + ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix"$UNAME_RELEASE" - exit ;; + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + GUESS=arm-unknown-riscos + ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; + GUESS=hppa1.1-hitachi-hiuxmpp + ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; + GUESS=pyramid-pyramid-svr4 + ;; DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; + GUESS=sparc-icl-nx6 + ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux"$UNAME_RELEASE" - exit ;; + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - case `isainfo -b` in - 32) - echo i386-pc-solaris2"$UNAME_REL" - ;; - 64) - echo x86_64-pc-solaris2"$UNAME_REL" - ;; - esac - exit ;; + set_cc_for_build + SUN_ARCH=i386 + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH=x86_64 + fi + fi + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case `/bin/arch` in sun3) - echo m68k-sun-sunos"$UNAME_RELEASE" + GUESS=m68k-sun-sunos$UNAME_RELEASE ;; sun4) - echo sparc-sun-sunos"$UNAME_RELEASE" + GUESS=sparc-sun-sunos$UNAME_RELEASE ;; esac - exit ;; + ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -444,41 +490,41 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; m68k:machten:*:*) - echo m68k-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; powerpc:machten:*:*) - echo powerpc-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; + GUESS=mips-dec-mach_bsd4.3 + ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix"$UNAME_RELEASE" - exit ;; + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; mips:*:*:UMIPS | mips:*:*:RISCos) set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -506,75 +552,76 @@ EOF dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos"$UNAME_RELEASE" - exit ;; + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; + GUESS=powerpc-motorola-powermax + ;; Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; + GUESS=powerpc-harris-powerunix + ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; + GUESS=m88k-harris-cxux7 + ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; + GUESS=m88k-motorola-sysv4 + ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux"$UNAME_RELEASE" + GUESS=m88k-dg-dgux$UNAME_RELEASE else - echo m88k-dg-dguxbcs"$UNAME_RELEASE" + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE fi else - echo i586-dg-dgux"$UNAME_RELEASE" + GUESS=i586-dg-dgux$UNAME_RELEASE fi - exit ;; + ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; + GUESS=m88k-dolphin-sysv3 + ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; + GUESS=m88k-tektronix-sysv3 + ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; + GUESS=m68k-tektronix-bsd + ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" - exit ;; + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; + GUESS=i386-ibm-aix + ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then set_cc_for_build @@ -591,16 +638,16 @@ EOF EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - echo "$SYSTEM_NAME" + GUESS=$SYSTEM_NAME else - echo rs6000-ibm-aix3.2.5 + GUESS=rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 + GUESS=rs6000-ibm-aix3.2.4 else - echo rs6000-ibm-aix3.2 + GUESS=rs6000-ibm-aix3.2 fi - exit ;; + ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then @@ -608,56 +655,56 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + if test -x /usr/bin/lslpp ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$IBM_ARCH"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; + GUESS=rs6000-ibm-aix + ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - echo romp-ibm-bsd4.4 - exit ;; + GUESS=romp-ibm-bsd4.4 + ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; + GUESS=rs6000-bull-bosx + ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; + GUESS=m68k-bull-sysv3 + ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; + GUESS=m68k-hp-bsd + ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; + GUESS=m68k-hp-bsd4.4 + ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in + case $sc_cpu_version in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "$sc_kernel_bits" in + case $sc_kernel_bits in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then + if test "$HP_ARCH" = ""; then set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -696,7 +743,7 @@ EOF test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then set_cc_for_build @@ -717,12 +764,12 @@ EOF HP_ARCH=hppa64 fi fi - echo "$HP_ARCH"-hp-hpux"$HPUX_REV" - exit ;; + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux"$HPUX_REV" - exit ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; 3050*:HI-UX:*:*) set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" @@ -752,36 +799,36 @@ EOF EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; + GUESS=unknown-hitachi-hiuxwe2 + ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - echo hppa1.1-hp-bsd - exit ;; + GUESS=hppa1.1-hp-bsd + ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; + GUESS=hppa1.0-hp-bsd + ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; + GUESS=hppa1.0-hp-mpeix + ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - echo hppa1.1-hp-osf - exit ;; + GUESS=hppa1.1-hp-osf + ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; + GUESS=hppa1.0-hp-osf + ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo "$UNAME_MACHINE"-unknown-osf1mk + if test -x /usr/sbin/sysversion ; then + GUESS=$UNAME_MACHINE-unknown-osf1mk else - echo "$UNAME_MACHINE"-unknown-osf1 + GUESS=$UNAME_MACHINE-unknown-osf1 fi - exit ;; + ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; + GUESS=hppa1.1-hp-lites + ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; + GUESS=c1-convex-bsd + ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -789,17 +836,18 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; + GUESS=c34-convex-bsd + ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; + GUESS=c38-convex-bsd + ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; + GUESS=c4-convex-bsd + ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -807,114 +855,129 @@ EOF -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; *:BSD/OS:*:*) - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; arm:FreeBSD:*:*) UNAME_PROCESSOR=`uname -p` set_cc_for_build if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf fi - exit ;; + ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in + case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; i*:CYGWIN*:*) - echo "$UNAME_MACHINE"-pc-cygwin - exit ;; + GUESS=$UNAME_MACHINE-pc-cygwin + ;; *:MINGW64*:*) - echo "$UNAME_MACHINE"-pc-mingw64 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; *:MINGW*:*) - echo "$UNAME_MACHINE"-pc-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; *:MSYS*:*) - echo "$UNAME_MACHINE"-pc-msys - exit ;; + GUESS=$UNAME_MACHINE-pc-msys + ;; i*:PW*:*) - echo "$UNAME_MACHINE"-pc-pw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-pw32 + ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in x86) - echo i586-pc-interix"$UNAME_RELEASE" - exit ;; + GUESS=i586-pc-interix$UNAME_RELEASE + ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; IA64) - echo ia64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; esac ;; i*:UWIN*:*) - echo "$UNAME_MACHINE"-pc-uwin - exit ;; + GUESS=$UNAME_MACHINE-pc-uwin + ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" - exit ;; + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" - exit ;; + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; *:Minix:*:*) - echo "$UNAME_MACHINE"-unknown-minix - exit ;; + GUESS=$UNAME_MACHINE-unknown-minix + ;; aarch64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -925,183 +988,236 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; arm*:Linux:*:*) set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi else - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf fi fi - exit ;; + ;; avr32*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; cris:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; crisv32:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; e2k:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; frv:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; hexagon:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; ia64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; k1om:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m32r*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m68*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; mips:Linux:*:* | mips64:Linux:*:*) set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" - test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-"$LIBC" - exit ;; + GUESS=or1k-unknown-linux-$LIBC + ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; padre:Linux:*:*) - echo sparc-unknown-linux-"$LIBC" - exit ;; + GUESS=sparc-unknown-linux-$LIBC + ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-"$LIBC" - exit ;; + GUESS=hppa64-unknown-linux-$LIBC + ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; - PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; - *) echo hppa-unknown-linux-"$LIBC" ;; + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; esac - exit ;; + ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64-unknown-linux-$LIBC + ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc-unknown-linux-$LIBC + ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64le-unknown-linux-$LIBC + ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-"$LIBC" - exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; s390:Linux:*:* | s390x:Linux:*:*) - echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; sh64*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sh*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; vax:Linux:*:*) - echo "$UNAME_MACHINE"-dec-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac + fi + GUESS=$CPU-pc-linux-$LIBCABI + ;; xtensa*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; + GUESS=i386-sequent-sysv4 + ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" - exit ;; + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo "$UNAME_MACHINE"-pc-os2-emx - exit ;; + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; i*86:XTS-300:*:STOP) - echo "$UNAME_MACHINE"-unknown-stop - exit ;; + GUESS=$UNAME_MACHINE-unknown-stop + ;; i*86:atheos:*:*) - echo "$UNAME_MACHINE"-unknown-atheos - exit ;; + GUESS=$UNAME_MACHINE-unknown-atheos + ;; i*86:syllable:*:*) - echo "$UNAME_MACHINE"-pc-syllable - exit ;; + GUESS=$UNAME_MACHINE-pc-syllable + ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; i*86:*DOS:*:*) - echo "$UNAME_MACHINE"-pc-msdosdjgpp - exit ;; + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL fi - exit ;; + ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1109,12 +1225,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" - exit ;; + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1124,11 +1240,11 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv32 + GUESS=$UNAME_MACHINE-pc-sysv32 fi - exit ;; + ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1136,31 +1252,31 @@ EOF # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; + GUESS=i586-pc-msdosdjgpp + ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; + GUESS=i386-pc-mach3 + ;; paragon:*:*:*) - echo i860-intel-osf1 - exit ;; + GUESS=i860-intel-osf1 + ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi - exit ;; + ;; mini*:CTIX:SYS*5:*) # "miniframe" - echo m68010-convergent-sysv - exit ;; + GUESS=m68010-convergent-sysv + ;; mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; + GUESS=m68k-convergent-sysv + ;; M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; + GUESS=m68k-diab-dnix + ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1185,250 +1301,407 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; + GUESS=m68k-atari-sysv4 + ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv"$UNAME_RELEASE" - exit ;; + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo "$UNAME_MACHINE"-sni-sysv4 + GUESS=$UNAME_MACHINE-sni-sysv4 else - echo ns32k-sni-sysv + GUESS=ns32k-sni-sysv fi - exit ;; + ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says - echo i586-unisys-sysv4 - exit ;; + GUESS=i586-unisys-sysv4 + ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; + GUESS=hppa1.1-stratus-sysv4 + ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; + GUESS=i860-stratus-sysv4 + ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo "$UNAME_MACHINE"-stratus-vos - exit ;; + GUESS=$UNAME_MACHINE-stratus-vos + ;; *:VOS:*:*) # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; + GUESS=hppa1.1-stratus-vos + ;; mc68*:A/UX:*:*) - echo m68k-apple-aux"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; + GUESS=mips-sony-newsos6 + ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv"$UNAME_RELEASE" + if test -d /usr/nec; then + GUESS=mips-nec-sysv$UNAME_RELEASE else - echo mips-unknown-sysv"$UNAME_RELEASE" + GUESS=mips-unknown-sysv$UNAME_RELEASE fi - exit ;; + ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; + GUESS=powerpc-be-beos + ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; + GUESS=powerpc-apple-beos + ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; + GUESS=i586-pc-beos + ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; + GUESS=i586-pc-haiku + ;; + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku + ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; *:Rhapsody:*:*) - echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; + arm64:Darwin:*:*) + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build fi - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi - echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; *:QNX:*:4*) - echo i386-pc-qnx - exit ;; + GUESS=i386-pc-qnx + ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; NSV-*:NONSTOP_KERNEL:*:*) - echo nsv-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; + GUESS=mips-compaq-nonstopux + ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; + GUESS=bs2000-siemens-sysv + ;; DS/*:UNIX_System_V:*:*) - echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - # shellcheck disable=SC2154 - if test "$cputype" = 386; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype fi - echo "$UNAME_MACHINE"-unknown-plan9 - exit ;; + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; + GUESS=pdp10-unknown-tops10 + ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; + GUESS=pdp10-unknown-tenex + ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; + GUESS=pdp10-dec-tops20 + ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; + GUESS=pdp10-xkl-tops20 + ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; + GUESS=pdp10-unknown-tops20 + ;; *:ITS:*:*) - echo pdp10-unknown-its - exit ;; + GUESS=pdp10-unknown-its + ;; SEI:*:*:SEIUX) - echo mips-sei-seiux"$UNAME_RELEASE" - exit ;; + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; esac ;; *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; + GUESS=i386-pc-xenix + ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" - exit ;; + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; i*86:rdos:*:*) - echo "$UNAME_MACHINE"-pc-rdos - exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros - exit ;; + GUESS=$UNAME_MACHINE-pc-rdos + ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; x86_64:VMkernel:*:*) - echo "$UNAME_MACHINE"-unknown-esx - exit ;; + GUESS=$UNAME_MACHINE-unknown-esx + ;; amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; + GUESS=x86_64-unknown-onefs + ;; + *:Unleashed:*:*) + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; esac +# Do we have a guess based on uname results? +if test "x$GUESS" != x; then + echo "$GUESS" + exit +fi + +# No uname command or uname output not recognized. +set_cc_for_build +cat > "$dummy.c" < +#include +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); +#endif + +#if defined (vax) +#if !defined (ultrix) +#include +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + echo "$0: unable to guess system type" >&2 -case "$UNAME_MACHINE:$UNAME_SYSTEM" in +case $UNAME_MACHINE:$UNAME_SYSTEM in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 <&2 exit 1 ;; *local*) @@ -111,9 +120,12 @@ case $# in esac # Split fields of configuration type -IFS="-" read -r field1 field2 field3 field4 <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1525,6 +1527,7 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. +kernel= case $cpu-$vendor in score-*) os=elf @@ -1536,7 +1539,8 @@ case $cpu-$vendor in os=riscix1.2 ;; arm*-rebel) - os=linux + kernel=linux + os=gnu ;; arm*-semi) os=aout @@ -1702,84 +1706,180 @@ case $cpu-$vendor in os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + musl* | newlib* | relibc* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* ) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ + | linux-musl* | linux-relibc* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + vxworks-simlinux | vxworks-simwindows | vxworks-spe) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. case $vendor in unknown) - case $os in - riscix*) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - sunos*) + *-sunos*) vendor=sun ;; - cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - beos*) + *-beos*) vendor=be ;; - hpux*) + *-hpux*) vendor=hp ;; - mpeix*) + *-mpeix*) vendor=hp ;; - hiux*) + *-hiux*) vendor=hitachi ;; - unos*) + *-unos*) vendor=crds ;; - dgux*) + *-dgux*) vendor=dg ;; - luna*) + *-luna*) vendor=omron ;; - genix*) + *-genix*) vendor=ns ;; - clix*) + *-clix*) vendor=intergraph ;; - mvs* | opened*) + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - os400*) + s390-* | s390x-*) vendor=ibm ;; - ptx*) + *-ptx*) vendor=sequent ;; - tpf*) + *-tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - aux*) + *-aux*) vendor=apple ;; - hms*) + *-hms*) vendor=hitachi ;; - mpw* | macos*) + *-mpw* | *-macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - vos*) + *-vos*) vendor=stratus ;; esac ;; esac -echo "$cpu-$vendor-$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: diff --git a/build-aux/depcomp b/build-aux/depcomp index 6b391623..715e3431 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/install-sh b/build-aux/install-sh index 20d8b2ea..ec298b53 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ while test $# -ne 0; do -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ do fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ do then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ do prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -488,6 +493,13 @@ do then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -502,9 +514,9 @@ do # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index 8dab662a..49fcad13 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -1,12 +1,12 @@ -#! /bin/sh +#! /usr/bin/env sh ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in -## by inline-source v2014-01-03.01 +## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.4.6 +# libtool (GNU libtool) 2.4.7 # Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -31,8 +31,8 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.6 -package_revision=2.4.6 +VERSION=2.4.7 +package_revision=2.4.7 ## ------ ## @@ -64,34 +64,25 @@ package_revision=2.4.6 # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2015-01-20.17; # UTC +scriptversion=2019-02-19.15; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 -# Copyright (C) 2004-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. - -# As a special exception to the GNU General Public License, if you distribute -# this file as part of a program or library that is built using GNU Libtool, -# you may include this file under the same distribution terms that you use -# for the rest of that program. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2004-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# , and GPL version 2 or later +# . You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# Please report bugs or propose patches to gary@gnu.org. +# Please report bugs or propose patches to: +# ## ------ ## @@ -139,9 +130,12 @@ do _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# These NLS vars are set unconditionally (bootstrap issue #24). Unset those +# in case the environment reset is needed later and the $save_* variant is not +# defined (see the code above). +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL # Make sure IFS has a sensible default sp=' ' @@ -159,6 +153,26 @@ if test "${PATH_SEPARATOR+set}" != set; then fi +# func_unset VAR +# -------------- +# Portably unset VAR. +# In some shells, an 'unset VAR' statement leaves a non-zero return +# status if VAR is already unset, which might be problematic if the +# statement is used at the end of a function (thus poisoning its return +# value) or when 'set -e' is active (causing even a spurious abort of +# the script in this case). +func_unset () +{ + { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; } +} + + +# Make sure CDPATH doesn't cause `cd` commands to output the target dir. +func_unset CDPATH + +# Make sure ${,E,F}GREP behave sanely. +func_unset GREP_OPTIONS + ## ------------------------- ## ## Locate command utilities. ## @@ -259,7 +273,7 @@ test -z "$SED" && { rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" rm -f conftest.sed SED=$func_path_progs_result } @@ -295,7 +309,7 @@ test -z "$GREP" && { rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" GREP=$func_path_progs_result } @@ -360,6 +374,35 @@ sed_double_backslash="\ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g s/\n//g" +# require_check_ifs_backslash +# --------------------------- +# Check if we can use backslash as IFS='\' separator, and set +# $check_ifs_backshlash_broken to ':' or 'false'. +require_check_ifs_backslash=func_require_check_ifs_backslash +func_require_check_ifs_backslash () +{ + _G_save_IFS=$IFS + IFS='\' + _G_check_ifs_backshlash='a\\b' + for _G_i in $_G_check_ifs_backshlash + do + case $_G_i in + a) + check_ifs_backshlash_broken=false + ;; + '') + break + ;; + *) + check_ifs_backshlash_broken=: + break + ;; + esac + done + IFS=$_G_save_IFS + require_check_ifs_backslash=: +} + ## ----------------- ## ## Global variables. ## @@ -580,16 +623,16 @@ if test yes = "$_G_HAVE_PLUSEQ_OP"; then { $debug_cmd - func_quote_for_eval "$2" - eval "$1+=\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1+=\\ \$func_quote_arg_result" }' else func_append_quoted () { $debug_cmd - func_quote_for_eval "$2" - eval "$1=\$$1\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1=\$$1\\ \$func_quote_arg_result" } fi @@ -1091,85 +1134,203 @@ func_relative_path () } -# func_quote_for_eval ARG... -# -------------------------- -# Aesthetically quote ARGs to be evaled later. -# This function returns two values: -# i) func_quote_for_eval_result -# double-quoted, suitable for a subsequent eval -# ii) func_quote_for_eval_unquoted_result -# has all characters that are still active within double -# quotes backslashified. -func_quote_for_eval () +# func_quote_portable EVAL ARG +# ---------------------------- +# Internal function to portably implement func_quote_arg. Note that we still +# keep attention to performance here so we as much as possible try to avoid +# calling sed binary (so far O(N) complexity as long as func_append is O(1)). +func_quote_portable () { $debug_cmd - func_quote_for_eval_unquoted_result= - func_quote_for_eval_result= - while test 0 -lt $#; do - case $1 in - *[\\\`\"\$]*) - _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; - *) - _G_unquoted_arg=$1 ;; - esac - if test -n "$func_quote_for_eval_unquoted_result"; then - func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" - else - func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + $require_check_ifs_backslash + + func_quote_portable_result=$2 + + # one-time-loop (easy break) + while true + do + if $1; then + func_quote_portable_result=`$ECHO "$2" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` + break fi - case $_G_unquoted_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and variable expansion - # for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_quoted_arg=\"$_G_unquoted_arg\" + # Quote for eval. + case $func_quote_portable_result in + *[\\\`\"\$]*) + # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string + # contains the shell wildcard characters. + case $check_ifs_backshlash_broken$func_quote_portable_result in + :*|*[\[\*\?]*) + func_quote_portable_result=`$ECHO "$func_quote_portable_result" \ + | $SED "$sed_quote_subst"` + break + ;; + esac + + func_quote_portable_old_IFS=$IFS + for _G_char in '\' '`' '"' '$' + do + # STATE($1) PREV($2) SEPARATOR($3) + set start "" "" + func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy + IFS=$_G_char + for _G_part in $func_quote_portable_result + do + case $1 in + quote) + func_append func_quote_portable_result "$3$2" + set quote "$_G_part" "\\$_G_char" + ;; + start) + set first "" "" + func_quote_portable_result= + ;; + first) + set quote "$_G_part" "" + ;; + esac + done + done + IFS=$func_quote_portable_old_IFS ;; - *) - _G_quoted_arg=$_G_unquoted_arg - ;; + *) ;; esac - - if test -n "$func_quote_for_eval_result"; then - func_append func_quote_for_eval_result " $_G_quoted_arg" - else - func_append func_quote_for_eval_result "$_G_quoted_arg" - fi - shift + break done + + func_quote_portable_unquoted_result=$func_quote_portable_result + case $func_quote_portable_result in + # double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # many bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_portable_result=\"$func_quote_portable_result\" + ;; + esac } -# func_quote_for_expand ARG -# ------------------------- -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - $debug_cmd +# func_quotefast_eval ARG +# ----------------------- +# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG', +# but optimized for speed. Result is stored in $func_quotefast_eval. +if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then + printf -v _GL_test_printf_tilde %q '~' + if test '\~' = "$_GL_test_printf_tilde"; then + func_quotefast_eval () + { + printf -v func_quotefast_eval_result %q "$1" + } + else + # Broken older Bash implementations. Make those faster too if possible. + func_quotefast_eval () + { + case $1 in + '~'*) + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + ;; + *) + printf -v func_quotefast_eval_result %q "$1" + ;; + esac + } + fi +else + func_quotefast_eval () + { + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + } +fi - case $1 in - *[\\\`\"]*) - _G_arg=`$ECHO "$1" | $SED \ - -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; - *) - _G_arg=$1 ;; + +# func_quote_arg MODEs ARG +# ------------------------ +# Quote one ARG to be evaled later. MODEs argument may contain zero or more +# specifiers listed below separated by ',' character. This function returns two +# values: +# i) func_quote_arg_result +# double-quoted (when needed), suitable for a subsequent eval +# ii) func_quote_arg_unquoted_result +# has all characters that are still active within double +# quotes backslashified. Available only if 'unquoted' is specified. +# +# Available modes: +# ---------------- +# 'eval' (default) +# - escape shell special characters +# 'expand' +# - the same as 'eval'; but do not quote variable references +# 'pretty' +# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might +# be used later in func_quote to get output like: 'echo "a b"' instead +# of 'echo a\ b'. This is slower than default on some shells. +# 'unquoted' +# - produce also $func_quote_arg_unquoted_result which does not contain +# wrapping double-quotes. +# +# Examples for 'func_quote_arg pretty,unquoted string': +# +# string | *_result | *_unquoted_result +# ------------+-----------------------+------------------- +# " | \" | \" +# a b | "a b" | a b +# "a b" | "\"a b\"" | \"a b\" +# * | "*" | * +# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\" +# +# Examples for 'func_quote_arg pretty,unquoted,expand string': +# +# string | *_result | *_unquoted_result +# --------------+---------------------+-------------------- +# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\" +func_quote_arg () +{ + _G_quote_expand=false + case ,$1, in + *,expand,*) + _G_quote_expand=: + ;; esac - case $_G_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_arg=\"$_G_arg\" + case ,$1, in + *,pretty,*|*,expand,*|*,unquoted,*) + func_quote_portable $_G_quote_expand "$2" + func_quote_arg_result=$func_quote_portable_result + func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result + ;; + *) + # Faster quote-for-eval for some shells. + func_quotefast_eval "$2" + func_quote_arg_result=$func_quotefast_eval_result ;; esac +} + - func_quote_for_expand_result=$_G_arg +# func_quote MODEs ARGs... +# ------------------------ +# Quote all ARGs to be evaled later and join them into single command. See +# func_quote_arg's description for more info. +func_quote () +{ + $debug_cmd + _G_func_quote_mode=$1 ; shift + func_quote_result= + while test 0 -lt $#; do + func_quote_arg "$_G_func_quote_mode" "$1" + if test -n "$func_quote_result"; then + func_append func_quote_result " $func_quote_arg_result" + else + func_append func_quote_result "$func_quote_arg_result" + fi + shift + done } @@ -1215,8 +1376,8 @@ func_show_eval () _G_cmd=$1 _G_fail_exp=${2-':'} - func_quote_for_expand "$_G_cmd" - eval "func_notquiet $func_quote_for_expand_result" + func_quote_arg pretty,expand "$_G_cmd" + eval "func_notquiet $func_quote_arg_result" $opt_dry_run || { eval "$_G_cmd" @@ -1241,8 +1402,8 @@ func_show_eval_locale () _G_fail_exp=${2-':'} $opt_quiet || { - func_quote_for_expand "$_G_cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$_G_cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || { @@ -1369,30 +1530,26 @@ func_lt_ver () # End: #! /bin/sh -# Set a version string for this script. -scriptversion=2014-01-07.03; # UTC - # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 -# Copyright (C) 2010-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2010-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# , and GPL version 2 or later +# . You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Please report bugs or propose patches to: +# -# Please report bugs or propose patches to gary@gnu.org. +# Set a version string for this script. +scriptversion=2019-02-19.15; # UTC ## ------ ## @@ -1415,7 +1572,7 @@ scriptversion=2014-01-07.03; # UTC # # In order for the '--version' option to work, you will need to have a # suitably formatted comment like the one at the top of this file -# starting with '# Written by ' and ending with '# warranty; '. +# starting with '# Written by ' and ending with '# Copyright'. # # For '-h' and '--help' to work, you will also need a one line # description of your script's purpose in a comment directly above the @@ -1427,7 +1584,7 @@ scriptversion=2014-01-07.03; # UTC # to display verbose messages only when your user has specified # '--verbose'. # -# After sourcing this file, you can plug processing for additional +# After sourcing this file, you can plug in processing for additional # options by amending the variables from the 'Configuration' section # below, and following the instructions in the 'Option parsing' # section further down. @@ -1476,8 +1633,8 @@ fatal_help="Try '\$progname --help' for more information." ## ------------------------- ## # This section contains functions for adding, removing, and running hooks -# to the main code. A hook is just a named list of of function, that can -# be run in order later on. +# in the main code. A hook is just a list of function names that can be +# run in order later on. # func_hookable FUNC_NAME # ----------------------- @@ -1510,7 +1667,8 @@ func_add_hook () # func_remove_hook FUNC_NAME HOOK_FUNC # ------------------------------------ -# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +# Remove HOOK_FUNC from the list of hook functions to be called by +# FUNC_NAME. func_remove_hook () { $debug_cmd @@ -1519,10 +1677,28 @@ func_remove_hook () } +# func_propagate_result FUNC_NAME_A FUNC_NAME_B +# --------------------------------------------- +# If the *_result variable of FUNC_NAME_A _is set_, assign its value to +# *_result variable of FUNC_NAME_B. +func_propagate_result () +{ + $debug_cmd + + func_propagate_result_result=: + if eval "test \"\${${1}_result+set}\" = set" + then + eval "${2}_result=\$${1}_result" + else + func_propagate_result_result=false + fi +} + + # func_run_hooks FUNC_NAME [ARG]... # --------------------------------- # Run all hook functions registered to FUNC_NAME. -# It is assumed that the list of hook functions contains nothing more +# It's assumed that the list of hook functions contains nothing more # than a whitespace-delimited list of legal shell function names, and # no effort is wasted trying to catch shell meta-characters or preserve # whitespace. @@ -1532,22 +1708,19 @@ func_run_hooks () case " $hookable_fns " in *" $1 "*) ;; - *) func_fatal_error "'$1' does not support hook funcions.n" ;; + *) func_fatal_error "'$1' does not support hook functions." ;; esac eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - eval $_G_hook '"$@"' - - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift + func_unset "${_G_hook}_result" + eval $_G_hook '${1+"$@"}' + func_propagate_result $_G_hook func_run_hooks + if $func_propagate_result_result; then + eval set dummy "$func_run_hooks_result"; shift + fi done - - func_quote_for_eval ${1+"$@"} - func_run_hooks_result=$func_quote_for_eval_result } @@ -1557,10 +1730,18 @@ func_run_hooks () ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, remove any -# options that you action, and then pass back the remaining unprocessed -# options in '_result', escaped suitably for -# 'eval'. Like this: +# full positional parameter list from your hook function. You may remove +# or edit any options that you action, and then pass back the remaining +# unprocessed options in '_result', escaped +# suitably for 'eval'. +# +# The '_result' variable is automatically unset +# before your hook gets called; for best performance, only set the +# *_result variable when necessary (i.e. don't call the 'func_quote' +# function unnecessarily because it can be an expensive operation on some +# machines). +# +# Like this: # # my_options_prep () # { @@ -1570,9 +1751,8 @@ func_run_hooks () # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# -# func_quote_for_eval ${1+"$@"} -# my_options_prep_result=$func_quote_for_eval_result +# # No change in '$@' (ignored completely by this hook). Leave +# # my_options_prep_result variable intact. # } # func_add_hook func_options_prep my_options_prep # @@ -1581,25 +1761,36 @@ func_run_hooks () # { # $debug_cmd # -# # Note that for efficiency, we parse as many options as we can +# args_changed=false +# +# # Note that, for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do # opt=$1; shift # case $opt in -# --silent|-s) opt_silent=: ;; +# --silent|-s) opt_silent=: +# args_changed=: +# ;; # # Separate non-argument short options: # -s*) func_split_short_opt "$_G_opt" # set dummy "$func_split_short_opt_name" \ # "-$func_split_short_opt_arg" ${1+"$@"} # shift +# args_changed=: # ;; -# *) set dummy "$_G_opt" "$*"; shift; break ;; +# *) # Make sure the first unrecognised option "$_G_opt" +# # is added back to "$@" in case we need it later, +# # if $args_changed was set to 'true'. +# set dummy "$_G_opt" ${1+"$@"}; shift; break ;; # esac # done # -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result +# # Only call 'func_quote' here if we processed at least one argument. +# if $args_changed; then +# func_quote eval ${1+"$@"} +# my_silent_option_result=$func_quote_result +# fi # } # func_add_hook func_parse_options my_silent_option # @@ -1610,17 +1801,26 @@ func_run_hooks () # # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." -# -# func_quote_for_eval ${1+"$@"} -# my_option_validation_result=$func_quote_for_eval_result # } # func_add_hook func_validate_options my_option_validation # -# You'll alse need to manually amend $usage_message to reflect the extra +# You'll also need to manually amend $usage_message to reflect the extra # options you parse. It's preferable to append if you can, so that # multiple option parsing hooks can be added safely. +# func_options_finish [ARG]... +# ---------------------------- +# Finishing the option parse loop (call 'func_options' hooks ATM). +func_options_finish () +{ + $debug_cmd + + func_run_hooks func_options ${1+"$@"} + func_propagate_result func_run_hooks func_options_finish +} + + # func_options [ARG]... # --------------------- # All the functions called inside func_options are hookable. See the @@ -1630,17 +1830,27 @@ func_options () { $debug_cmd - func_options_prep ${1+"$@"} - eval func_parse_options \ - ${func_options_prep_result+"$func_options_prep_result"} - eval func_validate_options \ - ${func_parse_options_result+"$func_parse_options_result"} + _G_options_quoted=false - eval func_run_hooks func_options \ - ${func_validate_options_result+"$func_validate_options_result"} + for my_func in options_prep parse_options validate_options options_finish + do + func_unset func_${my_func}_result + func_unset func_run_hooks_result + eval func_$my_func '${1+"$@"}' + func_propagate_result func_$my_func func_options + if $func_propagate_result_result; then + eval set dummy "$func_options_result"; shift + _G_options_quoted=: + fi + done - # save modified positional parameters for caller - func_options_result=$func_run_hooks_result + $_G_options_quoted || { + # As we (func_options) are top-level options-parser function and + # nobody quoted "$@" for us yet, we need to do it explicitly for + # caller. + func_quote eval ${1+"$@"} + func_options_result=$func_quote_result + } } @@ -1649,9 +1859,8 @@ func_options () # All initialisations required before starting the option parse loop. # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and -# needs to propogate that back to rest of this script, then the complete -# modified list must be put in 'func_run_hooks_result' before -# returning. +# needs to propagate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before returning. func_hookable func_options_prep func_options_prep () { @@ -1662,9 +1871,7 @@ func_options_prep () opt_warning_types= func_run_hooks func_options_prep ${1+"$@"} - - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result + func_propagate_result func_run_hooks func_options_prep } @@ -1676,25 +1883,32 @@ func_parse_options () { $debug_cmd - func_parse_options_result= - + _G_parse_options_requote=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. func_run_hooks func_parse_options ${1+"$@"} - - # Adjust func_parse_options positional parameters to match - eval set dummy "$func_run_hooks_result"; shift + func_propagate_result func_run_hooks func_parse_options + if $func_propagate_result_result; then + eval set dummy "$func_parse_options_result"; shift + # Even though we may have changed "$@", we passed the "$@" array + # down into the hook and it quoted it for us (because we are in + # this if-branch). No need to quote it again. + _G_parse_options_requote=false + fi # Break out of the loop if we already parsed every option. test $# -gt 0 || break + # We expect that one of the options parsed in this function matches + # and thus we remove _G_opt from "$@" and need to re-quote. + _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in --debug|-x) debug_cmd='set -x' - func_echo "enabling shell trace mode" + func_echo "enabling shell trace mode" >&2 $debug_cmd ;; @@ -1704,7 +1918,10 @@ func_parse_options () ;; --warnings|--warning|-W) - test $# = 0 && func_missing_arg $_G_opt && break + if test $# = 0 && func_missing_arg $_G_opt; then + _G_parse_options_requote=: + break + fi case " $warning_categories $1" in *" $1 "*) # trailing space prevents matching last $1 above @@ -1757,15 +1974,24 @@ func_parse_options () shift ;; - --) break ;; + --) _G_parse_options_requote=: ; break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift + _G_match_parse_options=false + break + ;; esac + + if $_G_match_parse_options; then + _G_parse_options_requote=: + fi done - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result + if $_G_parse_options_requote; then + # save modified positional parameters for caller + func_quote eval ${1+"$@"} + func_parse_options_result=$func_quote_result + fi } @@ -1782,12 +2008,10 @@ func_validate_options () test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" func_run_hooks func_validate_options ${1+"$@"} + func_propagate_result func_run_hooks func_validate_options # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE - - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result } @@ -1843,8 +2067,8 @@ func_missing_arg () # func_split_equals STRING # ------------------------ -# Set func_split_equals_lhs and func_split_equals_rhs shell variables after -# splitting STRING at the '=' sign. +# Set func_split_equals_lhs and func_split_equals_rhs shell variables +# after splitting STRING at the '=' sign. test -z "$_G_HAVE_XSI_OPS" \ && (eval 'x=a/b/c; test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ @@ -1859,8 +2083,9 @@ then func_split_equals_lhs=${1%%=*} func_split_equals_rhs=${1#*=} - test "x$func_split_equals_lhs" = "x$1" \ - && func_split_equals_rhs= + if test "x$func_split_equals_lhs" = "x$1"; then + func_split_equals_rhs= + fi }' else # ...otherwise fall back to using expr, which is often a shell builtin. @@ -1870,7 +2095,7 @@ else func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` func_split_equals_rhs= - test "x$func_split_equals_lhs" = "x$1" \ + test "x$func_split_equals_lhs=" = "x$1" \ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` } fi #func_split_equals @@ -1896,7 +2121,7 @@ else { $debug_cmd - func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'` func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` } fi #func_split_short_opt @@ -1938,31 +2163,44 @@ func_usage_message () # func_version # ------------ # Echo version message to standard output and exit. +# The version message is extracted from the calling file's header +# comments, with leading '# ' stripped: +# 1. First display the progname and version +# 2. Followed by the header comment line matching /^# Written by / +# 3. Then a blank line followed by the first following line matching +# /^# Copyright / +# 4. Immediately followed by any lines between the previous matches, +# except lines preceding the intervening completely blank line. +# For example, see the header comments of this file. func_version () { $debug_cmd printf '%s\n' "$progname $scriptversion" $SED -n ' - /(C)/!b go - :more - /\./!{ - N - s|\n# | | - b more - } - :go - /^# Written by /,/# warranty; / { - s|^# || - s|^# *$|| - s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| - p + /^# Written by /!b + s|^# ||; p; n + + :fwd2blnk + /./ { + n + b fwd2blnk } - /^# Written by / { - s|^# || - p + p; n + + :holdwrnt + s|^# || + s|^# *$|| + /^Copyright /!{ + /./H + n + b holdwrnt } - /^warranty; /q' < "$progpath" + + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + G + s|\(\n\)\n*|\1|g + p; q' < "$progpath" exit $? } @@ -1972,12 +2210,12 @@ func_version () # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" # time-stamp-time-zone: "UTC" # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.6' +scriptversion='(GNU libtool) 2.4.7' # func_echo ARG... @@ -2068,7 +2306,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 + version: $progname (GNU libtool) 2.4.7 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2124,7 +2362,7 @@ fi # a configuration failure hint, and exit. func_fatal_configuration () { - func__fatal_error ${1+"$@"} \ + func_fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -2270,6 +2508,8 @@ libtool_options_prep () nonopt= preserve_args= + _G_rc_lt_options_prep=: + # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2293,11 +2533,16 @@ libtool_options_prep () uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) shift; set dummy --mode uninstall ${1+"$@"}; shift ;; + *) + _G_rc_lt_options_prep=false + ;; esac - # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result + if $_G_rc_lt_options_prep; then + # Pass back the list of options. + func_quote eval ${1+"$@"} + libtool_options_prep_result=$func_quote_result + fi } func_add_hook func_options_prep libtool_options_prep @@ -2309,9 +2554,12 @@ libtool_parse_options () { $debug_cmd + _G_rc_lt_parse_options=false + # Perform our own loop to consume as many options as possible in # each iteration. while test $# -gt 0; do + _G_match_lt_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -2386,15 +2634,20 @@ libtool_parse_options () func_append preserve_args " $_G_opt" ;; - # An option not handled by this hook function: - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"} ; shift + _G_match_lt_parse_options=false + break + ;; esac + $_G_match_lt_parse_options && _G_rc_lt_parse_options=: done - - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result + if $_G_rc_lt_parse_options; then + # save modified positional parameters for caller + func_quote eval ${1+"$@"} + libtool_parse_options_result=$func_quote_result + fi } func_add_hook func_parse_options libtool_parse_options @@ -2444,8 +2697,8 @@ libtool_validate_options () } # Pass back the unparsed argument list - func_quote_for_eval ${1+"$@"} - libtool_validate_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_validate_options_result=$func_quote_result } func_add_hook func_validate_options libtool_validate_options @@ -3411,8 +3664,8 @@ func_mode_compile () esac done - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ + func_quote_arg pretty "$libobj" + test "X$libobj" != "X$func_quote_arg_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" @@ -3485,8 +3738,8 @@ compiler." func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result + func_quote_arg pretty "$srcfile" + qsrcfile=$func_quote_arg_result # Only build a PIC object if we are building libtool libraries. if test yes = "$build_libtool_libs"; then @@ -3641,7 +3894,8 @@ This mode accepts the following additional options: -prefer-non-pic try to build non-PIC objects only -shared do not build a '.o' file suitable for static linking -static only build a '.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler + -Wc,FLAG + -Xcompiler FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. @@ -3747,6 +4001,8 @@ The following components of LINK-COMMAND are treated specially: -weak LIBNAME declare that the target provides the LIBNAME interface -Wc,FLAG -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wa,FLAG + -Xassembler FLAG pass linker-specific FLAG directly to the assembler -Wl,FLAG -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) @@ -4089,8 +4345,8 @@ func_mode_install () case $nonopt in *shtool*) :;; *) false;; esac then # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " + func_quote_arg pretty "$nonopt" + install_prog="$func_quote_arg_result " arg=$1 shift else @@ -4100,8 +4356,8 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog "$func_quote_arg_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -4158,12 +4414,12 @@ func_mode_install () esac # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog " $func_quote_arg_result" if test -n "$arg2"; then - func_quote_for_eval "$arg2" + func_quote_arg pretty "$arg2" fi - func_append install_shared_prog " $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_arg_result" done test -z "$install_prog" && \ @@ -4174,8 +4430,8 @@ func_mode_install () if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" + func_quote_arg pretty "$install_override_mode" + func_append install_shared_prog " -m $func_quote_arg_result" fi fi @@ -4471,8 +4727,8 @@ func_mode_install () relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_quiet || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$relink_command" + eval "func_echo $func_quote_arg_result" } if eval "$relink_command"; then : else @@ -5251,7 +5507,8 @@ else if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + func_quote_arg pretty "$ECHO" + qECHO=$func_quote_arg_result $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -5261,7 +5518,7 @@ func_fallback_echo () \$1 _LTECHO_EOF' } - ECHO=\"$qECHO\" + ECHO=$qECHO fi # Very basic option parsing. These options are (a) specific to @@ -6604,9 +6861,9 @@ func_mode_link () while test "$#" -gt 0; do arg=$1 shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" + func_quote_arg pretty,unquoted "$arg" + qarg=$func_quote_arg_unquoted_result + func_append libtool_args " $func_quote_arg_result" # If the previous option needs an argument, assign it. if test -n "$prev"; then @@ -6842,6 +7099,13 @@ func_mode_link () prev= continue ;; + xassembler) + func_append compiler_flags " -Xassembler $qarg" + prev= + func_append compile_command " -Xassembler $qarg" + func_append finalize_command " -Xassembler $qarg" + continue + ;; xcclinker) func_append linker_flags " $qarg" func_append compiler_flags " $qarg" @@ -7012,7 +7276,7 @@ func_mode_link () # These systems don't actually have a C library (as such) test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. test X-lc = "X$arg" && continue ;; @@ -7032,7 +7296,7 @@ func_mode_link () esac elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -7062,8 +7326,20 @@ func_mode_link () prev=xcompiler continue ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199. + -pthread) + case $host in + *solaris2*) ;; + *) + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + ;; + esac + continue + ;; + -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" @@ -7204,9 +7480,9 @@ func_mode_link () save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $func_quote_arg_result" + func_append compiler_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" @@ -7220,16 +7496,21 @@ func_mode_link () save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $wl$func_quote_arg_result" + func_append compiler_flags " $wl$func_quote_arg_result" + func_append linker_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; + -Xassembler) + prev=xassembler + continue + ;; + -Xcompiler) prev=xcompiler continue @@ -7247,8 +7528,8 @@ func_mode_link () # -msg_* for osf cc -msg_*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; # Flags to be passed through unchanged, with rationale: @@ -7265,12 +7546,17 @@ func_mode_link () # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer + # -fuse-ld=* Linker select flags for GCC + # -Wa,* Pass flags directly to the assembler -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*) + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" @@ -7291,15 +7577,15 @@ func_mode_link () continue else # Otherwise treat like 'Some other compiler flag' below - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result fi ;; # Some other compiler flag. -* | +*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; *.$objext) @@ -7419,8 +7705,8 @@ func_mode_link () *) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; esac # arg @@ -8625,7 +8911,7 @@ func_mode_link () test CXX = "$tagname" && { case $host_os in linux*) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 func_suncc_cstd_abi @@ -8798,7 +9084,7 @@ func_mode_link () # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|freebsd-elf|linux|osf|windows|none) + darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age=$number_minor @@ -8889,7 +9175,7 @@ func_mode_link () versuffix=.$current.$revision ;; - freebsd-elf) + freebsd-elf | midnightbsd-elf) func_arith $current - $age major=.$func_arith_result versuffix=$major.$age.$revision @@ -9115,7 +9401,7 @@ func_mode_link () *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -9926,8 +10212,8 @@ EOF for cmd in $concat_cmds; do IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10020,8 +10306,8 @@ EOF eval cmd=\"$cmd\" IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10495,12 +10781,13 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty "$var_value" + relink_command="$var=$func_quote_arg_result; export $var; $relink_command" fi done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)" + relink_command=$func_quote_arg_unquoted_result fi # Only actually do things if not in dry run mode. @@ -10740,13 +11027,15 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty,unquoted "$var_value" + relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + func_quote_arg pretty,unquoted "$relink_command" + relink_command=$func_quote_arg_unquoted_result if test yes = "$hardcode_automatic"; then relink_command= fi diff --git a/build-aux/missing b/build-aux/missing index 8d0eaad2..1fe1611f 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/tap-driver.sh b/build-aux/tap-driver.sh index 865761d3..fea066f5 100755 --- a/build-aux/tap-driver.sh +++ b/build-aux/tap-driver.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2020 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -369,7 +369,7 @@ function setup_result_obj(line) sub("^(not )?ok[ \t]*", "", line) # If the result has an explicit number, get it and strip it; otherwise, - # automatically assing the next progresive number to it. + # automatically assign the next test number to it. if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/) { match(line, "^[0-9]+") diff --git a/build-aux/test-driver b/build-aux/test-driver index 89dba1e0..be73b80a 100755 --- a/build-aux/test-driver +++ b/build-aux/test-driver @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2020 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,11 +42,13 @@ print_usage () { cat <$log_file 2>&1 +# Test script is run here. We create the file first, then append to it, +# to ameliorate tests themselves also writing to the log file. Our tests +# don't, but others can (automake bug#35762). +: >"$log_file" +"$@" >>"$log_file" 2>&1 estatus=$? if test $enable_hard_errors = no && test $estatus -eq 99; then @@ -126,7 +131,7 @@ esac # know whether the test passed or failed simply by looking at the '.log' # file, without the need of also peaking into the corresponding '.trs' # file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>$log_file +echo "$res $test_name (exit status: $estatus)" >>"$log_file" # Report outcome to console. echo "${col}${res}${std}: $test_name" diff --git a/config.h.in b/config.h.in index 26121c1f..2f2b829e 100644 --- a/config.h.in +++ b/config.h.in @@ -95,8 +95,8 @@ /* Define to 1 if libsystemd is available */ #undef HAVE_LIBSYSTEMD -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H /* Define to 1 if you have the header file. */ #undef HAVE_PPPD_PPPD_H @@ -122,6 +122,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -143,6 +146,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define if you have Linux Wireless Extensions support */ #undef HAVE_WEXT @@ -277,7 +283,9 @@ /* The size of `uid_t', as computed by sizeof. */ #undef SIZEOF_UID_T -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Define to 1 to use ConsoleKit2 suspend api */ @@ -305,21 +313,87 @@ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Enable threading extensions on Solaris. */ +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE #endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE #endif @@ -371,21 +445,11 @@ /* Define if you have PPP support */ #undef WITH_PPP -/* Define to 1 if on MINIX. */ -#undef _MINIX - /* Define whether the compiler support gcc __auto_type */ #undef _NM_CC_SUPPORT_AUTO_TYPE /* Define whether the compiler supports C11 _Generic() */ #undef _NM_CC_SUPPORT_GENERIC -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE - -/* Define to `int' if does not define. */ +/* Define as a signed integer type capable of holding a process identifier. */ #undef pid_t diff --git a/configure b/configure index e88d65e5..e558b041 100755 --- a/configure +++ b/configure @@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.38.2. +# Generated by GNU Autoconf 2.71 for NetworkManager 1.38.4. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -16,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -33,46 +36,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -96,8 +92,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -109,30 +109,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -154,20 +134,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -187,18 +169,20 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1 test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' @@ -206,31 +190,40 @@ test \$(( 1 + 1 )) = 2 || exit 1 ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO PATH=/empty FPATH=/empty; export PATH FPATH test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" - if (eval "$as_required") 2>/dev/null; then : + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -238,14 +231,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -263,18 +263,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and $0: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or @@ -303,6 +304,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -320,6 +322,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -334,7 +344,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -343,7 +353,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -382,12 +392,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -399,18 +410,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -422,9 +442,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -451,7 +471,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -495,7 +515,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -509,6 +529,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -522,6 +546,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -591,47 +622,43 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.38.2' -PACKAGE_STRING='NetworkManager 1.38.2' +PACKAGE_VERSION='1.38.4' +PACKAGE_STRING='NetworkManager 1.38.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include +#include +#ifdef HAVE_STDIO_H +# include #endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif" +ac_header_c_list= gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE @@ -667,9 +694,9 @@ pkgpyexecdir pyexecdir pkgpythondir pythondir -PYTHON_PLATFORM PYTHON_EXEC_PREFIX PYTHON_PREFIX +PYTHON_PLATFORM PYTHON_VERSION PYTHON PTHREAD_CFLAGS @@ -677,6 +704,7 @@ PTHREAD_LIBS PTHREAD_CXX PTHREAD_CC ax_pthread_config +CPP target_os target_vendor target_cpu @@ -919,10 +947,13 @@ DSYMUTIL MANIFEST_TOOL DLLTOOL OBJDUMP +FILECMD ac_ct_DUMPBIN DUMPBIN LD FGREP +EGREP +GREP SED host_os host_vendor @@ -946,9 +977,6 @@ CXXDEPMODE ac_ct_CXX CXXFLAGS CXX -EGREP -GREP -CPP am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -972,6 +1000,9 @@ AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +CSCOPE +ETAGS +CTAGS am__untar am__tar AMTAR @@ -1123,6 +1154,9 @@ enable_tests with_valgrind with_tests with_valgrind_suppressions +with_python_sys_prefix +with_python_prefix +with_python_exec_prefix with_html_dir enable_gtk_doc enable_gtk_doc_html @@ -1136,7 +1170,6 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP CXX CXXFLAGS CCC @@ -1191,6 +1224,7 @@ LIBNDP_CFLAGS LIBNDP_LIBS NEWT_CFLAGS NEWT_LIBS +CPP PYTHON GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS' @@ -1262,8 +1296,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -1304,9 +1336,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1330,9 +1362,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1543,9 +1575,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1559,9 +1591,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1605,9 +1637,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1623,7 +1655,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1687,7 +1719,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1744,7 +1776,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.38.2 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.38.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1816,7 +1848,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.38.2:";; + short | recursive ) echo "Configuration of NetworkManager 1.38.4:";; esac cat <<\_ACEOF @@ -1994,6 +2026,11 @@ Optional Packages: --with-tests Build NetworkManager tests (deprecated) --with-valgrind-suppressions=path Use specific valgrind suppression file + --with-python-sys-prefix + use Python's sys.prefix and sys.exec_prefix values + --with-python_prefix override the default PYTHON_PREFIX + --with-python_exec_prefix + override the default PYTHON_EXEC_PREFIX --with-html-dir=PATH path to installed docs Some influential environment variables: @@ -2004,7 +2041,6 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags LT_SYS_LIBRARY_PATH @@ -2095,6 +2131,7 @@ Some influential environment variables: LIBNDP_LIBS linker flags for LIBNDP, overriding pkg-config NEWT_CFLAGS C compiler flags for NEWT, overriding pkg-config NEWT_LIBS linker flags for NEWT, overriding pkg-config + CPP C preprocessor PYTHON the Python interpreter GTKDOC_DEPS_CFLAGS C compiler flags for GTKDOC_DEPS, overriding pkg-config @@ -2120,9 +2157,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$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|/||'` + ac_top_builddir_sub=`printf "%s\n" "$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/ ;; @@ -2150,7 +2187,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -2158,7 +2196,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -2167,10 +2205,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.38.2 -generated by GNU Autoconf 2.69 +NetworkManager configure 1.38.4 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2187,14 +2225,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2202,14 +2240,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2219,176 +2258,6 @@ fi } # ac_fn_c_try_compile -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ----------------------------------------------------------------------------- ## -## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager ## -## ----------------------------------------------------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -2396,26 +2265,28 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -2426,14 +2297,14 @@ $as_echo "$ac_res" >&6; } ac_fn_cxx_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2441,14 +2312,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2464,14 +2336,14 @@ fi ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2479,17 +2351,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2510,11 +2383,12 @@ fi ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -2522,16 +2396,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $2 (); below. */ +#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -2549,24 +2416,25 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -2583,7 +2451,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2591,14 +2459,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2614,14 +2483,14 @@ fi ac_fn_cxx_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2629,17 +2498,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2661,17 +2531,18 @@ fi ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -2679,12 +2550,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -2692,22 +2564,66 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -2722,7 +2638,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) >= 0)]; test_array [0] = 0; @@ -2732,14 +2648,15 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_lo=0 ac_mid=0 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -2749,9 +2666,10 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=$ac_mid; break -else +else $as_nop as_fn_arith $ac_mid + 1 && ac_lo=$as_val if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= @@ -2759,14 +2677,14 @@ else fi as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) < 0)]; test_array [0] = 0; @@ -2776,14 +2694,15 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=-1 ac_mid=-1 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; test_array [0] = 0; @@ -2793,9 +2712,10 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_lo=$ac_mid; break -else +else $as_nop as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= @@ -2803,14 +2723,14 @@ else fi as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else +else $as_nop ac_lo= ac_hi= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val @@ -2818,7 +2738,7 @@ while test "x$ac_lo" != "x$ac_hi"; do /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -2828,12 +2748,13 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=$ac_mid -else +else $as_nop as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done case $ac_lo in #(( ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; @@ -2843,12 +2764,12 @@ esac cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 -static long int longval () { return $2; } -static unsigned long int ulongval () { return $2; } +static long int longval (void) { return $2; } +static unsigned long int ulongval (void) { return $2; } #include #include int -main () +main (void) { FILE *f = fopen ("conftest.val", "w"); @@ -2876,9 +2797,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : echo >>conftest.val; read $3 &5 +printf %s "checking whether $as_decl_name is declared... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + eval ac_save_FLAGS=\$$6 + as_fn_append $6 " $5" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { #ifndef $as_decl_name #ifdef __cplusplus @@ -2923,35 +2848,96 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + eval $6=\$ac_save_FLAGS + fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_c_check_decl -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.38.2, which was -generated by GNU Autoconf 2.69. Invocation command line was +} # ac_fn_check_decl - $ $0 $@ - -_ACEOF -exec 5>>config.log +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () { -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + +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.38.4, which was +generated by GNU Autoconf 2.71. Invocation command line was + + $ $0$ac_configure_args_raw + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -2976,8 +2962,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -3012,7 +3002,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -3047,11 +3037,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -3062,8 +3054,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -3087,7 +3079,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -3095,14 +3087,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -3110,15 +3102,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -3126,8 +3118,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -3141,63 +3133,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -3207,234 +3184,848 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -gt_needs="$gt_needs " -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' -ac_config_headers="$ac_config_headers config.h" +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} -ac_aux_dir= -for ac_dir in build-aux "$srcdir"/build-aux; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5 -fi +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +struct incomplete_array +{ + int datasize; + double data[]; +}; +struct named_init { + int number; + const wchar_t *name; + double average; +}; +typedef const char *ccp; +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} -am__api_version='1.16' +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac + const char *str = ""; + int number = 0; + float fnumber = 0; - done -IFS=$as_save_IFS + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); -rm -rf conftest.one conftest.two conftest.dir + return *str && number && fnumber; +} +' -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; ' -case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; -esac -# Do 'set' in a subshell so we don't clobber the current shell's +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" +# Test code for whether the C++ compiler supports C++98 (global declarations) +ac_cxx_conftest_cxx98_globals=' +// Does the compiler advertise C++98 conformance? +#if !defined __cplusplus || __cplusplus < 199711L +# error "Compiler does not advertise C++98 conformance" +#endif + +// These inclusions are to reject old compilers that +// lack the unsuffixed header files. +#include +#include + +// and are *not* freestanding headers in C++98. +extern void assert (int); +namespace std { + extern int strcmp (const char *, const char *); +} + +// Namespaces, exceptions, and templates were all added after "C++ 2.0". +using std::exception; +using std::strcmp; + +namespace { + +void test_exception_syntax() +{ + try { + throw "test"; + } catch (const char *s) { + // Extra parentheses suppress a warning when building autoconf itself, + // due to lint rules shared with more typical C programs. + assert (!(strcmp) (s, "test")); + } +} + +template struct test_template +{ + T const val; + explicit test_template(T t) : val(t) {} + template T add(U u) { return static_cast(u) + val; } +}; + +} // anonymous namespace +' + +# Test code for whether the C++ compiler supports C++98 (body of main) +ac_cxx_conftest_cxx98_main=' + assert (argc); + assert (! argv[0]); +{ + test_exception_syntax (); + test_template tt (2.0); + assert (tt.add (4) == 6.0); + assert (true && !false); +} +' + +# Test code for whether the C++ compiler supports C++11 (global declarations) +ac_cxx_conftest_cxx11_globals=' +// Does the compiler advertise C++ 2011 conformance? +#if !defined __cplusplus || __cplusplus < 201103L +# error "Compiler does not advertise C++11 conformance" +#endif + +namespace cxx11test +{ + constexpr int get_val() { return 20; } + + struct testinit + { + int i; + double d; + }; + + class delegate + { + public: + delegate(int n) : n(n) {} + delegate(): delegate(2354) {} + + virtual int getval() { return this->n; }; + protected: + int n; + }; + + class overridden : public delegate + { + public: + overridden(int n): delegate(n) {} + virtual int getval() override final { return this->n * 2; } + }; + + class nocopy + { + public: + nocopy(int i): i(i) {} + nocopy() = default; + nocopy(const nocopy&) = delete; + nocopy & operator=(const nocopy&) = delete; + private: + int i; + }; + + // for testing lambda expressions + template Ret eval(Fn f, Ret v) + { + return f(v); + } + + // for testing variadic templates and trailing return types + template auto sum(V first) -> V + { + return first; + } + template auto sum(V first, Args... rest) -> V + { + return first + sum(rest...); + } +} +' + +# Test code for whether the C++ compiler supports C++11 (body of main) +ac_cxx_conftest_cxx11_main=' +{ + // Test auto and decltype + auto a1 = 6538; + auto a2 = 48573953.4; + auto a3 = "String literal"; + + int total = 0; + for (auto i = a3; *i; ++i) { total += *i; } + + decltype(a2) a4 = 34895.034; +} +{ + // Test constexpr + short sa[cxx11test::get_val()] = { 0 }; +} +{ + // Test initializer lists + cxx11test::testinit il = { 4323, 435234.23544 }; +} +{ + // Test range-based for + int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, + 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + for (auto &x : array) { x += 23; } +} +{ + // Test lambda expressions + using cxx11test::eval; + assert (eval ([](int x) { return x*2; }, 21) == 42); + double d = 2.0; + assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); + assert (d == 5.0); + assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); + assert (d == 5.0); +} +{ + // Test use of variadic templates + using cxx11test::sum; + auto a = sum(1); + auto b = sum(1, 2); + auto c = sum(1.0, 2.0, 3.0); +} +{ + // Test constructor delegation + cxx11test::delegate d1; + cxx11test::delegate d2(); + cxx11test::delegate d3(45); +} +{ + // Test override and final + cxx11test::overridden o1(55464); +} +{ + // Test nullptr + char *c = nullptr; +} +{ + // Test template brackets + test_template<::test_template> v(test_template(12)); +} +{ + // Unicode literals + char const *utf8 = u8"UTF-8 string \u2500"; + char16_t const *utf16 = u"UTF-8 string \u2500"; + char32_t const *utf32 = U"UTF-32 string \u2500"; +} +' + +# Test code for whether the C compiler supports C++11 (complete). +ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} +${ac_cxx_conftest_cxx11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + ${ac_cxx_conftest_cxx11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C++98 (complete). +ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + return ok; +} +" + +gt_needs="$gt_needs " + +# Auxiliary files required by this configure script. +ac_aux_files="config.rpath config.guess config.sub ltmain.sh compile missing install-sh tap-driver.sh" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}/build-aux" + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +ac_config_headers="$ac_config_headers config.h" + + + + + + + +am__api_version='1.16' + + + # Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test ${ac_cv_path_install+y}; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +printf %s "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing @@ -3474,8 +4065,8 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -3494,26 +4085,23 @@ test "$program_suffix" != NONE && # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` + # Expand $ac_aux_dir to an absolute path. am_aux_dir=`cd "$ac_aux_dir" && pwd` -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + + if test x"${MISSING+set}" != xset; then + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh+set}" != xset; then @@ -3533,11 +4121,12 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; 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_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -3545,11 +4134,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3560,11 +4153,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3573,11 +4166,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; 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_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -3585,11 +4179,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3600,11 +4198,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -3612,8 +4210,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -3625,25 +4223,31 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + 'BusyBox '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; esac done @@ -3654,7 +4258,7 @@ IFS=$as_save_IFS fi test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then + if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -3664,18 +4268,19 @@ fi MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk 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_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -3683,11 +4288,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3698,24 +4307,25 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$AWK" && break done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -3731,12 +4341,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -3750,7 +4360,8 @@ fi rmdir .tst 2>/dev/null # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -3760,12 +4371,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=1;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -3777,8 +4389,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -3810,17 +4422,13 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.38.2' + VERSION='1.38.4' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h # Some tools Automake needs. @@ -3866,29 +4474,29 @@ _am_tools='gnutar plaintar pax cpio none' # (that is, avoid stderr redirection). am_uid=`id -u || echo unknown` am_gid=`id -g || echo unknown` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 -$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +printf %s "checking whether UID '$am_uid' is supported by ustar format... " >&6; } if test $am_uid -le $am_max_uid; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } _am_tools=none fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 -$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +printf %s "checking whether GID '$am_gid' is supported by ustar format... " >&6; } if test $am_gid -le $am_max_gid; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } _am_tools=none fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +printf %s "checking how to create a ustar tar archive... " >&6; } # Go ahead even if we have the value already cached. We do so because we # need to set the values for the 'am__tar' and 'am__untar' variables. @@ -3963,19 +4571,34 @@ $as_echo_n "checking how to create a ustar tar archive... " >&6; } done rm -rf conftest.dir - if ${am_cv_prog_tar_ustar+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${am_cv_prog_tar_ustar+y} +then : + printf %s "(cached) " >&6 +else $as_nop am_cv_prog_tar_ustar=$_am_tool fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 -$as_echo "$am_cv_prog_tar_ustar" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +printf "%s\n" "$am_cv_prog_tar_ustar" >&6; } +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi + +if test -z "$ETAGS"; then + ETAGS=etags +fi + +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi + + # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile @@ -4019,17 +4642,18 @@ END fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : +if test ${enable_maintainer_mode+y} +then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else +else $as_nop USE_MAINTAINER_MODE=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +printf "%s\n" "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -4042,7 +4666,8 @@ fi # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -4052,12 +4677,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -4069,8 +4695,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -4081,12 +4707,21 @@ fi AM_BACKSLASH='\' + + + + + + + + + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; } cat > confinc.mk << 'END' am__doit: @echo this is the am__doit target >confinc.out @@ -4122,11 +4757,12 @@ esac fi done rm -f confinc.* confmf.* -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -$as_echo "${_am_result}" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +printf "%s\n" "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : +if test ${enable_dependency_tracking+y} +then : enableval=$enable_dependency_tracking; fi @@ -4152,11 +4788,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; 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_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4164,11 +4801,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4179,11 +4820,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4192,11 +4833,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; 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_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -4204,11 +4846,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4219,11 +4865,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -4231,8 +4877,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4245,11 +4891,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; 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_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4257,11 +4904,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4272,11 +4923,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4285,11 +4936,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; 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_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4298,15 +4950,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4322,18 +4978,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4344,11 +5000,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$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_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4356,11 +5013,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4371,11 +5032,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4388,11 +5049,12 @@ if test -z "$CC"; then 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_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -4400,11 +5062,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4415,11 +5081,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4431,34 +5097,138 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$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 +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$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 +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -4468,7 +5238,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -4476,7 +5246,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4488,9 +5258,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -4511,11 +5281,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -4532,7 +5303,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -4548,44 +5319,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -4599,15 +5372,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -4616,7 +5389,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -4628,8 +5401,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -4637,10 +5410,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -4648,39 +5421,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4694,11 +5468,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -4707,31 +5482,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -4741,29 +5517,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -4772,57 +5552,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -4837,94 +5620,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -4933,21 +5766,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4975,8 +5810,8 @@ _ACEOF rm -f core conftest* unset am_i fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -4994,11 +5829,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -5105,8 +5941,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -5121,463 +5957,175 @@ fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +ac_header= ac_cache= +for ac_item in $ac_header_c_list do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#include -#include +# define __EXTENSIONS__ 1 + $ac_includes_default int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else $as_nop + ac_cv_safe_to_define___extensions__=no fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + #include + mbstate_t x; int -main () +main (void) { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; + + ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } -done + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h - ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = xyes; then : - MINIX=yes -else - MINIX= -fi + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h - if test "$MINIX" = yes; then + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h -$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h -$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h -$as_echo "#define _MINIX 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h - fi + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if ${ac_cv_safe_to_define___extensions__+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main () -{ + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_safe_to_define___extensions__=yes -else - ac_cv_safe_to_define___extensions__=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h - $as_echo "#define _ALL_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h - $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h - $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h +else $as_nop + MINIX= +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h - $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h +fi ac_ext=c @@ -5588,11 +6136,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; 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_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5600,11 +6149,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5615,11 +6168,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5628,11 +6181,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; 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_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -5640,11 +6194,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5655,11 +6213,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -5667,8 +6225,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -5681,11 +6239,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; 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_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5693,11 +6252,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5708,11 +6271,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5721,11 +6284,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; 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_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5734,15 +6298,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5758,18 +6326,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5780,11 +6348,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$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_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -5792,11 +6361,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5807,11 +6380,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5824,11 +6397,12 @@ if test -z "$CC"; then 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_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -5836,11 +6410,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5851,11 +6429,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5867,34 +6445,138 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$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 +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$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 +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -5904,20 +6586,21 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -5927,29 +6610,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -5958,57 +6645,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -6023,94 +6713,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -6119,21 +6859,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -6161,8 +6903,8 @@ _ACEOF rm -f core conftest* unset am_i fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -6180,11 +6922,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -6291,8 +7034,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -6309,6 +7052,12 @@ fi # C++ only required if --enable-qt=yes + + + + + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6319,15 +7068,16 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$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_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else @@ -6335,11 +7085,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6350,11 +7104,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6363,15 +7117,16 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ 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_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else @@ -6379,11 +7134,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6394,11 +7153,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6410,8 +7169,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -6421,7 +7180,7 @@ fi fi fi # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -6431,7 +7190,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -6441,20 +7200,21 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +printf %s "checking whether the compiler supports GNU C++... " >&6; } +if test ${ac_cv_cxx_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -6464,29 +7224,33 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test $ac_compiler_gnu = yes; then GXX=yes else GXX= fi -ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_test_CXXFLAGS=${CXXFLAGS+y} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +printf %s "checking whether $CXX accepts -g... " >&6; } +if test ${ac_cv_prog_cxx_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no @@ -6495,57 +7259,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes -else +else $as_nop CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : -else +else $as_nop ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } +if test $ac_test_CXXFLAGS; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then @@ -6560,6 +7327,100 @@ else CXXFLAGS= fi fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_98+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 +fi +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6568,11 +7429,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CXX_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -6679,8 +7541,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type if @@ -6695,15 +7557,15 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi @@ -6714,11 +7576,12 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$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_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -6726,11 +7589,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6741,11 +7608,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6758,11 +7625,12 @@ if test -z "$AR"; then 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_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -6770,11 +7638,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6785,11 +7657,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6801,8 +7673,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -6814,11 +7686,12 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$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_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -6826,11 +7699,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6841,11 +7718,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6858,11 +7735,12 @@ if test -z "$RANLIB"; then 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_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -6870,11 +7748,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6885,11 +7767,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6901,8 +7783,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -6914,11 +7796,12 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$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_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_NM+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NM"; then ac_cv_prog_NM="$NM" # Let the user override the test. else @@ -6926,11 +7809,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_NM="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6941,11 +7828,11 @@ fi fi NM=$ac_cv_prog_NM if test -n "$NM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 -$as_echo "$NM" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NM" >&5 +printf "%s\n" "$NM" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6958,11 +7845,12 @@ if test -z "$NM"; then 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_ac_ct_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_NM+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_NM"; then ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test. else @@ -6970,11 +7858,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NM="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6985,11 +7877,11 @@ fi fi ac_ct_NM=$ac_cv_prog_ac_ct_NM if test -n "$ac_ct_NM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5 -$as_echo "$ac_ct_NM" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5 +printf "%s\n" "$ac_ct_NM" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7001,8 +7893,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NM=$ac_ct_NM @@ -7013,14 +7905,15 @@ fi case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.4.6' -macro_revision='2.4.6' +macro_version='2.4.7' +macro_revision='2.4.7' + @@ -7036,26 +7929,29 @@ macro_revision='2.4.6' ltmain=$ac_aux_dir/ltmain.sh -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else + + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -7074,21 +7970,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -7128,8 +8025,8 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +printf %s "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -7155,12 +8052,12 @@ func_echo_all () } case $ECHO in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; + printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +printf "%s\n" "printf" >&6; } ;; + print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +printf "%s\n" "print -r" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +printf "%s\n" "cat" >&6; } ;; esac @@ -7176,11 +8073,12 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -7194,10 +8092,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -7206,13 +8109,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -7240,8 +8143,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -7258,11 +8161,154 @@ Xsed="$SED -e 1s/^X//" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -7273,10 +8319,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in fgrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -7285,13 +8336,13 @@ case `"$ac_path_FGREP" --version 2>&1` in ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" + printf "%s\n" 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -7320,8 +8371,8 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +printf "%s\n" "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -7346,17 +8397,18 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : +if test ${with_gnu_ld+y} +then : withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes -else +else $as_nop with_gnu_ld=no fi ac_prog=ld if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return, which upsets mingw @@ -7385,15 +8437,16 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test yes = "$with_gnu_ld"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${lt_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$LD"; then lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -7422,18 +8475,19 @@ fi LD=$lt_cv_path_LD if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${lt_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else $as_nop # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -7456,11 +8510,12 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test ${lt_cv_path_NM+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM=$NM @@ -7485,13 +8540,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -7510,8 +8565,8 @@ else : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +printf "%s\n" "$lt_cv_path_NM" >&6; } if test no != "$lt_cv_path_NM"; then NM=$lt_cv_path_NM else @@ -7524,11 +8579,12 @@ else do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$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_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else @@ -7536,11 +8592,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7551,11 +8611,11 @@ fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +printf "%s\n" "$DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7568,11 +8628,12 @@ if test -z "$DUMPBIN"; then 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_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else @@ -7580,11 +8641,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7595,11 +8660,11 @@ fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +printf "%s\n" "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7611,15 +8676,15 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -7640,11 +8705,12 @@ test -z "$NM" && NM=nm -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +printf %s "checking the name lister ($NM) interface... " >&6; } +if test ${lt_cv_nm_interface+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) @@ -7660,15 +8726,16 @@ else fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +printf "%s\n" "$lt_cv_nm_interface" >&6; } # find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +printf %s "checking the maximum length of command line arguments... " >&6; } +if test ${lt_cv_sys_max_cmd_len+y} +then : + printf %s "(cached) " >&6 +else $as_nop i=0 teststring=ABCD @@ -7710,7 +8777,7 @@ else lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -7753,7 +8820,7 @@ else sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -7795,11 +8862,11 @@ else fi if test -n "$lt_cv_sys_max_cmd_len"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +printf "%s\n" "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -7843,11 +8910,12 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +printf %s "checking how to convert $build file names to $host format... " >&6; } +if test ${lt_cv_to_host_file_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $host in *-*-mingw* ) case $build in @@ -7883,18 +8951,19 @@ esac fi to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +printf %s "checking how to convert $build file names to toolchain format... " >&6; } +if test ${lt_cv_to_tool_file_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop #assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in @@ -7910,22 +8979,23 @@ esac fi to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +printf %s "checking for $LD option to reload object files... " >&6; } +if test ${lt_cv_ld_reload_flag+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -7955,14 +9025,123 @@ esac +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. +set dummy ${ac_tool_prefix}file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$FILECMD"; then + ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_FILECMD="${ac_tool_prefix}file" + printf "%s\n" "$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 +FILECMD=$ac_cv_prog_FILECMD +if test -n "$FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 +printf "%s\n" "$FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_FILECMD"; then + ac_ct_FILECMD=$FILECMD + # Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_FILECMD"; then + ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_FILECMD="file" + printf "%s\n" "$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 +ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD +if test -n "$ac_ct_FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 +printf "%s\n" "$ac_ct_FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_FILECMD" = x; then + FILECMD=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + FILECMD=$ac_ct_FILECMD + fi +else + FILECMD="$ac_cv_prog_FILECMD" +fi + + + + + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; 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_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -7970,11 +9149,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7985,11 +9168,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +printf "%s\n" "$OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7998,11 +9181,12 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; 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_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -8010,11 +9194,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8025,11 +9213,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +printf "%s\n" "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -8037,8 +9225,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -8057,11 +9245,12 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +printf %s "checking how to recognize dependent libraries... " >&6; } +if test ${lt_cv_deplibs_check_method+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' @@ -8087,7 +9276,7 @@ beos*) bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -8121,14 +9310,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -8142,7 +9331,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -8189,7 +9378,7 @@ netbsd*) newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -8257,8 +9446,8 @@ os2*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } file_magic_glob= want_nocaseglob=no @@ -8302,11 +9491,12 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; 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_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else @@ -8314,11 +9504,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8329,11 +9523,11 @@ fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +printf "%s\n" "$DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8342,11 +9536,12 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; 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_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else @@ -8354,11 +9549,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8369,11 +9568,11 @@ fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +printf "%s\n" "$ac_ct_DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -8381,8 +9580,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -8402,11 +9601,12 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +printf %s "checking how to associate runtime and link libraries... " >&6; } +if test ${lt_cv_sharedlib_from_linklib_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in @@ -8429,8 +9629,8 @@ cygwin* | mingw* | pw32* | cegcc*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; } sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -8445,11 +9645,12 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$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_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -8457,11 +9658,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8472,11 +9677,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8489,11 +9694,12 @@ if test -z "$AR"; then 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_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -8501,11 +9707,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8516,11 +9726,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8532,8 +9742,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -8541,42 +9751,60 @@ esac fi : ${AR=ar} -: ${AR_FLAGS=cru} +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else + + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. + + + + + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +printf %s "checking for archiver @FILE support... " >&6; } +if test ${lt_cv_ar_at_file+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ar_at_file=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. @@ -8584,7 +9812,7 @@ if ac_fn_c_try_compile "$LINENO"; then : { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ @@ -8593,11 +9821,11 @@ if ac_fn_c_try_compile "$LINENO"; then : rm -f conftest.* libconftest.a fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +printf "%s\n" "$lt_cv_ar_at_file" >&6; } if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= @@ -8614,11 +9842,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; 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_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -8626,11 +9855,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8641,11 +9874,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8654,11 +9887,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; 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_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -8666,11 +9900,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8681,11 +9919,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -8693,8 +9931,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -8713,11 +9951,12 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; 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_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -8725,11 +9964,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8740,11 +9983,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8753,11 +9996,12 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; 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_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -8765,11 +10009,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8780,11 +10028,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -8792,8 +10040,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -8882,11 +10130,12 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +printf %s "checking command to parse $NM output from $compiler object... " >&6; } +if test ${lt_cv_sys_global_symbol_pipe+y} +then : + printf %s "(cached) " >&6 +else $as_nop # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -8941,7 +10190,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -8959,20 +10208,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -8996,7 +10245,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ @@ -9014,9 +10263,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -9038,14 +10287,14 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -9114,7 +10363,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi @@ -9149,11 +10398,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +printf "%s\n" "failed" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } fi # Response file support. @@ -9199,13 +10448,14 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +printf %s "checking for sysroot... " >&6; } # Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : +if test ${with_sysroot+y} +then : withval=$with_sysroot; -else +else $as_nop with_sysroot=no fi @@ -9218,29 +10468,30 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 -$as_echo "$with_sysroot" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +printf "%s\n" "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +printf "%s\n" "${lt_sysroot:-no}" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 -$as_echo_n "checking for a working dd... " >&6; } -if ${ac_cv_path_lt_DD+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +printf %s "checking for a working dd... " >&6; } +if test ${ac_cv_path_lt_DD+y} +then : + printf %s "(cached) " >&6 +else $as_nop printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i : ${lt_DD:=$DD} @@ -9251,10 +10502,15 @@ if test -z "$lt_DD"; then for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in dd; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in dd + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_lt_DD" || continue if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then cmp -s conftest.i conftest.out \ @@ -9274,15 +10530,16 @@ fi rm -f conftest.i conftest2.i conftest.out fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 -$as_echo "$ac_cv_path_lt_DD" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +printf "%s\n" "$ac_cv_path_lt_DD" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 -$as_echo_n "checking how to truncate binary pipes... " >&6; } -if ${lt_cv_truncate_bin+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +printf %s "checking how to truncate binary pipes... " >&6; } +if test ${lt_cv_truncate_bin+y} +then : + printf %s "(cached) " >&6 +else $as_nop printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i lt_cv_truncate_bin= @@ -9293,8 +10550,8 @@ fi rm -f conftest.i conftest2.i conftest.out test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 -$as_echo "$lt_cv_truncate_bin" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +printf "%s\n" "$lt_cv_truncate_bin" >&6; } @@ -9317,7 +10574,8 @@ func_cc_basename () } # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : +if test ${enable_libtool_lock+y} +then : enableval=$enable_libtool_lock; fi @@ -9333,9 +10591,9 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -9353,10 +10611,10 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -9368,7 +10626,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -9391,10 +10649,10 @@ mips64*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -9402,7 +10660,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -9410,7 +10668,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -9432,16 +10690,16 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -9495,11 +10753,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +printf %s "checking whether the C compiler needs -belf... " >&6; } +if test ${lt_cv_cc_needs_belf+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9510,19 +10769,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_cc_needs_belf=yes -else +else $as_nop lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -9531,8 +10791,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS=$SAVE_CFLAGS @@ -9545,9 +10805,9 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -9582,11 +10842,12 @@ need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. set dummy ${ac_tool_prefix}mt; 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_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$MANIFEST_TOOL"; then ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else @@ -9594,11 +10855,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9609,11 +10874,11 @@ fi fi MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +printf "%s\n" "$MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9622,11 +10887,12 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL # Extract the first word of "mt", so it can be a program name with args. set dummy mt; 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_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_MANIFEST_TOOL"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else @@ -9634,11 +10900,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9649,11 +10919,11 @@ fi fi ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_MANIFEST_TOOL" = x; then @@ -9661,8 +10931,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL @@ -9672,11 +10942,12 @@ else fi test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if test ${lt_cv_path_mainfest_tool+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_path_mainfest_tool=no echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out @@ -9686,8 +10957,8 @@ else fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; } if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -9702,11 +10973,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; 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_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else @@ -9714,11 +10986,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9729,11 +11005,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +printf "%s\n" "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9742,11 +11018,12 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; 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_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else @@ -9754,11 +11031,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9769,11 +11050,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -9781,8 +11062,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -9794,11 +11075,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; 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_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else @@ -9806,11 +11088,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9821,11 +11107,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +printf "%s\n" "$NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9834,11 +11120,12 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; 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_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else @@ -9846,11 +11133,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9861,11 +11152,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +printf "%s\n" "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -9873,8 +11164,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -9886,11 +11177,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; 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_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else @@ -9898,11 +11190,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9913,11 +11209,11 @@ fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +printf "%s\n" "$LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9926,11 +11222,12 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; 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_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else @@ -9938,11 +11235,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9953,11 +11254,11 @@ fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +printf "%s\n" "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -9965,8 +11266,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -9978,11 +11279,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; 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_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else @@ -9990,11 +11292,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10005,11 +11311,11 @@ fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +printf "%s\n" "$OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10018,11 +11324,12 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; 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_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else @@ -10030,11 +11337,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10045,11 +11356,11 @@ fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +printf "%s\n" "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -10057,8 +11368,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -10070,11 +11381,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; 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_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else @@ -10082,11 +11394,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10097,11 +11413,11 @@ fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +printf "%s\n" "$OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10110,11 +11426,12 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; 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_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else @@ -10122,11 +11439,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10137,11 +11458,11 @@ fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +printf "%s\n" "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -10149,8 +11470,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -10185,11 +11506,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +printf %s "checking for -single_module linker flag... " >&6; } +if test ${lt_cv_apple_cc_single_mod+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_apple_cc_single_mod=no if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override @@ -10218,14 +11540,15 @@ else rm -f conftest.* fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +printf %s "checking for -exported_symbols_list linker flag... " >&6; } +if test ${lt_cv_ld_exported_symbols_list+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym @@ -10234,39 +11557,41 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_ld_exported_symbols_list=yes -else +else $as_nop lt_cv_ld_exported_symbols_list=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +printf %s "checking for -force_load linker flag... " >&6; } +if test ${lt_cv_ld_force_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 + $AR $AR_FLAGS libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -10286,24 +11611,19 @@ _LT_EOF rm -rf conftest.dSYM fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +printf "%s\n" "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[012],*|,*powerpc*-darwin[5-8]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -10358,19 +11678,14 @@ func_munge_path_list () esac } -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF +if test "x$ac_cv_header_dlfcn_h" = xyes +then : + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h fi -done - @@ -10388,7 +11703,8 @@ func_stripname_cnf () # Set options # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : +if test ${enable_static+y} +then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -10406,7 +11722,7 @@ if test "${enable_static+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop enable_static=no fi @@ -10426,7 +11742,8 @@ fi # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : +if test ${enable_shared+y} +then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -10444,7 +11761,7 @@ if test "${enable_shared+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop enable_shared=yes fi @@ -10459,7 +11776,8 @@ fi # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : +if test ${with_pic+y} +then : withval=$with_pic; lt_p=${PACKAGE-default} case $withval in yes|no) pic_mode=$withval ;; @@ -10476,7 +11794,7 @@ if test "${with_pic+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop pic_mode=default fi @@ -10488,7 +11806,8 @@ fi # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : +if test ${enable_fast_install+y} +then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -10506,7 +11825,7 @@ if test "${enable_fast_install+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop enable_fast_install=yes fi @@ -10520,11 +11839,12 @@ fi shared_archive_member_spec= case $host,$enable_shared in power*-*-aix[5-9]*,yes) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 -$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +printf %s "checking which variant of shared library versioning to provide... " >&6; } # Check whether --with-aix-soname was given. -if test "${with_aix_soname+set}" = set; then : +if test ${with_aix_soname+y} +then : withval=$with_aix_soname; case $withval in aix|svr4|both) ;; @@ -10533,18 +11853,19 @@ if test "${with_aix_soname+set}" = set; then : ;; esac lt_cv_with_aix_soname=$with_aix_soname -else - if ${lt_cv_with_aix_soname+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + if test ${lt_cv_with_aix_soname+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_with_aix_soname=aix fi with_aix_soname=$lt_cv_with_aix_soname fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 -$as_echo "$with_aix_soname" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +printf "%s\n" "$with_aix_soname" >&6; } if test aix != "$with_aix_soname"; then # For the AIX way of multilib, we name the shared archive member # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', @@ -10626,11 +11947,12 @@ if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +printf %s "checking for objdir... " >&6; } +if test ${lt_cv_objdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -10641,17 +11963,15 @@ else fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +printf "%s\n" "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF +printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h @@ -10672,8 +11992,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -10697,11 +12017,12 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +printf %s "checking for ${ac_tool_prefix}file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. @@ -10750,11 +12071,11 @@ fi MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10763,11 +12084,12 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +printf %s "checking for file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. @@ -10816,11 +12138,11 @@ fi MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -10905,11 +12227,12 @@ if test yes = "$GCC"; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test ${lt_cv_prog_compiler_rtti_exceptions+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -10940,8 +12263,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -11182,7 +12505,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -11298,26 +12621,28 @@ case $host_os in ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +printf %s "checking for $compiler option to produce PIC... " >&6; } +if test ${lt_cv_prog_compiler_pic+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic=$lt_prog_compiler_pic fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test ${lt_cv_prog_compiler_pic_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -11348,8 +12673,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in @@ -11377,11 +12702,12 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test ${lt_cv_prog_compiler_static_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_static_works=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -11405,8 +12731,8 @@ else LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } if test yes = "$lt_cv_prog_compiler_static_works"; then : @@ -11420,11 +12746,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -11467,19 +12794,20 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -11522,8 +12850,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } @@ -11531,19 +12859,19 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links=nottested if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test no = "$hard_links"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -11555,8 +12883,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -11600,15 +12928,15 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -11660,7 +12988,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -11772,6 +13100,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; interix[3-9]*) @@ -11786,7 +13115,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -11829,7 +13158,7 @@ _LT_EOF compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes @@ -11841,7 +13170,7 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -11857,7 +13186,7 @@ _LT_EOF archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -11989,7 +13318,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -12111,21 +13440,23 @@ _LT_EOF if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -12140,7 +13471,7 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib @@ -12164,21 +13495,23 @@ fi if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -12193,7 +13526,7 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib @@ -12256,12 +13589,12 @@ fi cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -12302,7 +13635,7 @@ fi fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. @@ -12343,8 +13676,8 @@ fi output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -12378,7 +13711,7 @@ fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -12444,11 +13777,12 @@ fi # Older versions of the 11.00 compiler do not understand -b yet # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +printf %s "checking if $CC understands -b... " >&6; } +if test ${lt_cv_prog_compiler__b+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler__b=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" @@ -12472,8 +13806,8 @@ else LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +printf "%s\n" "$lt_cv_prog_compiler__b" >&6; } if test yes = "$lt_cv_prog_compiler__b"; then archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -12513,28 +13847,30 @@ fi # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if test ${lt_cv_irix_exported_symbol+y} +then : + printf %s "(cached) " >&6 +else $as_nop save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_irix_exported_symbol=yes -else +else $as_nop lt_cv_irix_exported_symbol=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi @@ -12626,6 +13962,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; osf3*) @@ -12814,8 +14151,8 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +printf "%s\n" "$ld_shlibs" >&6; } test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -12851,18 +14188,19 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +printf %s "checking whether -lc should be explicitly linked in... " >&6; } +if test ${lt_cv_archive_cmds_need_lc+y} +then : + printf %s "(cached) " >&6 +else $as_nop $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -12880,7 +14218,7 @@ else if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc=no @@ -12894,8 +14232,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; } archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac @@ -13054,8 +14392,8 @@ esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +printf %s "checking dynamic linker characteristics... " >&6; } if test yes = "$GCC"; then case $host_os in @@ -13317,7 +14655,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -13327,14 +14665,14 @@ cygwin* | mingw* | pw32* | cegcc*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -13353,7 +14691,7 @@ cygwin* | mingw* | pw32* | cegcc*) done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -13390,7 +14728,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -13423,7 +14761,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -13616,9 +14954,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_shlibpath_overrides_runpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -13628,19 +14967,21 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +if ac_fn_c_try_link "$LINENO" +then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +then : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -13875,8 +15216,8 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -13997,8 +15338,8 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -14022,8 +15363,8 @@ else # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +printf "%s\n" "$hardcode_action" >&6; } if test relink = "$hardcode_action" || test yes = "$inherit_rpath"; then @@ -14067,11 +15408,12 @@ else darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14080,32 +15422,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else +else $as_nop lt_cv_dlopen=dyld lt_cv_dlopen_libs= @@ -14125,14 +15466,16 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : +if test "x$ac_cv_func_shl_load" = xyes +then : lt_cv_dlopen=shl_load -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +printf %s "checking for shl_load in -ldld... " >&6; } +if test ${ac_cv_lib_dld_shl_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14141,41 +15484,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char shl_load (); int -main () +main (void) { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_shl_load=yes -else +else $as_nop ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes +then : lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld -else +else $as_nop ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : +if test "x$ac_cv_func_dlopen" = xyes +then : lt_cv_dlopen=dlopen -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14184,37 +15528,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +printf %s "checking for dlopen in -lsvld... " >&6; } +if test ${ac_cv_lib_svld_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14223,37 +15567,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_svld_dlopen=yes -else +else $as_nop ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +printf %s "checking for dld_link in -ldld... " >&6; } +if test ${ac_cv_lib_dld_dld_link+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14262,30 +15606,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dld_link (); int -main () +main (void) { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_dld_link=yes -else +else $as_nop ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes +then : lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -14324,11 +15667,12 @@ fi save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +printf %s "checking whether a program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else @@ -14407,7 +15751,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -14425,16 +15769,17 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +printf "%s\n" "$lt_cv_dlopen_self" >&6; } if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +printf %s "checking whether a statically linked program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self_static+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else @@ -14513,7 +15858,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -14531,8 +15876,8 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS=$save_CPPFLAGS @@ -14570,32 +15915,43 @@ fi striplib= old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +printf %s "checking whether stripping libraries is possible... " >&6; } +if test -z "$STRIP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +else + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; + esac + fi fi @@ -14610,13 +15966,13 @@ fi # Report what library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +printf %s "checking if libtool supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +printf "%s\n" "$can_build_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +printf %s "checking whether to build shared libraries... " >&6; } test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -14640,15 +15996,15 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +printf "%s\n" "$enable_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +printf %s "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test yes = "$enable_shared" || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +printf "%s\n" "$enable_static" >&6; } @@ -14670,36 +16026,32 @@ ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 +printf %s "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if ${ac_cv_prog_CXXCPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" + if test ${ac_cv_prog_CXXCPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + # Double quotes because $CXX needs to be expanded + for CXXCPP in "$CXX -E" cpp /lib/cpp do ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO" +then : -else +else $as_nop # Broken: fails on valid input. continue fi @@ -14711,10 +16063,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue -else +else $as_nop # Passes both tests. ac_preproc_ok=: break @@ -14724,7 +16077,8 @@ rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : break fi @@ -14736,29 +16090,24 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 +printf "%s\n" "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO" +then : -else +else $as_nop # Broken: fails on valid input. continue fi @@ -14770,10 +16119,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : +if ac_fn_cxx_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue -else +else $as_nop # Passes both tests. ac_preproc_ok=: break @@ -14783,11 +16133,12 @@ rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi @@ -14923,17 +16274,18 @@ cc_basename=$func_cc_basename_result # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : +if test ${with_gnu_ld+y} +then : withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes -else +else $as_nop with_gnu_ld=no fi ac_prog=ld if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return, which upsets mingw @@ -14962,15 +16314,16 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test yes = "$with_gnu_ld"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${lt_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$LD"; then lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -14999,18 +16352,19 @@ fi LD=$lt_cv_path_LD if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${lt_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else $as_nop # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -15076,8 +16430,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld fi # PORTME: fill in a description of your system's C++ link characteristics - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -15215,21 +16569,23 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath__CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -15244,7 +16600,7 @@ if ac_fn_cxx_try_link "$LINENO"; then : lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then lt_cv_aix_libpath__CXX=/usr/lib:/lib @@ -15269,21 +16625,23 @@ fi if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath__CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath__CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -15298,7 +16656,7 @@ if ac_fn_cxx_try_link "$LINENO"; then : lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath__CXX"; then lt_cv_aix_libpath__CXX=/usr/lib:/lib @@ -15363,8 +16721,8 @@ fi cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec_CXX=' ' @@ -15455,11 +16813,11 @@ fi output_verbose_link_cmd=func_echo_all archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds_CXX="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds_CXX="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" if test yes != "$lt_cv_apple_cc_single_mod"; then archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - archive_expsym_cmds_CXX="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds_CXX="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi else @@ -15494,6 +16852,7 @@ fi emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes_CXX=yes + file_list_spec_CXX='@' ;; dgux*) @@ -15524,7 +16883,7 @@ fi archive_cmds_need_lc_CXX=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes @@ -15661,7 +17020,7 @@ fi # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds_CXX='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds_CXX='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -15801,13 +17160,13 @@ fi archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' @@ -16149,8 +17508,8 @@ fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +printf "%s\n" "$ld_shlibs_CXX" >&6; } test no = "$ld_shlibs_CXX" && can_build_shared=no GCC_CXX=$GXX @@ -16188,7 +17547,7 @@ esac if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -16464,7 +17823,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -16547,7 +17906,7 @@ lt_prog_compiler_static_CXX= lt_prog_compiler_static_CXX='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 lt_prog_compiler_pic_CXX='-KPIC' @@ -16669,26 +18028,28 @@ case $host_os in ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +printf %s "checking for $compiler option to produce PIC... " >&6; } +if test ${lt_cv_prog_compiler_pic_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_CXX" >&6; } lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } -if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } +if test ${lt_cv_prog_compiler_pic_works_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -16719,8 +18080,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then case $lt_prog_compiler_pic_CXX in @@ -16742,11 +18103,12 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test ${lt_cv_prog_compiler_static_works_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -16770,8 +18132,8 @@ else LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then : @@ -16782,11 +18144,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o_CXX=no $RM -r conftest 2>/dev/null mkdir conftest @@ -16829,16 +18192,17 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o_CXX=no $RM -r conftest 2>/dev/null mkdir conftest @@ -16881,8 +18245,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; } @@ -16890,19 +18254,19 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links=nottested if test no = "$lt_cv_prog_compiler_c_o_CXX" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test no = "$hard_links"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -16911,8 +18275,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' @@ -16929,7 +18293,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -16937,7 +18301,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -16951,8 +18315,8 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 +printf "%s\n" "$ld_shlibs_CXX" >&6; } test no = "$ld_shlibs_CXX" && can_build_shared=no with_gnu_ld_CXX=$with_gnu_ld @@ -16979,18 +18343,19 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +printf %s "checking whether -lc should be explicitly linked in... " >&6; } +if test ${lt_cv_archive_cmds_need_lc_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -17008,7 +18373,7 @@ else if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc_CXX=no @@ -17022,8 +18387,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 +printf "%s\n" "$lt_cv_archive_cmds_need_lc_CXX" >&6; } archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ;; esac @@ -17092,8 +18457,8 @@ esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +printf %s "checking dynamic linker characteristics... " >&6; } library_names_spec= libname_spec='lib$name' @@ -17284,7 +18649,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; mingw* | cegcc*) @@ -17293,14 +18658,14 @@ cygwin* | mingw* | pw32* | cegcc*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -17319,7 +18684,7 @@ cygwin* | mingw* | pw32* | cegcc*) done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -17356,7 +18721,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -17388,7 +18753,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -17581,9 +18946,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_shlibpath_overrides_runpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -17593,19 +18959,21 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +if ac_fn_cxx_try_link "$LINENO" +then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +then : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -17840,8 +19208,8 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -17905,8 +19273,8 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || test -n "$runpath_var_CXX" || @@ -17930,8 +19298,8 @@ else # directories. hardcode_action_CXX=unsupported fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 +printf "%s\n" "$hardcode_action_CXX" >&6; } if test relink = "$hardcode_action_CXX" || test yes = "$inherit_rpath_CXX"; then @@ -17994,8 +19362,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 NM_MINOR_VERSION=38 -NM_MICRO_VERSION=2 -NM_VERSION=1.38.2 +NM_MICRO_VERSION=4 +NM_VERSION=1.38.4 @@ -18003,43 +19371,69 @@ NM_VERSION=1.38.2 -NM_GIT_SHA=abfd2d6ea729926bff0ddafa1367a54f6d6f4230 +NM_GIT_SHA=89f351d4534fd9d88dc07c7d23bb254145a93178 if test """" != "no-config-h" ; then -cat >>confdefs.h <<_ACEOF -#define NM_GIT_SHA "$NM_GIT_SHA" -_ACEOF +printf "%s\n" "#define NM_GIT_SHA \"$NM_GIT_SHA\"" >>confdefs.h fi -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = xyes; then : -else + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default +" +if test "x$ac_cv_type_pid_t" = xyes +then : + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #if defined _WIN64 && !defined __CYGWIN__ + LLP64 + #endif + +int +main (void) +{ + + ; + return 0; +} -cat >>confdefs.h <<_ACEOF -#define pid_t int _ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_pid_type='int' +else $as_nop + ac_pid_type='__int64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h + fi + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5 -$as_echo_n "checking size of pid_t... " >&6; } -if ${ac_cv_sizeof_pid_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of pid_t" >&5 +printf %s "checking size of pid_t... " >&6; } +if test ${ac_cv_sizeof_pid_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (pid_t))" "ac_cv_sizeof_pid_t" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_pid_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (pid_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -18048,31 +19442,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5 -$as_echo "$ac_cv_sizeof_pid_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_pid_t" >&5 +printf "%s\n" "$ac_cv_sizeof_pid_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_PID_T $ac_cv_sizeof_pid_t -_ACEOF +printf "%s\n" "#define SIZEOF_PID_T $ac_cv_sizeof_pid_t" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of uid_t" >&5 -$as_echo_n "checking size of uid_t... " >&6; } -if ${ac_cv_sizeof_uid_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uid_t))" "ac_cv_sizeof_uid_t" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of uid_t" >&5 +printf %s "checking size of uid_t... " >&6; } +if test ${ac_cv_sizeof_uid_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (uid_t))" "ac_cv_sizeof_uid_t" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_uid_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (uid_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -18081,31 +19475,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uid_t" >&5 -$as_echo "$ac_cv_sizeof_uid_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_uid_t" >&5 +printf "%s\n" "$ac_cv_sizeof_uid_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UID_T $ac_cv_sizeof_uid_t -_ACEOF +printf "%s\n" "#define SIZEOF_UID_T $ac_cv_sizeof_uid_t" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of gid_t" >&5 -$as_echo_n "checking size of gid_t... " >&6; } -if ${ac_cv_sizeof_gid_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (gid_t))" "ac_cv_sizeof_gid_t" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of gid_t" >&5 +printf %s "checking size of gid_t... " >&6; } +if test ${ac_cv_sizeof_gid_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (gid_t))" "ac_cv_sizeof_gid_t" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_gid_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (gid_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -18114,31 +19508,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_gid_t" >&5 -$as_echo "$ac_cv_sizeof_gid_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_gid_t" >&5 +printf "%s\n" "$ac_cv_sizeof_gid_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_GID_T $ac_cv_sizeof_gid_t -_ACEOF +printf "%s\n" "#define SIZEOF_GID_T $ac_cv_sizeof_gid_t" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of dev_t" >&5 -$as_echo_n "checking size of dev_t... " >&6; } -if ${ac_cv_sizeof_dev_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (dev_t))" "ac_cv_sizeof_dev_t" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of dev_t" >&5 +printf %s "checking size of dev_t... " >&6; } +if test ${ac_cv_sizeof_dev_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (dev_t))" "ac_cv_sizeof_dev_t" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_dev_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (dev_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -18147,31 +19541,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_dev_t" >&5 -$as_echo "$ac_cv_sizeof_dev_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_dev_t" >&5 +printf "%s\n" "$ac_cv_sizeof_dev_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_DEV_T $ac_cv_sizeof_dev_t -_ACEOF +printf "%s\n" "#define SIZEOF_DEV_T $ac_cv_sizeof_dev_t" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ino_t" >&5 -$as_echo_n "checking size of ino_t... " >&6; } -if ${ac_cv_sizeof_ino_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ino_t))" "ac_cv_sizeof_ino_t" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of ino_t" >&5 +printf %s "checking size of ino_t... " >&6; } +if test ${ac_cv_sizeof_ino_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ino_t))" "ac_cv_sizeof_ino_t" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_ino_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (ino_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -18180,31 +19574,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ino_t" >&5 -$as_echo "$ac_cv_sizeof_ino_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ino_t" >&5 +printf "%s\n" "$ac_cv_sizeof_ino_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_INO_T $ac_cv_sizeof_ino_t -_ACEOF +printf "%s\n" "#define SIZEOF_INO_T $ac_cv_sizeof_ino_t" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 -$as_echo_n "checking size of time_t... " >&6; } -if ${ac_cv_sizeof_time_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 +printf %s "checking size of time_t... " >&6; } +if test ${ac_cv_sizeof_time_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_time_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (time_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -18213,32 +19607,32 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 -$as_echo "$ac_cv_sizeof_time_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 +printf "%s\n" "$ac_cv_sizeof_time_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_TIME_T $ac_cv_sizeof_time_t -_ACEOF +printf "%s\n" "#define SIZEOF_TIME_T $ac_cv_sizeof_time_t" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of rlim_t" >&5 -$as_echo_n "checking size of rlim_t... " >&6; } -if ${ac_cv_sizeof_rlim_t+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of rlim_t" >&5 +printf %s "checking size of rlim_t... " >&6; } +if test ${ac_cv_sizeof_rlim_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (rlim_t))" "ac_cv_sizeof_rlim_t" "#include -"; then : +" +then : -else +else $as_nop if test "$ac_cv_type_rlim_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (rlim_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -18247,176 +19641,235 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_rlim_t" >&5 -$as_echo "$ac_cv_sizeof_rlim_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_rlim_t" >&5 +printf "%s\n" "$ac_cv_sizeof_rlim_t" >&6; } + + +printf "%s\n" "#define SIZEOF_RLIM_T $ac_cv_sizeof_rlim_t" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define SIZEOF_RLIM_T $ac_cv_sizeof_rlim_t + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } +if test ${ac_cv_c_undeclared_builtin_options+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_CFLAGS=$CFLAGS + ac_cv_c_undeclared_builtin_options='cannot detect' + for ac_arg in '' -fno-builtin; do + CFLAGS="$ac_save_CFLAGS $ac_arg" + # This test program should *not* compile successfully. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +(void) strchr; + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else $as_nop + # This test program should compile successfully. + # No library function is consistently available on + # freestanding implementations, so test against a dummy + # declaration. Include always-available headers on the + # off chance that they somehow elicit warnings. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +extern void ac_decl (int, char *); +int +main (void) +{ +(void) ac_decl (0, (char *) 0); + (void) ac_decl; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + if test x"$ac_arg" = x +then : + ac_cv_c_undeclared_builtin_options='none needed' +else $as_nop + ac_cv_c_undeclared_builtin_options=$ac_arg +fi + break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + CFLAGS=$ac_save_CFLAGS + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 +printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } + case $ac_cv_c_undeclared_builtin_options in #( + 'cannot detect') : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot make $CC report undeclared builtins +See \`config.log' for more details" "$LINENO" 5; } ;; #( + 'none needed') : + ac_c_undeclared_builtin_options='' ;; #( + *) : + ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; +esac -ac_fn_c_check_decl "$LINENO" "explicit_bzero" "ac_cv_have_decl_explicit_bzero" " +ac_fn_check_decl "$LINENO" "explicit_bzero" "ac_cv_have_decl_explicit_bzero" " #include -" -if test "x$ac_cv_have_decl_explicit_bzero" = xyes; then : +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_explicit_bzero" = xyes +then : ac_have_decl=1 -else +else $as_nop ac_have_decl=0 fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_EXPLICIT_BZERO $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_EXPLICIT_BZERO $ac_have_decl" >>confdefs.h -ac_fn_c_check_decl "$LINENO" "reallocarray" "ac_cv_have_decl_reallocarray" " +ac_fn_check_decl "$LINENO" "reallocarray" "ac_cv_have_decl_reallocarray" " #include #include -" -if test "x$ac_cv_have_decl_reallocarray" = xyes; then : +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_reallocarray" = xyes +then : ac_have_decl=1 -else +else $as_nop ac_have_decl=0 fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_REALLOCARRAY $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_REALLOCARRAY $ac_have_decl" >>confdefs.h -ac_fn_c_check_decl "$LINENO" "memfd_create" "ac_cv_have_decl_memfd_create" " +ac_fn_check_decl "$LINENO" "memfd_create" "ac_cv_have_decl_memfd_create" " #include -" -if test "x$ac_cv_have_decl_memfd_create" = xyes; then : +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_memfd_create" = xyes +then : ac_have_decl=1 -else +else $as_nop ac_have_decl=0 fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MEMFD_CREATE $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_MEMFD_CREATE $ac_have_decl" >>confdefs.h -ac_fn_c_check_decl "$LINENO" "pidfd_open" "ac_cv_have_decl_pidfd_open" " +ac_fn_check_decl "$LINENO" "pidfd_open" "ac_cv_have_decl_pidfd_open" " #include #include #include #include -" -if test "x$ac_cv_have_decl_pidfd_open" = xyes; then : +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_pidfd_open" = xyes +then : ac_have_decl=1 -else +else $as_nop ac_have_decl=0 fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_PIDFD_OPEN $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_PIDFD_OPEN $ac_have_decl" >>confdefs.h -ac_fn_c_check_decl "$LINENO" "pidfd_send_signal" "ac_cv_have_decl_pidfd_send_signal" " +ac_fn_check_decl "$LINENO" "pidfd_send_signal" "ac_cv_have_decl_pidfd_send_signal" " #include #include #include #include -" -if test "x$ac_cv_have_decl_pidfd_send_signal" = xyes; then : +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_pidfd_send_signal" = xyes +then : ac_have_decl=1 -else +else $as_nop ac_have_decl=0 fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_PIDFD_SEND_SIGNAL $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_PIDFD_SEND_SIGNAL $ac_have_decl" >>confdefs.h -ac_fn_c_check_decl "$LINENO" "rt_sigqueueinfo" "ac_cv_have_decl_rt_sigqueueinfo" " +ac_fn_check_decl "$LINENO" "rt_sigqueueinfo" "ac_cv_have_decl_rt_sigqueueinfo" " #include #include #include #include -" -if test "x$ac_cv_have_decl_rt_sigqueueinfo" = xyes; then : +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_rt_sigqueueinfo" = xyes +then : ac_have_decl=1 -else +else $as_nop ac_have_decl=0 fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_RT_SIGQUEUEINFO $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_RT_SIGQUEUEINFO $ac_have_decl" >>confdefs.h -for ac_header in sys/auxv.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/auxv.h" "ac_cv_header_sys_auxv_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_auxv_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_AUXV_H 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "sys/auxv.h" "ac_cv_header_sys_auxv_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_auxv_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_AUXV_H 1" >>confdefs.h fi -done - -ac_fn_c_check_decl "$LINENO" "getrandom" "ac_cv_have_decl_getrandom" "#include +ac_fn_check_decl "$LINENO" "getrandom" "ac_cv_have_decl_getrandom" "#include -" -if test "x$ac_cv_have_decl_getrandom" = xyes; then : +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_getrandom" = xyes +then : ac_have_decl=1 -else +else $as_nop ac_have_decl=0 fi +printf "%s\n" "#define HAVE_DECL_GETRANDOM $ac_have_decl" >>confdefs.h +if test $ac_have_decl = 1 +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETRANDOM $ac_have_decl -_ACEOF -if test $ac_have_decl = 1; then : - -$as_echo "#define USE_SYS_RANDOM_H 1" >>confdefs.h +printf "%s\n" "#define USE_SYS_RANDOM_H 1" >>confdefs.h -$as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h +printf "%s\n" "#define HAVE_GETRANDOM 1" >>confdefs.h -else - ac_fn_c_check_decl "$LINENO" "getrandom" "ac_cv_have_decl_getrandom" "#include +else $as_nop + ac_fn_check_decl "$LINENO" "getrandom" "ac_cv_have_decl_getrandom" "#include -" -if test "x$ac_cv_have_decl_getrandom" = xyes; then : +" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_getrandom" = xyes +then : ac_have_decl=1 -else +else $as_nop ac_have_decl=0 fi +printf "%s\n" "#define HAVE_DECL_GETRANDOM $ac_have_decl" >>confdefs.h +if test $ac_have_decl = 1 +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETRANDOM $ac_have_decl -_ACEOF -if test $ac_have_decl = 1; then : - -$as_echo "#define USE_SYS_RANDOM_H 0" >>confdefs.h +printf "%s\n" "#define USE_SYS_RANDOM_H 0" >>confdefs.h -$as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h +printf "%s\n" "#define HAVE_GETRANDOM 1" >>confdefs.h -else +else $as_nop -$as_echo "#define USE_SYS_RANDOM_H 0" >>confdefs.h +printf "%s\n" "#define USE_SYS_RANDOM_H 0" >>confdefs.h -$as_echo "#define HAVE_GETRANDOM 0" >>confdefs.h +printf "%s\n" "#define HAVE_GETRANDOM 0" >>confdefs.h fi @@ -18424,17 +19877,18 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -$as_echo_n "checking whether NLS is requested... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +printf %s "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then : +if test ${enable_nls+y} +then : enableval=$enable_nls; USE_NLS=$enableval -else +else $as_nop USE_NLS=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +printf "%s\n" "$USE_NLS" >&6; } @@ -18451,21 +19905,22 @@ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.40.0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5 -$as_echo_n "checking for intltool >= 0.40.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 -$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5 +printf %s "checking for intltool >= 0.40.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 +printf "%s\n" "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || as_fn_error $? "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; 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_INTLTOOL_UPDATE+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_UPDATE+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $INTLTOOL_UPDATE in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. @@ -18475,11 +19930,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_UPDATE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18491,21 +19950,22 @@ esac fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 -$as_echo "$INTLTOOL_UPDATE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 +printf "%s\n" "$INTLTOOL_UPDATE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; 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_INTLTOOL_MERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_MERGE+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $INTLTOOL_MERGE in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. @@ -18515,11 +19975,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_MERGE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18531,21 +19995,22 @@ esac fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 -$as_echo "$INTLTOOL_MERGE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 +printf "%s\n" "$INTLTOOL_MERGE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; 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_INTLTOOL_EXTRACT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_EXTRACT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $INTLTOOL_EXTRACT in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. @@ -18555,11 +20020,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_EXTRACT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18571,11 +20040,11 @@ esac fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 -$as_echo "$INTLTOOL_EXTRACT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 +printf "%s\n" "$INTLTOOL_EXTRACT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -18725,11 +20194,12 @@ fi # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; 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_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XGETTEXT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XGETTEXT in [\\/]* | ?:[\\/]*) ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. @@ -18739,11 +20209,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XGETTEXT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18755,21 +20229,22 @@ esac fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +printf "%s\n" "$XGETTEXT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; 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_MSGMERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGMERGE+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MSGMERGE in [\\/]* | ?:[\\/]*) ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. @@ -18779,11 +20254,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_MSGMERGE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18795,21 +20274,22 @@ esac fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +printf "%s\n" "$MSGMERGE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; 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_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGFMT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. @@ -18819,11 +20299,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_MSGFMT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18835,21 +20319,22 @@ esac fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +printf "%s\n" "$MSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; 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_GMSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GMSGFMT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $GMSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. @@ -18859,11 +20344,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18876,11 +20365,11 @@ esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +printf "%s\n" "$GMSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -18896,11 +20385,12 @@ fi # 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 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_INTLTOOL_PERL+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $INTLTOOL_PERL in [\\/]* | ?:[\\/]*) ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. @@ -18910,11 +20400,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_INTLTOOL_PERL="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18926,33 +20420,33 @@ esac fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 -$as_echo "$INTLTOOL_PERL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 +printf "%s\n" "$INTLTOOL_PERL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test -z "$INTLTOOL_PERL"; then as_fn_error $? "perl not found" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 -$as_echo_n "checking for perl >= 5.8.1... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 +printf %s "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 -$as_echo "$IT_PERL_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 +printf "%s\n" "$IT_PERL_VERSION" >&6; } fi if test "x" != "xno-xml"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 -$as_echo_n "checking for XML::Parser... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 +printf %s "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } else as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 fi @@ -19009,11 +20503,12 @@ rm -f conf$$.file # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; 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_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGFMT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case "$MSGFMT" in [\\/]* | ?:[\\/]*) ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. @@ -19041,20 +20536,21 @@ esac fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +printf "%s\n" "$MSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; 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_GMSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GMSGFMT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $GMSGFMT in [\\/]* | ?:[\\/]*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. @@ -19064,11 +20560,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19081,11 +20581,11 @@ esac fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +printf "%s\n" "$GMSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -19132,11 +20632,12 @@ rm -f conf$$.file # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; 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_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XGETTEXT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case "$XGETTEXT" in [\\/]* | ?:[\\/]*) ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. @@ -19164,11 +20665,11 @@ esac fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +printf "%s\n" "$XGETTEXT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi rm -f messages.po @@ -19210,11 +20711,12 @@ rm -f conf$$.file # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; 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_MSGMERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_MSGMERGE+y} +then : + printf %s "(cached) " >&6 +else $as_nop case "$MSGMERGE" in [\\/]* | ?:[\\/]*) ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. @@ -19241,11 +20743,11 @@ esac fi MSGMERGE="$ac_cv_path_MSGMERGE" if test "$MSGMERGE" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +printf "%s\n" "$MSGMERGE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -19276,9 +20778,10 @@ fi # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : +if test ${with_gnu_ld+y} +then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else +else $as_nop with_gnu_ld=no fi @@ -19298,8 +20801,8 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 -$as_echo_n "checking for ld used by GCC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 +printf %s "checking for ld used by GCC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -19328,15 +20831,16 @@ $as_echo_n "checking for ld used by GCC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } fi -if ${acl_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${acl_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$LD"; then IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do @@ -19362,18 +20866,19 @@ fi LD="$acl_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${acl_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${acl_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else $as_nop # I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 &1 &5 -$as_echo "$acl_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5 +printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; } with_gnu_ld=$acl_cv_prog_gnu_ld - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 -$as_echo_n "checking for shared library run path origin... " >&6; } -if ${acl_cv_rpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 +printf %s "checking for shared library run path origin... " >&6; } +if test ${acl_cv_rpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh @@ -19402,8 +20909,8 @@ else acl_cv_rpath=done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 -$as_echo "$acl_cv_rpath" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 +printf "%s\n" "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" acl_libext="$acl_cv_libext" acl_shlibext="$acl_cv_shlibext" @@ -19414,9 +20921,10 @@ $as_echo "$acl_cv_rpath" >&6; } acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. -if test "${enable_rpath+set}" = set; then : +if test ${enable_rpath+y} +then : enableval=$enable_rpath; : -else +else $as_nop enable_rpath=yes fi @@ -19463,7 +20971,8 @@ fi # Check whether --with-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then : +if test ${with_libiconv_prefix+y} +then : withval=$with_libiconv_prefix; if test "X$withval" = "Xno"; then use_additional=no @@ -19903,72 +21412,76 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 -$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } -if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +printf %s "checking for CFPreferencesCopyAppValue... " >&6; } +if test ${gt_cv_func_CFPreferencesCopyAppValue+y} +then : + printf %s "(cached) " >&6 +else $as_nop gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { CFPreferencesCopyAppValue(NULL, NULL) ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : gt_cv_func_CFPreferencesCopyAppValue=yes -else +else $as_nop gt_cv_func_CFPreferencesCopyAppValue=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$gt_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 -$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then -$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h +printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 -$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } -if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +printf %s "checking for CFLocaleCopyCurrent... " >&6; } +if test ${gt_cv_func_CFLocaleCopyCurrent+y} +then : + printf %s "(cached) " >&6 +else $as_nop gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { CFLocaleCopyCurrent(); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : gt_cv_func_CFLocaleCopyCurrent=yes -else +else $as_nop gt_cv_func_CFLocaleCopyCurrent=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$gt_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 -$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +printf "%s\n" "$gt_cv_func_CFLocaleCopyCurrent" >&6; } if test $gt_cv_func_CFLocaleCopyCurrent = yes; then -$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h +printf "%s\n" "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h fi INTL_MACOSX_LIBS= @@ -20013,11 +21526,12 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; gt_expression_test_code= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 -$as_echo_n "checking for GNU gettext in libc... " >&6; } -if eval \${$gt_func_gnugettext_libc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 +printf %s "checking for GNU gettext in libc... " >&6; } +if eval test \${$gt_func_gnugettext_libc+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -20025,7 +21539,7 @@ $gt_revision_test_code extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; int -main () +main (void) { bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings @@ -20033,17 +21547,18 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$gt_func_gnugettext_libc=yes" -else +else $as_nop eval "$gt_func_gnugettext_libc=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$gt_func_gnugettext_libc - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then @@ -20076,11 +21591,12 @@ $as_echo "$ac_res" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -$as_echo_n "checking for iconv... " >&6; } -if ${am_cv_func_iconv+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +printf %s "checking for iconv... " >&6; } +if test ${am_cv_func_iconv+y} +then : + printf %s "(cached) " >&6 +else $as_nop am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no @@ -20089,7 +21605,7 @@ else #include #include int -main () +main (void) { iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); @@ -20098,10 +21614,11 @@ iconv_t cd = iconv_open("",""); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : am_cv_func_iconv=yes fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" @@ -20111,7 +21628,7 @@ rm -f core conftest.err conftest.$ac_objext \ #include #include int -main () +main (void) { iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); @@ -20120,35 +21637,38 @@ iconv_t cd = iconv_open("",""); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : am_cv_lib_iconv=yes am_cv_func_iconv=yes fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$am_save_LIBS" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -$as_echo "$am_cv_func_iconv" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +printf "%s\n" "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 -$as_echo_n "checking for working iconv... " >&6; } -if ${am_cv_func_iconv_works+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +printf %s "checking for working iconv... " >&6; } +if test ${am_cv_func_iconv_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : case "$host_os" in aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; esac -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -20209,9 +21729,10 @@ int main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : am_cv_func_iconv_works=yes -else +else $as_nop am_cv_func_iconv_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -20221,8 +21742,8 @@ fi LIBS="$am_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 -$as_echo "$am_cv_func_iconv_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +printf "%s\n" "$am_cv_func_iconv_works" >&6; } case "$am_cv_func_iconv_works" in *no) am_func_iconv=no am_cv_lib_iconv=no ;; *) am_func_iconv=yes ;; @@ -20232,14 +21753,14 @@ $as_echo "$am_cv_func_iconv_works" >&6; } fi if test "$am_func_iconv" = yes; then -$as_echo "#define HAVE_ICONV 1" >>confdefs.h +printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h fi if test "$am_cv_lib_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 -$as_echo_n "checking how to link with libiconv... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 -$as_echo "$LIBICONV" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +printf %s "checking how to link with libiconv... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +printf "%s\n" "$LIBICONV" >&6; } else CPPFLAGS="$am_save_CPPFLAGS" LIBICONV= @@ -20268,7 +21789,8 @@ $as_echo "$LIBICONV" >&6; } # Check whether --with-libintl-prefix was given. -if test "${with_libintl_prefix+set}" = set; then : +if test ${with_libintl_prefix+y} +then : withval=$with_libintl_prefix; if test "X$withval" = "Xno"; then use_additional=no @@ -20684,11 +22206,12 @@ fi done fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 -$as_echo_n "checking for GNU gettext in libintl... " >&6; } -if eval \${$gt_func_gnugettext_libintl+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +printf %s "checking for GNU gettext in libintl... " >&6; } +if eval test \${$gt_func_gnugettext_libintl+y} +then : + printf %s "(cached) " >&6 +else $as_nop gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" @@ -20704,7 +22227,7 @@ extern #endif const char *_nl_expand_alias (const char *); int -main () +main (void) { bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") @@ -20712,12 +22235,13 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$gt_func_gnugettext_libintl=yes" -else +else $as_nop eval "$gt_func_gnugettext_libintl=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" @@ -20732,7 +22256,7 @@ extern #endif const char *_nl_expand_alias (const char *); int -main () +main (void) { bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") @@ -20740,21 +22264,22 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" eval "$gt_func_gnugettext_libintl=yes" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" fi eval ac_res=\$$gt_func_gnugettext_libintl - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } fi if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ @@ -20781,20 +22306,20 @@ $as_echo "$ac_res" >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then -$as_echo "#define ENABLE_NLS 1" >>confdefs.h +printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h else USE_NLS=no fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 -$as_echo_n "checking whether to use NLS... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +printf %s "checking whether to use NLS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +printf "%s\n" "$USE_NLS" >&6; } if test "$USE_NLS" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 -$as_echo_n "checking where the gettext function comes from... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +printf %s "checking where the gettext function comes from... " >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" @@ -20804,18 +22329,18 @@ $as_echo_n "checking where the gettext function comes from... " >&6; } else gt_source="included intl directory" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 -$as_echo "$gt_source" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +printf "%s\n" "$gt_source" >&6; } fi if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 -$as_echo_n "checking how to link with libintl... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 -$as_echo "$LIBINTL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +printf %s "checking how to link with libintl... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +printf "%s\n" "$LIBINTL" >&6; } for element in $INCINTL; do haveit= @@ -20842,10 +22367,10 @@ $as_echo "$LIBINTL" >&6; } fi -$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h +printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h -$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h +printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h fi @@ -20866,9 +22391,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h GETTEXT_PACKAGE=NetworkManager -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -_ACEOF +printf "%s\n" "#define GETTEXT_PACKAGE \"$GETTEXT_PACKAGE\"" >>confdefs.h # autoconf 2.70 adds option --runstatedir. To make the directory also configurable @@ -20877,11 +22400,13 @@ _ACEOF # instead use --runstatedir. # Check whether --with-runstatedir was given. -if test "${with_runstatedir+set}" = set; then : +if test ${with_runstatedir+y} +then : withval=$with_runstatedir; runstatedir="$withval" fi -if test -z "$runstatedir"; then : +if test -z "$runstatedir" +then : runstatedir="$localstatedir/run" fi @@ -20900,42 +22425,49 @@ nmstatedir='${localstatedir}'/lib/$PACKAGE nmrundir='${runstatedir}'/$PACKAGE -for ac_func in __secure_getenv secure_getenv -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "__secure_getenv" "ac_cv_func___secure_getenv" +if test "x$ac_cv_func___secure_getenv" = xyes +then : + printf "%s\n" "#define HAVE___SECURE_GETENV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "secure_getenv" "ac_cv_func_secure_getenv" +if test "x$ac_cv_func_secure_getenv" = xyes +then : + printf "%s\n" "#define HAVE_SECURE_GETENV 1" >>confdefs.h fi -done # Alternative configuration plugins # Check whether --enable-ifcfg-rh was given. -if test "${enable_ifcfg_rh+set}" = set; then : +if test ${enable_ifcfg_rh+y} +then : enableval=$enable_ifcfg_rh; fi # Check whether --enable-ifupdown was given. -if test "${enable_ifupdown+set}" = set; then : +if test ${enable_ifupdown+y} +then : enableval=$enable_ifupdown; fi # Default alternative plugins by distribution -if test -z "$enable_ifcfg_rh" -a -d /etc/sysconfig/network-scripts; then : +if test -z "$enable_ifcfg_rh" -a -d /etc/sysconfig/network-scripts +then : enable_ifcfg_rh=yes fi -if test -z "$enable_ifupdown" -a -f /etc/debian_version; then : +if test -z "$enable_ifupdown" -a -f /etc/debian_version +then : enable_ifupdown=yes fi # Otherwise, plugins default to "no" -if test -z "$enable_ifcfg_rh"; then : +if test -z "$enable_ifcfg_rh" +then : enable_ifcfg_rh=no fi -if test -z "$enable_ifupdown"; then : +if test -z "$enable_ifupdown" +then : enable_ifupdown=no fi # Create automake conditionals @@ -20958,17 +22490,16 @@ fi # Check whether --with-config-plugins-default was given. -if test "${with_config_plugins_default+set}" = set; then : +if test ${with_config_plugins_default+y} +then : withval=$with_config_plugins_default; config_plugins_default="$withval" -else +else $as_nop config_plugins_default="" fi -cat >>confdefs.h <<_ACEOF -#define NM_CONFIG_DEFAULT_MAIN_PLUGINS "$config_plugins_default" -_ACEOF +printf "%s\n" "#define NM_CONFIG_DEFAULT_MAIN_PLUGINS \"$config_plugins_default\"" >>confdefs.h if test "$enable_ifcfg_rh" = "yes"; then @@ -20978,32 +22509,33 @@ fi if test "$enable_ifcfg_rh" = yes; then -$as_echo "#define WITH_CONFIG_PLUGIN_IFCFG_RH 1" >>confdefs.h +printf "%s\n" "#define WITH_CONFIG_PLUGIN_IFCFG_RH 1" >>confdefs.h else -$as_echo "#define WITH_CONFIG_PLUGIN_IFCFG_RH 0" >>confdefs.h +printf "%s\n" "#define WITH_CONFIG_PLUGIN_IFCFG_RH 0" >>confdefs.h fi if test "$enable_ifupdown" = yes; then -$as_echo "#define WITH_CONFIG_PLUGIN_IFUPDOWN 1" >>confdefs.h +printf "%s\n" "#define WITH_CONFIG_PLUGIN_IFUPDOWN 1" >>confdefs.h else -$as_echo "#define WITH_CONFIG_PLUGIN_IFUPDOWN 0" >>confdefs.h +printf "%s\n" "#define WITH_CONFIG_PLUGIN_IFUPDOWN 0" >>confdefs.h fi # Code coverage - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 -$as_echo_n "checking whether to build with code coverage support... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 +printf %s "checking whether to build with code coverage support... " >&6; } # Check whether --enable-code-coverage was given. -if test "${enable_code_coverage+set}" = set; then : +if test ${enable_code_coverage+y} +then : enableval=$enable_code_coverage; -else +else $as_nop enable_code_coverage=no fi @@ -21017,12 +22549,14 @@ fi CODE_COVERAGE_ENABLED=$enable_code_coverage - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_code_coverage" >&5 -$as_echo "$enable_code_coverage" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_code_coverage" >&5 +printf "%s\n" "$enable_code_coverage" >&6; } - if test "$enable_code_coverage" = "yes" ; then : + if test "$enable_code_coverage" = "yes" +then : - if test "$GCC" = "no" ; then : + if test "$GCC" = "no" +then : as_fn_error $? "not compiling with gcc, which is required for gcov code coverage" "$LINENO" 5 @@ -21030,11 +22564,12 @@ fi # Extract the first word of "lcov", so it can be a program name with args. set dummy lcov; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LCOV+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LCOV+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LCOV"; then ac_cv_prog_LCOV="$LCOV" # Let the user override the test. else @@ -21042,11 +22577,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LCOV="lcov" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21057,21 +22596,22 @@ fi fi LCOV=$ac_cv_prog_LCOV if test -n "$LCOV"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 -$as_echo "$LCOV" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 +printf "%s\n" "$LCOV" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "genhtml", so it can be a program name with args. set dummy genhtml; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GENHTML+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_GENHTML+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$GENHTML"; then ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. else @@ -21079,11 +22619,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_GENHTML="genhtml" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21094,22 +22638,24 @@ fi fi GENHTML=$ac_cv_prog_GENHTML if test -n "$GENHTML"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 -$as_echo "$GENHTML" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 +printf "%s\n" "$GENHTML" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - if test -z "$LCOV" ; then : + if test -z "$LCOV" +then : as_fn_error $? "lcov is needed to enable code coverage reporting" "$LINENO" 5 fi - if test -z "$GENHTML" ; then : + if test -z "$GENHTML" +then : as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 @@ -21204,22 +22750,22 @@ DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage # Check whether --with-dist-version was given. -if test "${with_dist_version+set}" = set; then : +if test ${with_dist_version+y} +then : withval=$with_dist_version; ac_distver=$withval -else +else $as_nop ac_distver=$NM_VERSION fi -cat >>confdefs.h <<_ACEOF -#define NM_DIST_VERSION "$ac_distver" -_ACEOF +printf "%s\n" "#define NM_DIST_VERSION \"$ac_distver\"" >>confdefs.h NM_DIST_VERSION="$ac_distver" # Check whether --enable-wifi was given. -if test "${enable_wifi+set}" = set; then : +if test ${enable_wifi+y} +then : enableval=$enable_wifi; fi @@ -21237,9 +22783,10 @@ fi # Check whether --with-wext was given. -if test "${with_wext+set}" = set; then : +if test ${with_wext+y} +then : withval=$with_wext; ac_with_wext=$withval -else +else $as_nop ac_with_wext="$enable_wifi" fi @@ -21251,11 +22798,11 @@ if test x"$ac_with_wext" = x"yes"; then as_fn_error $? "Enabling WEXT support and disabling Wi-Fi makes no sense" "$LINENO" 5 fi -$as_echo "#define HAVE_WEXT 1" >>confdefs.h +printf "%s\n" "#define HAVE_WEXT 1" >>confdefs.h else -$as_echo "#define HAVE_WEXT 0" >>confdefs.h +printf "%s\n" "#define HAVE_WEXT 0" >>confdefs.h fi if test x"${ac_with_wext}" = x"yes"; then @@ -21269,9 +22816,10 @@ fi # Check whether --with-iwd was given. -if test "${with_iwd+set}" = set; then : +if test ${with_iwd+y} +then : withval=$with_iwd; ac_with_iwd=$withval -else +else $as_nop ac_with_iwd="no" fi @@ -21283,11 +22831,11 @@ if test x"$ac_with_iwd" = x"yes"; then as_fn_error $? "Enabling IWD support and disabling Wi-Fi makes no sense" "$LINENO" 5 fi -$as_echo "#define WITH_IWD 1" >>confdefs.h +printf "%s\n" "#define WITH_IWD 1" >>confdefs.h else -$as_echo "#define WITH_IWD 0" >>confdefs.h +printf "%s\n" "#define WITH_IWD 0" >>confdefs.h fi if test x"${ac_with_iwd}" = x"yes"; then @@ -21299,11 +22847,12 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 -$as_echo_n "checking for library containing dlopen... " >&6; } -if ${ac_cv_search_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +printf %s "checking for library containing dlopen... " >&6; } +if test ${ac_cv_search_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21311,46 +22860,48 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -for ac_lib in '' dl dld; do +for ac_lib in '' dl dld +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_dlopen=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_dlopen+:} false; then : + if test ${ac_cv_search_dlopen+y} +then : break fi done -if ${ac_cv_search_dlopen+:} false; then : +if test ${ac_cv_search_dlopen+y} +then : -else +else $as_nop ac_cv_search_dlopen=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 -$as_echo "$ac_cv_search_dlopen" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +printf "%s\n" "$ac_cv_search_dlopen" >&6; } ac_res=$ac_cv_search_dlopen -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_cv_search_dlopen" = "none required" || DL_LIBS="$ac_cv_search_dlopen" fi @@ -21368,11 +22919,12 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -21382,11 +22934,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21398,11 +22954,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -21411,11 +22967,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -21425,11 +22982,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -21441,11 +23002,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -21453,8 +23014,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -21466,30 +23027,30 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 -$as_echo_n "checking for GLIB... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 +printf %s "checking for GLIB... " >&6; } if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.37.6 gmodule-2.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.37.6 gmodule-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.37.6 gmodule-2.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.37.6 gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21503,10 +23064,10 @@ if test -n "$GLIB_LIBS"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.37.6 gmodule-2.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.37.6 gmodule-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.37.6 gmodule-2.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.37.6 gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21520,8 +23081,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -21538,17 +23099,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 -$as_echo_n "checking for GLIB... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 +printf %s "checking for GLIB... " >&6; } if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.40 gmodule-2.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21562,10 +23123,10 @@ if test -n "$GLIB_LIBS"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.40 gmodule-2.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21579,8 +23140,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -21606,10 +23167,10 @@ Alternatively, you may set the environment variables GLIB_CFLAGS and GLIB_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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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. @@ -21623,28 +23184,28 @@ See \`config.log' for more details" "$LINENO" 5; } else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi LOG_DRIVER='$(top_srcdir)/build-aux/test-driver' elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 -$as_echo_n "checking for GLIB... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 +printf %s "checking for GLIB... " >&6; } if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.40 gmodule-2.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21658,10 +23219,10 @@ if test -n "$GLIB_LIBS"; then pkg_cv_GLIB_LIBS="$GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.40 gmodule-2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.40 gmodule-2.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.40 gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21675,8 +23236,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -21702,10 +23263,10 @@ Alternatively, you may set the environment variables GLIB_CFLAGS and GLIB_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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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. @@ -21719,8 +23280,8 @@ See \`config.log' for more details" "$LINENO" 5; } else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi LOG_DRIVER='$(top_srcdir)/build-aux/test-driver' @@ -21728,8 +23289,8 @@ fi else GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS GLIB_LIBS=$pkg_cv_GLIB_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } LOG_DRIVER='$(top_srcdir)/build-aux/tap-driver.sh' AM_TESTS_FD_REDIRECT='--tap' @@ -21745,9 +23306,10 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_V # Check whether --enable-introspection was given. -if test "${enable_introspection+set}" = set; then : +if test ${enable_introspection+y} +then : enableval=$enable_introspection; -else +else $as_nop enable_introspection=auto fi @@ -21762,10 +23324,10 @@ fi found_introspection="no" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.6\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.6\""; } >&5 ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.6") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` @@ -21777,15 +23339,15 @@ fi INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $INTROSPECTION_SCANNER works" >&5 -$as_echo_n "checking if $INTROSPECTION_SCANNER works... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $INTROSPECTION_SCANNER works" >&5 +printf %s "checking if $INTROSPECTION_SCANNER works... " >&6; } if CFLAGS="${CFLAGS} -Wno-error" "$INTROSPECTION_SCANNER" --namespace=test --library=c /dev/null --output /dev/null >&5 2>&5; then found_introspection=yes else found_introspection="no (compiler failure -- check config.log)" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 -$as_echo "$found_introspection" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5 +printf "%s\n" "$found_introspection" >&6; } else found_introspection="no (not installed)" @@ -21823,17 +23385,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5 -$as_echo_n "checking for LIBUDEV... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5 +printf %s "checking for LIBUDEV... " >&6; } if test -n "$LIBUDEV_CFLAGS"; then pkg_cv_LIBUDEV_CFLAGS="$LIBUDEV_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 175\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 175\""; } >&5 ($PKG_CONFIG --exists --print-errors "libudev >= 175") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBUDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 175" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21847,10 +23409,10 @@ if test -n "$LIBUDEV_LIBS"; then pkg_cv_LIBUDEV_LIBS="$LIBUDEV_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 175\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 175\""; } >&5 ($PKG_CONFIG --exists --print-errors "libudev >= 175") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBUDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 175" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21864,8 +23426,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -21891,10 +23453,10 @@ Alternatively, you may set the environment variables LIBUDEV_CFLAGS and LIBUDEV_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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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. @@ -21908,25 +23470,25 @@ See \`config.log' for more details" "$LINENO" 5; } else LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi # Qt4 pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT" >&5 -$as_echo_n "checking for QT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QT" >&5 +printf %s "checking for QT... " >&6; } if test -n "$QT_CFLAGS"; then pkg_cv_QT_CFLAGS="$QT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4 QtDBus QtNetwork\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4 QtDBus QtNetwork\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtCore >= 4 QtDBus QtNetwork") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "QtCore >= 4 QtDBus QtNetwork" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21940,10 +23502,10 @@ if test -n "$QT_LIBS"; then pkg_cv_QT_LIBS="$QT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4 QtDBus QtNetwork\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4 QtDBus QtNetwork\""; } >&5 ($PKG_CONFIG --exists --print-errors "QtCore >= 4 QtDBus QtNetwork") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "QtCore >= 4 QtDBus QtNetwork" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -21957,8 +23519,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -21975,20 +23537,21 @@ fi have_qt=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_qt=no else QT_CFLAGS=$pkg_cv_QT_CFLAGS QT_LIBS=$pkg_cv_QT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_qt=yes fi # Check whether --enable-qt was given. -if test "${enable_qt+set}" = set; then : +if test ${enable_qt+y} +then : enableval=$enable_qt; enable_qt=${enableval} -else +else $as_nop enable_qt=${have_qt} fi @@ -22002,11 +23565,12 @@ if test "${enable_qt}" = "yes"; then 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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MOC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$MOC"; then ac_cv_prog_MOC="$MOC" # Let the user override the test. else @@ -22015,11 +23579,15 @@ as_dummy="$QT4_BINDIR:$PATH" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$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 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -22030,11 +23598,11 @@ 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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5 +printf "%s\n" "$MOC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -22053,9 +23621,10 @@ fi # Check whether --with-udev-dir was given. -if test "${with_udev_dir+set}" = set; then : +if test ${with_udev_dir+y} +then : withval=$with_udev_dir; -else +else $as_nop with_udev_dir="yes" fi @@ -22081,15 +23650,18 @@ fi # systemd unit support # Check whether --with-systemdsystemunitdir was given. -if test "${with_systemdsystemunitdir+set}" = set; then : +if test ${with_systemdsystemunitdir+y} +then : withval=$with_systemdsystemunitdir; fi # default location -if test -z "$with_systemdsystemunitdir" && $PKG_CONFIG systemd; then : +if test -z "$with_systemdsystemunitdir" && $PKG_CONFIG systemd +then : with_systemdsystemunitdir=`$PKG_CONFIG systemd '--define-variable=prefix=${prefix}' '--define-variable=root_prefix=${prefix}' --variable systemdsystemunitdir` fi -if test -z "$with_systemdsystemunitdir"; then : +if test -z "$with_systemdsystemunitdir" +then : with_systemdsystemunitdir=no fi # add conditional and subst @@ -22108,17 +23680,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_200" >&5 -$as_echo_n "checking for SYSTEMD_200... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_200" >&5 +printf %s "checking for SYSTEMD_200... " >&6; } if test -n "$SYSTEMD_200_CFLAGS"; then pkg_cv_SYSTEMD_200_CFLAGS="$SYSTEMD_200_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 200\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 200\""; } >&5 ($PKG_CONFIG --exists --print-errors "systemd >= 200") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_200_CFLAGS=`$PKG_CONFIG --cflags "systemd >= 200" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22132,10 +23704,10 @@ if test -n "$SYSTEMD_200_LIBS"; then pkg_cv_SYSTEMD_200_LIBS="$SYSTEMD_200_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 200\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"systemd >= 200\""; } >&5 ($PKG_CONFIG --exists --print-errors "systemd >= 200") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_200_LIBS=`$PKG_CONFIG --libs "systemd >= 200" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22149,8 +23721,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -22167,14 +23739,14 @@ fi have_systemd_200=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_systemd_200=no else SYSTEMD_200_CFLAGS=$pkg_cv_SYSTEMD_200_CFLAGS SYSTEMD_200_LIBS=$pkg_cv_SYSTEMD_200_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_systemd_200=yes fi if test "${have_systemd_200}" = "yes"; then @@ -22189,64 +23761,73 @@ fi # Hostname persist mode # Check whether --with-hostname-persist was given. -if test "${with_hostname_persist+set}" = set; then : +if test ${with_hostname_persist+y} +then : withval=$with_hostname_persist; fi -if test "$with_hostname_persist" = "suse"; then : +if test "$with_hostname_persist" = "suse" +then : hostname_persist=suse fi -if test "$with_hostname_persist" = "gentoo"; then : +if test "$with_hostname_persist" = "gentoo" +then : hostname_persist=gentoo fi -if test "$with_hostname_persist" = "slackware"; then : +if test "$with_hostname_persist" = "slackware" +then : hostname_persist=slackware fi -if test "$with_hostname_persist" = "default"; then : +if test "$with_hostname_persist" = "default" +then : hostname_persist=default fi # if the method was not explicitly set, try to guess it from the enabled plugins -if test -z "$hostname_persist" -a -f /etc/SuSE-release; then : +if test -z "$hostname_persist" -a -f /etc/SuSE-release +then : hostname_persist=suse fi -if test -z "$hostname_persist" -a -f /etc/gentoo-release; then : +if test -z "$hostname_persist" -a -f /etc/gentoo-release +then : hostname_persist=gentoo fi -if test -z "$hostname_persist" -a -f /etc/slackware-version; then : +if test -z "$hostname_persist" -a -f /etc/slackware-version +then : hostname_persist=slackware fi -if test -z "$hostname_persist"; then : +if test -z "$hostname_persist" +then : hostname_persist=default fi if test "$hostname_persist" = suse; then -$as_echo "#define HOSTNAME_PERSIST_SUSE 1" >>confdefs.h +printf "%s\n" "#define HOSTNAME_PERSIST_SUSE 1" >>confdefs.h elif test "$hostname_persist" = gentoo; then -$as_echo "#define HOSTNAME_PERSIST_GENTOO 1" >>confdefs.h +printf "%s\n" "#define HOSTNAME_PERSIST_GENTOO 1" >>confdefs.h elif test "$hostname_persist" = slackware; then -$as_echo "#define HOSTNAME_PERSIST_SLACKWARE 1" >>confdefs.h +printf "%s\n" "#define HOSTNAME_PERSIST_SLACKWARE 1" >>confdefs.h fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5 -$as_echo_n "checking for LIBSYSTEMD... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5 +printf %s "checking for LIBSYSTEMD... " >&6; } if test -n "$LIBSYSTEMD_CFLAGS"; then pkg_cv_LIBSYSTEMD_CFLAGS="$LIBSYSTEMD_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 >= 209\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBSYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22260,10 +23841,10 @@ if test -n "$LIBSYSTEMD_LIBS"; then pkg_cv_LIBSYSTEMD_LIBS="$LIBSYSTEMD_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 >= 209\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBSYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22277,8 +23858,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -22294,27 +23875,28 @@ fi echo "$LIBSYSTEMD_PKG_ERRORS" >&5 -$as_echo "#define HAVE_LIBSYSTEMD 0" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSYSTEMD 0" >>confdefs.h elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } -$as_echo "#define HAVE_LIBSYSTEMD 0" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSYSTEMD 0" >>confdefs.h else LIBSYSTEMD_CFLAGS=$pkg_cv_LIBSYSTEMD_CFLAGS LIBSYSTEMD_LIBS=$pkg_cv_LIBSYSTEMD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -$as_echo "#define HAVE_LIBSYSTEMD 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBSYSTEMD 1" >>confdefs.h fi # Check whether --with-systemd-journal was given. -if test "${with_systemd_journal+set}" = set; then : +if test ${with_systemd_journal+y} +then : withval=$with_systemd_journal; fi @@ -22322,17 +23904,17 @@ have_systemd_journal=no if test "$with_systemd_journal" != "no"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 -$as_echo_n "checking for SYSTEMD_JOURNAL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 +printf %s "checking for SYSTEMD_JOURNAL... " >&6; } if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_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 >= 209\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_JOURNAL_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22346,10 +23928,10 @@ if test -n "$SYSTEMD_JOURNAL_LIBS"; then pkg_cv_SYSTEMD_JOURNAL_LIBS="$SYSTEMD_JOURNAL_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 >= 209\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_JOURNAL_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22363,8 +23945,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -22381,17 +23963,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 -$as_echo_n "checking for SYSTEMD_JOURNAL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 +printf %s "checking for SYSTEMD_JOURNAL... " >&6; } if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_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-journal\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-journal\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-journal") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_JOURNAL_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-journal" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22405,10 +23987,10 @@ if test -n "$SYSTEMD_JOURNAL_LIBS"; then pkg_cv_SYSTEMD_JOURNAL_LIBS="$SYSTEMD_JOURNAL_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-journal\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-journal\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-journal") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_JOURNAL_LIBS=`$PKG_CONFIG --libs "libsystemd-journal" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22422,8 +24004,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -22440,32 +24022,32 @@ fi have_systemd_journal=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_systemd_journal=no else SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_systemd_journal=yes fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 -$as_echo_n "checking for SYSTEMD_JOURNAL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_JOURNAL" >&5 +printf %s "checking for SYSTEMD_JOURNAL... " >&6; } if test -n "$SYSTEMD_JOURNAL_CFLAGS"; then pkg_cv_SYSTEMD_JOURNAL_CFLAGS="$SYSTEMD_JOURNAL_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-journal\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-journal\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-journal") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_JOURNAL_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-journal" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22479,10 +24061,10 @@ if test -n "$SYSTEMD_JOURNAL_LIBS"; then pkg_cv_SYSTEMD_JOURNAL_LIBS="$SYSTEMD_JOURNAL_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-journal\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-journal\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-journal") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_JOURNAL_LIBS=`$PKG_CONFIG --libs "libsystemd-journal" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22496,8 +24078,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -22514,21 +24096,21 @@ fi have_systemd_journal=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_systemd_journal=no else SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_systemd_journal=yes fi else SYSTEMD_JOURNAL_CFLAGS=$pkg_cv_SYSTEMD_JOURNAL_CFLAGS SYSTEMD_JOURNAL_LIBS=$pkg_cv_SYSTEMD_JOURNAL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_systemd_journal=yes fi if test "$have_systemd_journal" != "yes"; then @@ -22539,19 +24121,20 @@ fi fi if test "$have_systemd_journal" = "yes"; then -$as_echo "#define SYSTEMD_JOURNAL 1" >>confdefs.h +printf "%s\n" "#define SYSTEMD_JOURNAL 1" >>confdefs.h else -$as_echo "#define SYSTEMD_JOURNAL 0" >>confdefs.h +printf "%s\n" "#define SYSTEMD_JOURNAL 0" >>confdefs.h fi # Check whether --with-config-logging-backend-default was given. -if test "${with_config_logging_backend_default+set}" = set; then : +if test ${with_config_logging_backend_default+y} +then : withval=$with_config_logging_backend_default; nm_config_logging_backend_default="$withval" -else +else $as_nop nm_config_logging_backend_default="" fi @@ -22570,18 +24153,17 @@ if test "$nm_config_logging_backend_default" = ""; then fi fi -cat >>confdefs.h <<_ACEOF -#define NM_CONFIG_DEFAULT_LOGGING_BACKEND "$nm_config_logging_backend_default" -_ACEOF +printf "%s\n" "#define NM_CONFIG_DEFAULT_LOGGING_BACKEND \"$nm_config_logging_backend_default\"" >>confdefs.h NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT="$nm_config_logging_backend_default" # Check whether --with-config-wifi-backend-default was given. -if test "${with_config_wifi_backend_default+set}" = set; then : +if test ${with_config_wifi_backend_default+y} +then : withval=$with_config_wifi_backend_default; nm_config_wifi_backend_default="$withval" -else +else $as_nop nm_config_wifi_backend_default="wpa_supplicant" fi @@ -22596,9 +24178,7 @@ if test "$nm_config_wifi_backend_default" = "iwd"; then fi fi -cat >>confdefs.h <<_ACEOF -#define NM_CONFIG_DEFAULT_WIFI_BACKEND "$nm_config_wifi_backend_default" -_ACEOF +printf "%s\n" "#define NM_CONFIG_DEFAULT_WIFI_BACKEND \"$nm_config_wifi_backend_default\"" >>confdefs.h NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT="$nm_config_wifi_backend_default" @@ -22606,53 +24186,66 @@ NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT="$nm_config_wifi_backend_default" # Session tracking support # Check whether --with-systemd-logind was given. -if test "${with_systemd_logind+set}" = set; then : +if test ${with_systemd_logind+y} +then : withval=$with_systemd_logind; fi # Check whether --with-consolekit was given. -if test "${with_consolekit+set}" = set; then : +if test ${with_consolekit+y} +then : withval=$with_consolekit; fi # Check whether --with-session-tracking was given. -if test "${with_session_tracking+set}" = set; then : +if test ${with_session_tracking+y} +then : withval=$with_session_tracking; fi # backwards compatibility -if test "$with_session_tracking" = "ck"; then : +if test "$with_session_tracking" = "ck" +then : use_consolekit="yes" use_systemd_logind="no" use_elogind="no" fi -if test "$with_session_tracking" = "consolekit"; then : +if test "$with_session_tracking" = "consolekit" +then : use_consolekit="yes" use_systemd_logind="no" use_elogind="no" fi -if test "$with_session_tracking" = "systemd"; then : +if test "$with_session_tracking" = "systemd" +then : use_consolekit="no" use_systemd_logind="yes" use_elogind="no" fi -if test "$with_session_tracking" = "elogind"; then : +if test "$with_session_tracking" = "elogind" +then : use_consolekit="no" use_systemd_logind="no" use_elogind="yes" fi -if test "$with_session_tracking" = "no"; then : +if test "$with_session_tracking" = "no" +then : use_consolekit="no" use_systemd_logind="no" use_elogind="no" fi -if test "$with_session_tracking" = "none"; then : +if test "$with_session_tracking" = "none" +then : use_consolekit="no" use_systemd_logind="no" use_elogind="no" fi # current options -if test -n "$with_systemd_logind" ; then : +if test -n "$with_systemd_logind" +then : use_systemd_logind="$with_systemd_logind" fi -if test -n "$with_consolekit" ; then : +if test -n "$with_consolekit" +then : use_consolekit="$with_consolekit" fi # defaults -if test -z "$use_systemd_logind"; then : +if test -z "$use_systemd_logind" +then : use_systemd_logind="auto" fi -if test -z "$use_consolekit"; then : +if test -z "$use_consolekit" +then : use_consolekit="yes" fi # output @@ -22660,17 +24253,17 @@ session_tracking= if test "$use_systemd_logind" = "yes" -o "$use_systemd_logind" = "auto"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +printf %s "checking for SYSTEMD_LOGIN... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22684,10 +24277,10 @@ if test -n "$SYSTEMD_LOGIN_LIBS"; then pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22701,8 +24294,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -22719,17 +24312,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +printf %s "checking for SYSTEMD_LOGIN... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5 + { { printf "%s\n" "$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 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22743,10 +24336,10 @@ if test -n "$SYSTEMD_LOGIN_LIBS"; then pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5 + { { printf "%s\n" "$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 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22760,8 +24353,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -22778,32 +24371,32 @@ fi have_systemd_logind=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_systemd_logind=no else SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_systemd_logind=yes fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +printf %s "checking for SYSTEMD_LOGIN... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5 + { { printf "%s\n" "$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 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22817,10 +24410,10 @@ if test -n "$SYSTEMD_LOGIN_LIBS"; then pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login\""; } >&5 + { { printf "%s\n" "$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 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libsystemd-login" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22834,8 +24427,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -22852,21 +24445,21 @@ fi have_systemd_logind=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_systemd_logind=no else SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_systemd_logind=yes fi else SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_systemd_logind=yes fi else @@ -22877,12 +24470,12 @@ if test "$use_systemd_logind" = "yes" -a "$have_systemd_logind" = "no"; then fi if test "$have_systemd_logind" = "yes"; then -$as_echo "#define SESSION_TRACKING_SYSTEMD 1" >>confdefs.h +printf "%s\n" "#define SESSION_TRACKING_SYSTEMD 1" >>confdefs.h session_tracking="$session_tracking, systemd-logind" else -$as_echo "#define SESSION_TRACKING_SYSTEMD 0" >>confdefs.h +printf "%s\n" "#define SESSION_TRACKING_SYSTEMD 0" >>confdefs.h fi @@ -22892,17 +24485,17 @@ fi if test "$use_elogind" = "yes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +printf %s "checking for SYSTEMD_LOGIN... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22916,10 +24509,10 @@ if test -n "$SYSTEMD_LOGIN_LIBS"; then pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22933,8 +24526,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -22951,17 +24544,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +printf %s "checking for SYSTEMD_LOGIN... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22975,10 +24568,10 @@ if test -n "$SYSTEMD_LOGIN_LIBS"; then pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -22992,8 +24585,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23010,32 +24603,32 @@ fi have_elogind=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_elogind=no else SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_elogind=yes fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 -$as_echo_n "checking for SYSTEMD_LOGIN... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_LOGIN" >&5 +printf %s "checking for SYSTEMD_LOGIN... " >&6; } if test -n "$SYSTEMD_LOGIN_CFLAGS"; then pkg_cv_SYSTEMD_LOGIN_CFLAGS="$SYSTEMD_LOGIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_CFLAGS=`$PKG_CONFIG --cflags "libelogind" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23049,10 +24642,10 @@ if test -n "$SYSTEMD_LOGIN_LIBS"; then pkg_cv_SYSTEMD_LOGIN_LIBS="$SYSTEMD_LOGIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_LOGIN_LIBS=`$PKG_CONFIG --libs "libelogind" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23066,8 +24659,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23084,21 +24677,21 @@ fi have_elogind=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_elogind=no else SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_elogind=yes fi else SYSTEMD_LOGIN_CFLAGS=$pkg_cv_SYSTEMD_LOGIN_CFLAGS SYSTEMD_LOGIN_LIBS=$pkg_cv_SYSTEMD_LOGIN_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_elogind=yes fi else @@ -23109,47 +24702,48 @@ if test "$use_elogind" = "yes" -a "$have_elogind" = "no"; then fi if test "$have_elogind" = "yes"; then -$as_echo "#define SESSION_TRACKING_ELOGIND 1" >>confdefs.h +printf "%s\n" "#define SESSION_TRACKING_ELOGIND 1" >>confdefs.h session_tracking="$session_tracking, elogind" else -$as_echo "#define SESSION_TRACKING_ELOGIND 0" >>confdefs.h +printf "%s\n" "#define SESSION_TRACKING_ELOGIND 0" >>confdefs.h fi if test "$use_consolekit" = "yes"; then -$as_echo "#define SESSION_TRACKING_CONSOLEKIT 1" >>confdefs.h +printf "%s\n" "#define SESSION_TRACKING_CONSOLEKIT 1" >>confdefs.h session_tracking="$session_tracking, consolekit" else -$as_echo "#define SESSION_TRACKING_CONSOLEKIT 0" >>confdefs.h +printf "%s\n" "#define SESSION_TRACKING_CONSOLEKIT 0" >>confdefs.h fi session_tracking="$(printf '%s' "${session_tracking}" | sed 's/^, //')" # Check whether --with-suspend-resume was given. -if test "${with_suspend_resume+set}" = set; then : +if test ${with_suspend_resume+y} +then : withval=$with_suspend_resume; fi if test "z$with_suspend_resume" = "z"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then have_systemd_inhibit=yes else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then have_systemd_inhibit=yes else @@ -23161,18 +24755,18 @@ fi with_suspend_resume="systemd" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then have_elogind_inhibit=yes else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then have_elogind_inhibit=yes else @@ -23197,23 +24791,23 @@ fi case $with_suspend_resume in upower) -$as_echo "#define SUSPEND_RESUME_UPOWER 1" >>confdefs.h +printf "%s\n" "#define SUSPEND_RESUME_UPOWER 1" >>confdefs.h ;; systemd) pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 -$as_echo_n "checking for SYSTEMD_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 +printf %s "checking for SYSTEMD_INHIBIT... " >&6; } if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23227,10 +24821,10 @@ if test -n "$SYSTEMD_INHIBIT_LIBS"; then pkg_cv_SYSTEMD_INHIBIT_LIBS="$SYSTEMD_INHIBIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_INHIBIT_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23244,8 +24838,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23262,17 +24856,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 -$as_echo_n "checking for SYSTEMD_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 +printf %s "checking for SYSTEMD_INHIBIT... " >&6; } if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login >= 183" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23286,10 +24880,10 @@ if test -n "$SYSTEMD_INHIBIT_LIBS"; then pkg_cv_SYSTEMD_INHIBIT_LIBS="$SYSTEMD_INHIBIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_INHIBIT_LIBS=`$PKG_CONFIG --libs "libsystemd-login >= 183" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23303,8 +24897,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23330,10 +24924,10 @@ Alternatively, you may set the environment variables SYSTEMD_INHIBIT_CFLAGS and SYSTEMD_INHIBIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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. @@ -23347,26 +24941,26 @@ See \`config.log' for more details" "$LINENO" 5; } else SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 -$as_echo_n "checking for SYSTEMD_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD_INHIBIT" >&5 +printf %s "checking for SYSTEMD_INHIBIT... " >&6; } if test -n "$SYSTEMD_INHIBIT_CFLAGS"; then pkg_cv_SYSTEMD_INHIBIT_CFLAGS="$SYSTEMD_INHIBIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login >= 183" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23380,10 +24974,10 @@ if test -n "$SYSTEMD_INHIBIT_LIBS"; then pkg_cv_SYSTEMD_INHIBIT_LIBS="$SYSTEMD_INHIBIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 183\""; } >&5 ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 183") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SYSTEMD_INHIBIT_LIBS=`$PKG_CONFIG --libs "libsystemd-login >= 183" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23397,8 +24991,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23424,10 +25018,10 @@ Alternatively, you may set the environment variables SYSTEMD_INHIBIT_CFLAGS and SYSTEMD_INHIBIT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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. @@ -23441,35 +25035,35 @@ See \`config.log' for more details" "$LINENO" 5; } else SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi else SYSTEMD_INHIBIT_CFLAGS=$pkg_cv_SYSTEMD_INHIBIT_CFLAGS SYSTEMD_INHIBIT_LIBS=$pkg_cv_SYSTEMD_INHIBIT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -$as_echo "#define SUSPEND_RESUME_SYSTEMD 1" >>confdefs.h +printf "%s\n" "#define SUSPEND_RESUME_SYSTEMD 1" >>confdefs.h ;; elogind) pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 -$as_echo_n "checking for ELOGIND_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 +printf %s "checking for ELOGIND_INHIBIT... " >&6; } if test -n "$ELOGIND_INHIBIT_CFLAGS"; then pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ELOGIND_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libelogind >= 219" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23483,10 +25077,10 @@ if test -n "$ELOGIND_INHIBIT_LIBS"; then pkg_cv_ELOGIND_INHIBIT_LIBS="$ELOGIND_INHIBIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ELOGIND_INHIBIT_LIBS=`$PKG_CONFIG --libs "libelogind >= 219" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23500,8 +25094,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23518,17 +25112,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 -$as_echo_n "checking for ELOGIND_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 +printf %s "checking for ELOGIND_INHIBIT... " >&6; } if test -n "$ELOGIND_INHIBIT_CFLAGS"; then pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ELOGIND_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libelogind >= 219" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23542,10 +25136,10 @@ if test -n "$ELOGIND_INHIBIT_LIBS"; then pkg_cv_ELOGIND_INHIBIT_LIBS="$ELOGIND_INHIBIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ELOGIND_INHIBIT_LIBS=`$PKG_CONFIG --libs "libelogind >= 219" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23559,8 +25153,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23586,10 +25180,10 @@ Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS and ELOGIND_INHIBIT_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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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. @@ -23603,26 +25197,26 @@ See \`config.log' for more details" "$LINENO" 5; } else ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 -$as_echo_n "checking for ELOGIND_INHIBIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELOGIND_INHIBIT" >&5 +printf %s "checking for ELOGIND_INHIBIT... " >&6; } if test -n "$ELOGIND_INHIBIT_CFLAGS"; then pkg_cv_ELOGIND_INHIBIT_CFLAGS="$ELOGIND_INHIBIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ELOGIND_INHIBIT_CFLAGS=`$PKG_CONFIG --cflags "libelogind >= 219" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23636,10 +25230,10 @@ if test -n "$ELOGIND_INHIBIT_LIBS"; then pkg_cv_ELOGIND_INHIBIT_LIBS="$ELOGIND_INHIBIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelogind >= 219\""; } >&5 ($PKG_CONFIG --exists --print-errors "libelogind >= 219") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_ELOGIND_INHIBIT_LIBS=`$PKG_CONFIG --libs "libelogind >= 219" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23653,8 +25247,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23680,10 +25274,10 @@ Alternatively, you may set the environment variables ELOGIND_INHIBIT_CFLAGS and ELOGIND_INHIBIT_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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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. @@ -23697,24 +25291,24 @@ See \`config.log' for more details" "$LINENO" 5; } else ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi else ELOGIND_INHIBIT_CFLAGS=$pkg_cv_ELOGIND_INHIBIT_CFLAGS ELOGIND_INHIBIT_LIBS=$pkg_cv_ELOGIND_INHIBIT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -$as_echo "#define SUSPEND_RESUME_ELOGIND 1" >>confdefs.h +printf "%s\n" "#define SUSPEND_RESUME_ELOGIND 1" >>confdefs.h ;; consolekit) -$as_echo "#define SUSPEND_RESUME_CONSOLEKIT 1" >>confdefs.h +printf "%s\n" "#define SUSPEND_RESUME_CONSOLEKIT 1" >>confdefs.h ;; *) @@ -23725,22 +25319,23 @@ esac # eBPF support # Check whether --with-ebpf was given. -if test "${with_ebpf+set}" = set; then : +if test ${with_ebpf+y} +then : withval=$with_ebpf; -else +else $as_nop with_ebpf=auto fi # 'auto' means 'false' because there are still some issues. if test "$with_ebpf" = "yes" ; then - ac_fn_c_check_header_mongrel "$LINENO" "linux/bpf.h" "ac_cv_header_linux_bpf_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_bpf_h" = xyes; then : + ac_fn_c_check_header_compile "$LINENO" "linux/bpf.h" "ac_cv_header_linux_bpf_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_bpf_h" = xyes +then : have_ebpf=yes -else +else $as_nop have_ebpf=no fi - else have_ebpf=no fi @@ -23759,26 +25354,27 @@ fi # SELinux support # Check whether --with-selinux was given. -if test "${with_selinux+set}" = set; then : +if test ${with_selinux+y} +then : withval=$with_selinux; -else +else $as_nop with_selinux=auto fi if test "$with_selinux" = "yes" -o "$with_selinux" = "auto"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5 -$as_echo_n "checking for SELINUX... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5 +printf %s "checking for SELINUX... " >&6; } if test -n "$SELINUX_CFLAGS"; then pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags "libselinux" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23792,10 +25388,10 @@ if test -n "$SELINUX_LIBS"; then pkg_cv_SELINUX_LIBS="$SELINUX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libselinux\""; } >&5 ($PKG_CONFIG --exists --print-errors "libselinux") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs "libselinux" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23809,8 +25405,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23827,14 +25423,14 @@ fi have_selinux=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_selinux=no else SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS SELINUX_LIBS=$pkg_cv_SELINUX_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_selinux=yes fi else @@ -23845,37 +25441,38 @@ if test "$with_selinux" = "yes" -a "$have_selinux" = "no"; then fi if test "$have_selinux" = "yes"; then -$as_echo "#define HAVE_SELINUX 1" >>confdefs.h +printf "%s\n" "#define HAVE_SELINUX 1" >>confdefs.h else -$as_echo "#define HAVE_SELINUX 0" >>confdefs.h +printf "%s\n" "#define HAVE_SELINUX 0" >>confdefs.h fi # libaudit support # Check whether --with-libaudit was given. -if test "${with_libaudit+set}" = set; then : +if test ${with_libaudit+y} +then : withval=$with_libaudit; -else +else $as_nop with_libaudit=auto fi if test "$with_libaudit" = "yes" -o "$with_libaudit" = "yes-disabled-by-default" -o "$with_libaudit" = "auto"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBAUDIT" >&5 -$as_echo_n "checking for LIBAUDIT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBAUDIT" >&5 +printf %s "checking for LIBAUDIT... " >&6; } if test -n "$LIBAUDIT_CFLAGS"; then pkg_cv_LIBAUDIT_CFLAGS="$LIBAUDIT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audit\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audit\""; } >&5 ($PKG_CONFIG --exists --print-errors "audit") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBAUDIT_CFLAGS=`$PKG_CONFIG --cflags "audit" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23889,10 +25486,10 @@ if test -n "$LIBAUDIT_LIBS"; then pkg_cv_LIBAUDIT_LIBS="$LIBAUDIT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audit\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audit\""; } >&5 ($PKG_CONFIG --exists --print-errors "audit") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBAUDIT_LIBS=`$PKG_CONFIG --libs "audit" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23906,8 +25503,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -23924,14 +25521,14 @@ fi have_libaudit=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_libaudit=no else LIBAUDIT_CFLAGS=$pkg_cv_LIBAUDIT_CFLAGS LIBAUDIT_LIBS=$pkg_cv_LIBAUDIT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_libaudit=yes fi if test "$with_libaudit" != "auto" -a "$have_libaudit" = "no"; then @@ -23942,25 +25539,25 @@ else fi if test "$have_libaudit" = "yes"; then -$as_echo "#define HAVE_LIBAUDIT 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBAUDIT 1" >>confdefs.h if test "$with_libaudit" = "yes-disabled-by-default"; then -$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"false\"" >>confdefs.h +printf "%s\n" "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"false\"" >>confdefs.h NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false' else -$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"true\"" >>confdefs.h +printf "%s\n" "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"true\"" >>confdefs.h NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='true' fi else -$as_echo "#define HAVE_LIBAUDIT 0" >>confdefs.h +printf "%s\n" "#define HAVE_LIBAUDIT 0" >>confdefs.h -$as_echo "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"false\"" >>confdefs.h +printf "%s\n" "#define NM_CONFIG_DEFAULT_LOGGING_AUDIT \"false\"" >>confdefs.h NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT='false' fi @@ -23969,17 +25566,17 @@ fi # uuid library pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5 -$as_echo_n "checking for UUID... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for UUID" >&5 +printf %s "checking for UUID... " >&6; } if test -n "$UUID_CFLAGS"; then pkg_cv_UUID_CFLAGS="$UUID_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5 ($PKG_CONFIG --exists --print-errors "uuid") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UUID_CFLAGS=`$PKG_CONFIG --cflags "uuid" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -23993,10 +25590,10 @@ if test -n "$UUID_LIBS"; then pkg_cv_UUID_LIBS="$UUID_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5 ($PKG_CONFIG --exists --print-errors "uuid") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_UUID_LIBS=`$PKG_CONFIG --libs "uuid" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24010,8 +25607,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24037,10 +25634,10 @@ Alternatively, you may set the environment variables UUID_CFLAGS and UUID_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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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. @@ -24054,8 +25651,8 @@ See \`config.log' for more details" "$LINENO" 5; } else UUID_CFLAGS=$pkg_cv_UUID_CFLAGS UUID_LIBS=$pkg_cv_UUID_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -24063,17 +25660,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5 -$as_echo_n "checking for JANSSON... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JANSSON" >&5 +printf %s "checking for JANSSON... " >&6; } if test -n "$JANSSON_CFLAGS"; then pkg_cv_JANSSON_CFLAGS="$JANSSON_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.7\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.7\""; } >&5 ($PKG_CONFIG --exists --print-errors "jansson >= 2.7") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_JANSSON_CFLAGS=`$PKG_CONFIG --cflags "jansson >= 2.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24087,10 +25684,10 @@ if test -n "$JANSSON_LIBS"; then pkg_cv_JANSSON_LIBS="$JANSSON_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.7\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jansson >= 2.7\""; } >&5 ($PKG_CONFIG --exists --print-errors "jansson >= 2.7") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_JANSSON_LIBS=`$PKG_CONFIG --libs "jansson >= 2.7" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24104,8 +25701,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24122,19 +25719,19 @@ fi have_jansson=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_jansson=no 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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_jansson=yes fi if test "$have_jansson" = "yes"; then -$as_echo "#define WITH_JANSSON 1" >>confdefs.h +printf "%s\n" "#define WITH_JANSSON 1" >>confdefs.h if test -n "$ac_tool_prefix"; then @@ -24142,11 +25739,12 @@ $as_echo "#define WITH_JANSSON 1" >>confdefs.h do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$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_READELF+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_READELF+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$READELF"; then ac_cv_prog_READELF="$READELF" # Let the user override the test. else @@ -24154,11 +25752,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_READELF="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24169,11 +25771,11 @@ fi fi READELF=$ac_cv_prog_READELF if test -n "$READELF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5 -$as_echo "$READELF" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5 +printf "%s\n" "$READELF" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -24186,11 +25788,12 @@ if test -z "$READELF"; then 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_ac_ct_READELF+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_READELF+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_READELF"; then ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test. else @@ -24198,11 +25801,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_READELF="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24213,11 +25820,11 @@ fi fi ac_ct_READELF=$ac_cv_prog_ac_ct_READELF if test -n "$ac_ct_READELF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5 -$as_echo "$ac_ct_READELF" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5 +printf "%s\n" "$ac_ct_READELF" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -24229,8 +25836,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac READELF=$ac_ct_READELF @@ -24244,15 +25851,13 @@ fi as_fn_error $? "Unable to locate the Jansson library" "$LINENO" 5 fi -cat >>confdefs.h <<_ACEOF -#define JANSSON_SONAME "$JANSSON_SONAME" -_ACEOF +printf "%s\n" "#define JANSSON_SONAME \"$JANSSON_SONAME\"" >>confdefs.h else have_jansson=no JANSSON_SONAME= -$as_echo "#define WITH_JANSSON 0" >>confdefs.h +printf "%s\n" "#define WITH_JANSSON 0" >>confdefs.h fi if test "${have_jansson}" = "yes"; then @@ -24266,17 +25871,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTEAMDCTL" >&5 -$as_echo_n "checking for LIBTEAMDCTL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBTEAMDCTL" >&5 +printf %s "checking for LIBTEAMDCTL... " >&6; } if test -n "$LIBTEAMDCTL_CFLAGS"; then pkg_cv_LIBTEAMDCTL_CFLAGS="$LIBTEAMDCTL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libteamdctl >= 1.9\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libteamdctl >= 1.9\""; } >&5 ($PKG_CONFIG --exists --print-errors "libteamdctl >= 1.9") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBTEAMDCTL_CFLAGS=`$PKG_CONFIG --cflags "libteamdctl >= 1.9" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24290,10 +25895,10 @@ if test -n "$LIBTEAMDCTL_LIBS"; then pkg_cv_LIBTEAMDCTL_LIBS="$LIBTEAMDCTL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libteamdctl >= 1.9\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libteamdctl >= 1.9\""; } >&5 ($PKG_CONFIG --exists --print-errors "libteamdctl >= 1.9") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBTEAMDCTL_LIBS=`$PKG_CONFIG --libs "libteamdctl >= 1.9" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24307,8 +25912,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24325,14 +25930,14 @@ fi have_teamdctl=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_teamdctl=no else LIBTEAMDCTL_CFLAGS=$pkg_cv_LIBTEAMDCTL_CFLAGS LIBTEAMDCTL_LIBS=$pkg_cv_LIBTEAMDCTL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_teamdctl=yes fi if test "$have_jansson" = "yes" -a "$have_teamdctl" = "yes"; then @@ -24342,9 +25947,10 @@ else fi # Check whether --enable-teamdctl was given. -if test "${enable_teamdctl+set}" = set; then : +if test ${enable_teamdctl+y} +then : enableval=$enable_teamdctl; enable_teamdctl=${enableval} -else +else $as_nop enable_teamdctl=${have_team_prereq} fi @@ -24371,9 +25977,10 @@ fi # default configuration for main.auth-polkit. User can always enable/disable polkit # authorization via config. # Check whether --enable-polkit was given. -if test "${enable_polkit+set}" = set; then : +if test ${enable_polkit+y} +then : enableval=$enable_polkit; enable_polkit=${enableval} -else +else $as_nop enable_polkit=yes fi @@ -24385,18 +25992,17 @@ else enable_polkit=false fi -cat >>confdefs.h <<_ACEOF -#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT "$enable_polkit" -_ACEOF +printf "%s\n" "#define NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT \"$enable_polkit\"" >>confdefs.h NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT="$enable_polkit" # Check whether --with-polkit-agent-helper-1 was given. -if test "${with_polkit_agent_helper_1+set}" = set; then : +if test ${with_polkit_agent_helper_1+y} +then : withval=$with_polkit_agent_helper_1; POLKIT_AGENT_HELPER_1_PATH="$withval" -else +else $as_nop POLKIT_AGENT_HELPER_1_PATH="" fi @@ -24415,13 +26021,12 @@ if test "$POLKIT_AGENT_HELPER_1_PATH" = "${POLKIT_AGENT_HELPER_1_PATH#/}" ; then as_fn_error $? "\"polkit_agent_helper_1 must be an absolute path, but is '$POLKIT_AGENT_HELPER_1_PATH'\"" "$LINENO" 5 fi -cat >>confdefs.h <<_ACEOF -#define POLKIT_AGENT_HELPER_1_PATH "$POLKIT_AGENT_HELPER_1_PATH" -_ACEOF +printf "%s\n" "#define POLKIT_AGENT_HELPER_1_PATH \"$POLKIT_AGENT_HELPER_1_PATH\"" >>confdefs.h # Check whether --enable-modify-system was given. -if test "${enable_modify_system+set}" = set; then : +if test ${enable_modify_system+y} +then : enableval=$enable_modify_system; fi @@ -24433,20 +26038,21 @@ fi # Check whether --enable-firewalld-zone was given. -if test "${enable_firewalld_zone+set}" = set; then : +if test ${enable_firewalld_zone+y} +then : enableval=$enable_firewalld_zone; enable_firewalld_zone=${enableval} -else +else $as_nop enable_firewalld_zone=yes fi if test "${enable_firewalld_zone}" = "yes"; then -$as_echo "#define WITH_FIREWALLD_ZONE 1" >>confdefs.h +printf "%s\n" "#define WITH_FIREWALLD_ZONE 1" >>confdefs.h else -$as_echo "#define WITH_FIREWALLD_ZONE 0" >>confdefs.h +printf "%s\n" "#define WITH_FIREWALLD_ZONE 0" >>confdefs.h fi if test "${enable_firewalld_zone}" = "yes"; then @@ -24460,17 +26066,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5 -$as_echo_n "checking for GNUTLS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNUTLS" >&5 +printf %s "checking for GNUTLS... " >&6; } if test -n "$GNUTLS_CFLAGS"; then pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12\""; } >&5 ($PKG_CONFIG --exists --print-errors "gnutls >= 2.12") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.12" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24484,10 +26090,10 @@ if test -n "$GNUTLS_LIBS"; then pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.12\""; } >&5 ($PKG_CONFIG --exists --print-errors "gnutls >= 2.12") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.12" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24501,8 +26107,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24519,29 +26125,29 @@ fi have_crypto_gnutls=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_crypto_gnutls=no else GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_crypto_gnutls=yes fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5 -$as_echo_n "checking for NSS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5 +printf %s "checking for NSS... " >&6; } if test -n "$NSS_CFLAGS"; then pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5 ($PKG_CONFIG --exists --print-errors "nss") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24555,10 +26161,10 @@ if test -n "$NSS_LIBS"; then pkg_cv_NSS_LIBS="$NSS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5 ($PKG_CONFIG --exists --print-errors "nss") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24572,8 +26178,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24590,14 +26196,14 @@ fi have_crypto_nss=yes elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_crypto_nss=yes else NSS_CFLAGS=$pkg_cv_NSS_CFLAGS NSS_LIBS=$pkg_cv_NSS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_crypto_nss=yes fi if test "${have_crypto_nss}" = "yes"; then @@ -24626,9 +26232,10 @@ fi # Check whether --with-crypto was given. -if test "${with_crypto+set}" = set; then : +if test ${with_crypto+y} +then : withval=$with_crypto; with_crypto=$withval -else +else $as_nop with_crypto=nss fi @@ -24669,7 +26276,8 @@ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` # Check whether --with-dbus-sys-dir was given. -if test "${with_dbus_sys_dir+set}" = set; then : +if test ${with_dbus_sys_dir+y} +then : withval=$with_dbus_sys_dir; fi @@ -24683,34 +26291,33 @@ fi # pppd # Check whether --enable-ppp was given. -if test "${enable_ppp+set}" = set; then : +if test ${enable_ppp+y} +then : enableval=$enable_ppp; enable_ppp=${enableval} -else +else $as_nop enable_ppp=yes fi if test "${enable_ppp}" = "yes"; then - for ac_header in pppd/pppd.h + for ac_header in pppd/pppd.h do : - ac_fn_c_check_header_mongrel "$LINENO" "pppd/pppd.h" "ac_cv_header_pppd_pppd_h" "$ac_includes_default" -if test "x$ac_cv_header_pppd_pppd_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_PPPD_PPPD_H 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "pppd/pppd.h" "ac_cv_header_pppd_pppd_h" "$ac_includes_default" +if test "x$ac_cv_header_pppd_pppd_h" = xyes +then : + printf "%s\n" "#define HAVE_PPPD_PPPD_H 1" >>confdefs.h -else +else $as_nop as_fn_error $? "\"couldn't find pppd.h. pppd development headers are required.\"" "$LINENO" 5 fi done - -$as_echo "#define WITH_PPP 1" >>confdefs.h +printf "%s\n" "#define WITH_PPP 1" >>confdefs.h else -$as_echo "#define WITH_PPP 0" >>confdefs.h +printf "%s\n" "#define WITH_PPP 0" >>confdefs.h fi if test "${enable_ppp}" = "yes"; then @@ -24724,7 +26331,8 @@ fi # Check whether --with-pppd-plugin-dir was given. -if test "${with_pppd_plugin_dir+set}" = set; then : +if test ${with_pppd_plugin_dir+y} +then : withval=$with_pppd_plugin_dir; fi @@ -24738,18 +26346,20 @@ fi # Check whether --with-pppd was given. -if test "${with_pppd+set}" = set; then : +if test ${with_pppd+y} +then : withval=$with_pppd; fi if test "x${with_pppd}" = x; then # Extract the first word of "pppd", so it can be a program name with args. set dummy pppd; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PPPD_PATH+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PPPD_PATH+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PPPD_PATH in [\\/]* | ?:[\\/]*) ac_cv_path_PPPD_PATH="$PPPD_PATH" # Let the user override the test with a path. @@ -24760,11 +26370,15 @@ as_dummy="$PATH:/sbin:/usr/sbin" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PPPD_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PPPD_PATH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -24776,11 +26390,11 @@ esac fi PPPD_PATH=$ac_cv_path_PPPD_PATH if test -n "$PPPD_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PPPD_PATH" >&5 -$as_echo "$PPPD_PATH" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PPPD_PATH" >&5 +printf "%s\n" "$PPPD_PATH" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -24788,35 +26402,34 @@ else PPPD_PATH="$with_pppd" fi -cat >>confdefs.h <<_ACEOF -#define PPPD_PATH "$PPPD_PATH" -_ACEOF +printf "%s\n" "#define PPPD_PATH \"$PPPD_PATH\"" >>confdefs.h # ModemManager1 with libmm-glib # Check whether --with-modem-manager-1 was given. -if test "${with_modem_manager_1+set}" = set; then : +if test ${with_modem_manager_1+y} +then : withval=$with_modem_manager_1; -else +else $as_nop with_modem_manager_1=auto fi if test "${with_modem_manager_1}" != "no"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM_GLIB" >&5 -$as_echo_n "checking for MM_GLIB... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MM_GLIB" >&5 +printf %s "checking for MM_GLIB... " >&6; } if test -n "$MM_GLIB_CFLAGS"; then pkg_cv_MM_GLIB_CFLAGS="$MM_GLIB_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mm-glib >= 0.7.991\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mm-glib >= 0.7.991\""; } >&5 ($PKG_CONFIG --exists --print-errors "mm-glib >= 0.7.991") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MM_GLIB_CFLAGS=`$PKG_CONFIG --cflags "mm-glib >= 0.7.991" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24830,10 +26443,10 @@ if test -n "$MM_GLIB_LIBS"; then pkg_cv_MM_GLIB_LIBS="$MM_GLIB_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mm-glib >= 0.7.991\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mm-glib >= 0.7.991\""; } >&5 ($PKG_CONFIG --exists --print-errors "mm-glib >= 0.7.991") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MM_GLIB_LIBS=`$PKG_CONFIG --libs "mm-glib >= 0.7.991" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24847,8 +26460,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24865,14 +26478,14 @@ fi have_libmm_glib=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_libmm_glib=no else MM_GLIB_CFLAGS=$pkg_cv_MM_GLIB_CFLAGS MM_GLIB_LIBS=$pkg_cv_MM_GLIB_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_libmm_glib=yes fi @@ -24887,17 +26500,17 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOBILE_BROADBAND_PROVIDER_INFO" >&5 -$as_echo_n "checking for MOBILE_BROADBAND_PROVIDER_INFO... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MOBILE_BROADBAND_PROVIDER_INFO" >&5 +printf %s "checking for MOBILE_BROADBAND_PROVIDER_INFO... " >&6; } if test -n "$MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS"; then pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS="$MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mobile-broadband-provider-info\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mobile-broadband-provider-info\""; } >&5 ($PKG_CONFIG --exists --print-errors "mobile-broadband-provider-info") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS=`$PKG_CONFIG --cflags "mobile-broadband-provider-info" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24911,10 +26524,10 @@ if test -n "$MOBILE_BROADBAND_PROVIDER_INFO_LIBS"; then pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_LIBS="$MOBILE_BROADBAND_PROVIDER_INFO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mobile-broadband-provider-info\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mobile-broadband-provider-info\""; } >&5 ($PKG_CONFIG --exists --print-errors "mobile-broadband-provider-info") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_LIBS=`$PKG_CONFIG --libs "mobile-broadband-provider-info" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -24928,8 +26541,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -24946,20 +26559,18 @@ fi MOBILE_BROADBAND_PROVIDER_INFO_DATABASE="$prefix/share/mobile-broadband-provider-info/serviceproviders.xml" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } MOBILE_BROADBAND_PROVIDER_INFO_DATABASE="$prefix/share/mobile-broadband-provider-info/serviceproviders.xml" else MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS=$pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_CFLAGS MOBILE_BROADBAND_PROVIDER_INFO_LIBS=$pkg_cv_MOBILE_BROADBAND_PROVIDER_INFO_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } MOBILE_BROADBAND_PROVIDER_INFO_DATABASE=`$PKG_CONFIG --variable=database mobile-broadband-provider-info` fi -cat >>confdefs.h <<_ACEOF -#define MOBILE_BROADBAND_PROVIDER_INFO_DATABASE "$MOBILE_BROADBAND_PROVIDER_INFO_DATABASE" -_ACEOF +printf "%s\n" "#define MOBILE_BROADBAND_PROVIDER_INFO_DATABASE \"$MOBILE_BROADBAND_PROVIDER_INFO_DATABASE\"" >>confdefs.h fi fi @@ -24978,17 +26589,17 @@ fi # Bluez5 DUN support pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLUEZ5" >&5 -$as_echo_n "checking for BLUEZ5... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BLUEZ5" >&5 +printf %s "checking for BLUEZ5... " >&6; } if test -n "$BLUEZ5_CFLAGS"; then pkg_cv_BLUEZ5_CFLAGS="$BLUEZ5_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 5\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 5\""; } >&5 ($PKG_CONFIG --exists --print-errors "bluez >= 5") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BLUEZ5_CFLAGS=`$PKG_CONFIG --cflags "bluez >= 5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25002,10 +26613,10 @@ if test -n "$BLUEZ5_LIBS"; then pkg_cv_BLUEZ5_LIBS="$BLUEZ5_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 5\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez >= 5\""; } >&5 ($PKG_CONFIG --exists --print-errors "bluez >= 5") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BLUEZ5_LIBS=`$PKG_CONFIG --libs "bluez >= 5" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25019,8 +26630,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25037,20 +26648,21 @@ fi have_bluez5=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_bluez5=no else BLUEZ5_CFLAGS=$pkg_cv_BLUEZ5_CFLAGS BLUEZ5_LIBS=$pkg_cv_BLUEZ5_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_bluez5=yes fi # Check whether --enable-bluez5-dun was given. -if test "${enable_bluez5_dun+set}" = set; then : +if test ${enable_bluez5_dun+y} +then : enableval=$enable_bluez5_dun; enable_bluez5_dun=${enableval} -else +else $as_nop enable_bluez5_dun=${have_bluez5} fi @@ -25059,11 +26671,11 @@ if test "${enable_bluez5_dun}" = "yes"; then as_fn_error $? "Bluez 5.x development headers are required" "$LINENO" 5 fi -$as_echo "#define WITH_BLUEZ5_DUN 1" >>confdefs.h +printf "%s\n" "#define WITH_BLUEZ5_DUN 1" >>confdefs.h else -$as_echo "#define WITH_BLUEZ5_DUN 0" >>confdefs.h +printf "%s\n" "#define WITH_BLUEZ5_DUN 0" >>confdefs.h fi if test "${enable_bluez5_dun}" = "yes"; then @@ -25078,19 +26690,20 @@ fi # OFONO # Check whether --with-ofono was given. -if test "${with_ofono+set}" = set; then : +if test ${with_ofono+y} +then : withval=$with_ofono; -else +else $as_nop with_ofono=no fi if test "${with_ofono}" = "yes"; then -$as_echo "#define WITH_OFONO 1" >>confdefs.h +printf "%s\n" "#define WITH_OFONO 1" >>confdefs.h else -$as_echo "#define WITH_OFONO 0" >>confdefs.h +printf "%s\n" "#define WITH_OFONO 0" >>confdefs.h fi if test "${with_ofono}" = "yes"; then @@ -25105,7 +26718,8 @@ fi # DHCP client support with dhcpcanon # Check whether --with-dhcpcanon was given. -if test "${with_dhcpcanon+set}" = set; then : +if test ${with_dhcpcanon+y} +then : withval=$with_dhcpcanon; fi @@ -25115,11 +26729,12 @@ if test "$with_dhcpcanon" != "no"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_with_dhcpcanon+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_with_dhcpcanon+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $with_dhcpcanon in [\\/]* | ?:[\\/]*) ac_cv_path_with_dhcpcanon="$with_dhcpcanon" # Let the user override the test with a path. @@ -25130,11 +26745,15 @@ as_dummy="/sbin:/usr/sbin:/usr/local/sbin:/usr/bin:/usr/local/bin" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_with_dhcpcanon="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_with_dhcpcanon="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25146,11 +26765,11 @@ esac fi with_dhcpcanon=$ac_cv_path_with_dhcpcanon if test -n "$with_dhcpcanon"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dhcpcanon" >&5 -$as_echo "$with_dhcpcanon" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_dhcpcanon" >&5 +printf "%s\n" "$with_dhcpcanon" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -25160,30 +26779,29 @@ test -n "$with_dhcpcanon" || with_dhcpcanon="no" if test "$with_dhcpcanon" = "no"; then if test "$with_dhcpcanon_" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dhcpcanon not found, assume path /sbin/dhcpcanon" >&5 -$as_echo "$as_me: WARNING: dhcpcanon not found, assume path /sbin/dhcpcanon" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: dhcpcanon not found, assume path /sbin/dhcpcanon" >&5 +printf "%s\n" "$as_me: WARNING: dhcpcanon not found, assume path /sbin/dhcpcanon" >&2;} with_dhcpcanon=/sbin/dhcpcanon fi fi fi if test "$with_dhcpcanon" != "no"; then -$as_echo "#define WITH_DHCPCANON 1" >>confdefs.h +printf "%s\n" "#define WITH_DHCPCANON 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define DHCPCANON_PATH "$with_dhcpcanon" -_ACEOF +printf "%s\n" "#define DHCPCANON_PATH \"$with_dhcpcanon\"" >>confdefs.h else -$as_echo "#define WITH_DHCPCANON 0" >>confdefs.h +printf "%s\n" "#define WITH_DHCPCANON 0" >>confdefs.h fi # Open vSwitch integration # Check whether --enable-ovs was given. -if test "${enable_ovs+set}" = set; then : +if test ${enable_ovs+y} +then : enableval=$enable_ovs; fi @@ -25203,18 +26821,19 @@ fi if test "${enable_ovs}" = "yes" ; then -$as_echo "#define WITH_OPENVSWITCH 1" >>confdefs.h +printf "%s\n" "#define WITH_OPENVSWITCH 1" >>confdefs.h else -$as_echo "#define WITH_OPENVSWITCH 0" >>confdefs.h +printf "%s\n" "#define WITH_OPENVSWITCH 0" >>confdefs.h fi # DHCP client support # Check whether --with-dhclient was given. -if test "${with_dhclient+set}" = set; then : +if test ${with_dhclient+y} +then : withval=$with_dhclient; fi @@ -25224,11 +26843,12 @@ if test "$with_dhclient" != "no"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_with_dhclient+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_with_dhclient+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $with_dhclient in [\\/]* | ?:[\\/]*) ac_cv_path_with_dhclient="$with_dhclient" # Let the user override the test with a path. @@ -25239,11 +26859,15 @@ as_dummy="/sbin:/usr/sbin:/usr/local/sbin" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_with_dhclient="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_with_dhclient="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25255,11 +26879,11 @@ esac fi with_dhclient=$ac_cv_path_with_dhclient if test -n "$with_dhclient"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dhclient" >&5 -$as_echo "$with_dhclient" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_dhclient" >&5 +printf "%s\n" "$with_dhclient" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -25269,30 +26893,29 @@ test -n "$with_dhclient" || with_dhclient="no" 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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: dhclient not found, assume path /usr/sbin/dhclient" >&5 +printf "%s\n" "$as_me: WARNING: dhclient not found, assume path /usr/sbin/dhclient" >&2;} with_dhclient=/usr/sbin/dhclient fi fi fi if test "$with_dhclient" != "no"; then -$as_echo "#define WITH_DHCLIENT 1" >>confdefs.h +printf "%s\n" "#define WITH_DHCLIENT 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define DHCLIENT_PATH "$with_dhclient" -_ACEOF +printf "%s\n" "#define DHCLIENT_PATH \"$with_dhclient\"" >>confdefs.h else -$as_echo "#define WITH_DHCLIENT 0" >>confdefs.h +printf "%s\n" "#define WITH_DHCLIENT 0" >>confdefs.h fi # Check whether --with-dhcpcd was given. -if test "${with_dhcpcd+set}" = set; then : +if test ${with_dhcpcd+y} +then : withval=$with_dhcpcd; fi @@ -25302,11 +26925,12 @@ if test "$with_dhcpcd" != "no"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_with_dhcpcd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_with_dhcpcd+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $with_dhcpcd in [\\/]* | ?:[\\/]*) ac_cv_path_with_dhcpcd="$with_dhcpcd" # Let the user override the test with a path. @@ -25317,11 +26941,15 @@ as_dummy="/sbin:/usr/sbin:/usr/local/sbin" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_with_dhcpcd="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_with_dhcpcd="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25333,11 +26961,11 @@ esac fi with_dhcpcd=$ac_cv_path_with_dhcpcd if test -n "$with_dhcpcd"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dhcpcd" >&5 -$as_echo "$with_dhcpcd" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_dhcpcd" >&5 +printf "%s\n" "$with_dhcpcd" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -25347,32 +26975,31 @@ test -n "$with_dhcpcd" || with_dhcpcd="no" 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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: dhcpcd not found, assume path /usr/sbin/dhcpcd" >&5 +printf "%s\n" "$as_me: WARNING: dhcpcd not found, assume path /usr/sbin/dhcpcd" >&2;} with_dhcpcd=/usr/sbin/dhcpcd fi fi fi if test "$with_dhcpcd" != "no"; then -$as_echo "#define WITH_DHCPCD 1" >>confdefs.h +printf "%s\n" "#define WITH_DHCPCD 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define DHCPCD_PATH "$with_dhcpcd" -_ACEOF +printf "%s\n" "#define DHCPCD_PATH \"$with_dhcpcd\"" >>confdefs.h else -$as_echo "#define WITH_DHCPCD 0" >>confdefs.h +printf "%s\n" "#define WITH_DHCPCD 0" >>confdefs.h fi # Check whether --with-config-dhcp-default was given. -if test "${with_config_dhcp_default+set}" = set; then : +if test ${with_config_dhcp_default+y} +then : withval=$with_config_dhcp_default; config_dhcp_default="$withval" -else +else $as_nop config_dhcp_default="" fi @@ -25380,28 +27007,29 @@ if test "$config_dhcp_default" = yes -o "$config_dhcp_default" = no -o -z "$conf config_dhcp_default='internal' fi -cat >>confdefs.h <<_ACEOF -#define NM_CONFIG_DEFAULT_MAIN_DHCP "$config_dhcp_default" -_ACEOF +printf "%s\n" "#define NM_CONFIG_DEFAULT_MAIN_DHCP \"$config_dhcp_default\"" >>confdefs.h NM_CONFIG_DEFAULT_MAIN_DHCP=$config_dhcp_default # Check whether --with-resolvconf was given. -if test "${with_resolvconf+set}" = set; then : +if test ${with_resolvconf+y} +then : withval=$with_resolvconf; fi # Check whether --with-netconfig was given. -if test "${with_netconfig+set}" = set; then : +if test ${with_netconfig+y} +then : withval=$with_netconfig; fi # Check whether --with-config-dns-rc-manager-default was given. -if test "${with_config_dns_rc_manager_default+set}" = set; then : +if test ${with_config_dns_rc_manager_default+y} +then : withval=$with_config_dns_rc_manager_default; config_dns_rc_manager_default=$withval fi @@ -25411,19 +27039,22 @@ if test "$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 -$as_echo "$as_me: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&5 +printf "%s\n" "$as_me: WARNING: Unknown --with-config-dns-rc-manager-default=$config_dns_rc_manager_default setting." >&2;} config_dns_rc_manager_default=auto fi # Use netconfig by default on SUSE -if test -z "$with_netconfig" -a -f /etc/SuSE-release; then : +if test -z "$with_netconfig" -a -f /etc/SuSE-release +then : with_netconfig=yes fi # Otherwise, default to "no" -if test -z "$with_resolvconf"; then : +if test -z "$with_resolvconf" +then : with_resolvconf=no fi -if test -z "$with_netconfig"; then : +if test -z "$with_netconfig" +then : with_netconfig=no fi @@ -25432,11 +27063,12 @@ if test "$with_resolvconf" = "yes"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_with_resolvconf+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_with_resolvconf+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $with_resolvconf in [\\/]* | ?:[\\/]*) ac_cv_path_with_resolvconf="$with_resolvconf" # Let the user override the test with a path. @@ -25447,11 +27079,15 @@ as_dummy="/sbin:/usr/sbin:/usr/local/sbin" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_with_resolvconf="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_with_resolvconf="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25463,11 +27099,11 @@ esac fi with_resolvconf=$ac_cv_path_with_resolvconf if test -n "$with_resolvconf"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_resolvconf" >&5 -$as_echo "$with_resolvconf" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_resolvconf" >&5 +printf "%s\n" "$with_resolvconf" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -25485,11 +27121,12 @@ if test "$with_netconfig" = "yes"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_with_netconfig+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_with_netconfig+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $with_netconfig in [\\/]* | ?:[\\/]*) ac_cv_path_with_netconfig="$with_netconfig" # Let the user override the test with a path. @@ -25500,11 +27137,15 @@ as_dummy="/sbin:/usr/sbin:/usr/local/sbin" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_with_netconfig="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_with_netconfig="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25516,11 +27157,11 @@ esac fi with_netconfig=$ac_cv_path_with_netconfig if test -n "$with_netconfig"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_netconfig" >&5 -$as_echo "$with_netconfig" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_netconfig" >&5 +printf "%s\n" "$with_netconfig" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -25535,40 +27176,36 @@ fi if test "$with_resolvconf" != "no"; then -cat >>confdefs.h <<_ACEOF -#define RESOLVCONF_PATH "$with_resolvconf" -_ACEOF +printf "%s\n" "#define RESOLVCONF_PATH \"$with_resolvconf\"" >>confdefs.h fi if test "$with_netconfig" != "no"; then -cat >>confdefs.h <<_ACEOF -#define NETCONFIG_PATH "$with_netconfig" -_ACEOF +printf "%s\n" "#define NETCONFIG_PATH \"$with_netconfig\"" >>confdefs.h fi -cat >>confdefs.h <<_ACEOF -#define NM_CONFIG_DEFAULT_MAIN_RC_MANAGER "$config_dns_rc_manager_default" -_ACEOF +printf "%s\n" "#define NM_CONFIG_DEFAULT_MAIN_RC_MANAGER \"$config_dns_rc_manager_default\"" >>confdefs.h NM_CONFIG_DEFAULT_MAIN_RC_MANAGER=$config_dns_rc_manager_default # Check whether --with-iptables was given. -if test "${with_iptables+set}" = set; then : +if test ${with_iptables+y} +then : withval=$with_iptables; fi if test "x${with_iptables}" = x; then # Extract the first word of "iptables", so it can be a program name with args. set dummy iptables; 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_IPTABLES_PATH+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_IPTABLES_PATH+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $IPTABLES_PATH in [\\/]* | ?:[\\/]*) ac_cv_path_IPTABLES_PATH="$IPTABLES_PATH" # Let the user override the test with a path. @@ -25579,11 +27216,15 @@ as_dummy="$PATH:/sbin:/usr/sbin" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_IPTABLES_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_IPTABLES_PATH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25595,11 +27236,11 @@ esac fi IPTABLES_PATH=$ac_cv_path_IPTABLES_PATH if test -n "$IPTABLES_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPTABLES_PATH" >&5 -$as_echo "$IPTABLES_PATH" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPTABLES_PATH" >&5 +printf "%s\n" "$IPTABLES_PATH" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -25610,26 +27251,26 @@ else IPTABLES_PATH="$with_iptables" fi -cat >>confdefs.h <<_ACEOF -#define IPTABLES_PATH "$IPTABLES_PATH" -_ACEOF +printf "%s\n" "#define IPTABLES_PATH \"$IPTABLES_PATH\"" >>confdefs.h # Check whether --with-nft was given. -if test "${with_nft+set}" = set; then : +if test ${with_nft+y} +then : withval=$with_nft; fi if test "x${with_nft}" = x; then # Extract the first word of "nft", so it can be a program name with args. set dummy nft; 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_NFT_PATH+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_NFT_PATH+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $NFT_PATH in [\\/]* | ?:[\\/]*) ac_cv_path_NFT_PATH="$NFT_PATH" # Let the user override the test with a path. @@ -25640,11 +27281,15 @@ as_dummy="$PATH:/sbin:/usr/sbin" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_NFT_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_NFT_PATH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25656,11 +27301,11 @@ esac fi NFT_PATH=$ac_cv_path_NFT_PATH if test -n "$NFT_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NFT_PATH" >&5 -$as_echo "$NFT_PATH" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NFT_PATH" >&5 +printf "%s\n" "$NFT_PATH" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -25671,26 +27316,26 @@ else NFT_PATH="$with_nft" fi -cat >>confdefs.h <<_ACEOF -#define NFT_PATH "$NFT_PATH" -_ACEOF +printf "%s\n" "#define NFT_PATH \"$NFT_PATH\"" >>confdefs.h # Check whether --with-dnsmasq was given. -if test "${with_dnsmasq+set}" = set; then : +if test ${with_dnsmasq+y} +then : withval=$with_dnsmasq; fi if test "x${with_dnsmasq}" = x; then # Extract the first word of "dnsmasq", so it can be a program name with args. set dummy dnsmasq; 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_DNSMASQ_PATH+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DNSMASQ_PATH+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $DNSMASQ_PATH in [\\/]* | ?:[\\/]*) ac_cv_path_DNSMASQ_PATH="$DNSMASQ_PATH" # Let the user override the test with a path. @@ -25701,11 +27346,15 @@ as_dummy="$PATH:/sbin:/usr/sbin" for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_DNSMASQ_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DNSMASQ_PATH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25717,11 +27366,11 @@ esac fi DNSMASQ_PATH=$ac_cv_path_DNSMASQ_PATH if test -n "$DNSMASQ_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DNSMASQ_PATH" >&5 -$as_echo "$DNSMASQ_PATH" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DNSMASQ_PATH" >&5 +printf "%s\n" "$DNSMASQ_PATH" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -25729,27 +27378,27 @@ else DNSMASQ_PATH="$with_dnsmasq" fi -cat >>confdefs.h <<_ACEOF -#define DNSMASQ_PATH "$DNSMASQ_PATH" -_ACEOF +printf "%s\n" "#define DNSMASQ_PATH \"$DNSMASQ_PATH\"" >>confdefs.h # dnssec-trigger-script path # Check whether --with-dnssec_trigger was given. -if test "${with_dnssec_trigger+set}" = set; then : +if test ${with_dnssec_trigger+y} +then : withval=$with_dnssec_trigger; fi if test "x${with_dnssec_trigger}" = x; then # Extract the first word of "dnssec-trigger-script", so it can be a program name with args. 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_PATH+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DNSSEC_TRIGGER_PATH+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $DNSSEC_TRIGGER_PATH in [\\/]* | ?:[\\/]*) ac_cv_path_DNSSEC_TRIGGER_PATH="$DNSSEC_TRIGGER_PATH" # Let the user override the test with a path. @@ -25760,11 +27409,15 @@ as_dummy="/usr/local/libexec:/usr/local/lib:/usr/local/lib/dnssec-trigger:/usr/l for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DNSSEC_TRIGGER_PATH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -25777,11 +27430,11 @@ esac fi 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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DNSSEC_TRIGGER_PATH" >&5 +printf "%s\n" "$DNSSEC_TRIGGER_PATH" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -25789,16 +27442,15 @@ else DNSSEC_TRIGGER_PATH="$with_dnssec_trigger" fi -cat >>confdefs.h <<_ACEOF -#define DNSSEC_TRIGGER_PATH "$DNSSEC_TRIGGER_PATH" -_ACEOF +printf "%s\n" "#define DNSSEC_TRIGGER_PATH \"$DNSSEC_TRIGGER_PATH\"" >>confdefs.h # system CA certificates path # Check whether --with-system-ca-path was given. -if test "${with_system_ca_path+set}" = set; then : +if test ${with_system_ca_path+y} +then : withval=$with_system_ca_path; fi @@ -25808,15 +27460,14 @@ else SYSTEM_CA_PATH="$with_system_ca_path" fi -cat >>confdefs.h <<_ACEOF -#define SYSTEM_CA_PATH "$SYSTEM_CA_PATH" -_ACEOF +printf "%s\n" "#define SYSTEM_CA_PATH \"$SYSTEM_CA_PATH\"" >>confdefs.h # Check whether --with-kernel-firmware-dir was given. -if test "${with_kernel_firmware_dir+set}" = set; then : +if test ${with_kernel_firmware_dir+y} +then : withval=$with_kernel_firmware_dir; fi @@ -25826,25 +27477,23 @@ else KERNEL_FIRMWARE_DIR="/lib/firmware" fi -cat >>confdefs.h <<_ACEOF -#define KERNEL_FIRMWARE_DIR "$KERNEL_FIRMWARE_DIR" -_ACEOF +printf "%s\n" "#define KERNEL_FIRMWARE_DIR \"$KERNEL_FIRMWARE_DIR\"" >>confdefs.h pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPSL" >&5 -$as_echo_n "checking for LIBPSL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBPSL" >&5 +printf %s "checking for LIBPSL... " >&6; } if test -n "$LIBPSL_CFLAGS"; then pkg_cv_LIBPSL_CFLAGS="$LIBPSL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpsl >= 0.1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpsl >= 0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpsl >= 0.1") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBPSL_CFLAGS=`$PKG_CONFIG --cflags "libpsl >= 0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25858,10 +27507,10 @@ if test -n "$LIBPSL_LIBS"; then pkg_cv_LIBPSL_LIBS="$LIBPSL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpsl >= 0.1\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpsl >= 0.1\""; } >&5 ($PKG_CONFIG --exists --print-errors "libpsl >= 0.1") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBPSL_LIBS=`$PKG_CONFIG --libs "libpsl >= 0.1" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25875,8 +27524,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -25893,21 +27542,22 @@ fi have_libpsl=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_libpsl=no else LIBPSL_CFLAGS=$pkg_cv_LIBPSL_CFLAGS LIBPSL_LIBS=$pkg_cv_LIBPSL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_libpsl=yes fi # Check whether --with-libpsl was given. -if test "${with_libpsl+set}" = set; then : +if test ${with_libpsl+y} +then : withval=$with_libpsl; -else +else $as_nop with_libpsl=${have_libpsl} fi @@ -25917,11 +27567,11 @@ if test "$with_libpsl" != "no"; then fi with_libpsl='yes' -$as_echo "#define WITH_LIBPSL 1" >>confdefs.h +printf "%s\n" "#define WITH_LIBPSL 1" >>confdefs.h else -$as_echo "#define WITH_LIBPSL 0" >>confdefs.h +printf "%s\n" "#define WITH_LIBPSL 0" >>confdefs.h fi if test "$with_libpsl" != "no"; then @@ -25935,26 +27585,27 @@ fi # Check whether --enable-concheck was given. -if test "${enable_concheck+set}" = set; then : +if test ${enable_concheck+y} +then : enableval=$enable_concheck; enable_concheck=${enableval} -else +else $as_nop enable_concheck=yes fi if test "${enable_concheck}" = "yes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5 -$as_echo_n "checking for LIBCURL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5 +printf %s "checking for LIBCURL... " >&6; } if test -n "$LIBCURL_CFLAGS"; then pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcurl >= 7.24.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.24.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25968,10 +27619,10 @@ if test -n "$LIBCURL_LIBS"; then pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcurl >= 7.24.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.24.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -25985,8 +27636,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26003,42 +27654,42 @@ fi have_libcurl=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_libcurl=no else LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_libcurl=yes fi if test "$have_libcurl" != "yes"; then as_fn_error $? "--enable-concheck requires libcurl library." "$LINENO" 5 fi -$as_echo "#define WITH_CONCHECK 1" >>confdefs.h +printf "%s\n" "#define WITH_CONCHECK 1" >>confdefs.h else enable_concheck=no -$as_echo "#define WITH_CONCHECK 0" >>confdefs.h +printf "%s\n" "#define WITH_CONCHECK 0" >>confdefs.h fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNDP" >&5 -$as_echo_n "checking for LIBNDP... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBNDP" >&5 +printf %s "checking for LIBNDP... " >&6; } if test -n "$LIBNDP_CFLAGS"; then pkg_cv_LIBNDP_CFLAGS="$LIBNDP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libndp\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libndp\""; } >&5 ($PKG_CONFIG --exists --print-errors "libndp") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBNDP_CFLAGS=`$PKG_CONFIG --cflags "libndp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26052,10 +27703,10 @@ if test -n "$LIBNDP_LIBS"; then pkg_cv_LIBNDP_LIBS="$LIBNDP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libndp\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libndp\""; } >&5 ($PKG_CONFIG --exists --print-errors "libndp") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBNDP_LIBS=`$PKG_CONFIG --libs "libndp" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26069,8 +27720,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26096,10 +27747,10 @@ Alternatively, you may set the environment variables LIBNDP_CFLAGS and LIBNDP_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$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. @@ -26113,8 +27764,8 @@ See \`config.log' for more details" "$LINENO" 5; } else LIBNDP_CFLAGS=$pkg_cv_LIBNDP_CFLAGS LIBNDP_LIBS=$pkg_cv_LIBNDP_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -26122,20 +27773,22 @@ fi # Check whether --with-readline was given. -if test "${with_readline+set}" = set; then : +if test ${with_readline+y} +then : withval=$with_readline; -else +else $as_nop with_readline=auto fi if test "$with_readline" != "none"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5 -$as_echo_n "checking for a readline compatible library... " >&6; } -if ${ax_cv_lib_readline+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5 +printf %s "checking for a readline compatible library... " >&6; } +if test ${ax_cv_lib_readline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ORIG_LIBS="$LIBS" @@ -26164,22 +27817,20 @@ else /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char readline (); int -main () +main (void) { return readline (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_cv_lib_readline="$TRY_LIB" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -n "$ax_cv_lib_readline"; then break @@ -26206,34 +27857,35 @@ rm -f core conftest.err conftest.$ac_objext \ LIBS="$ORIG_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline" >&5 -$as_echo "$ax_cv_lib_readline" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline" >&5 +printf "%s\n" "$ax_cv_lib_readline" >&6; } if test "$ax_cv_lib_readline" != "no"; then READLINE_LIBS="$ax_cv_lib_readline" -$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h +printf "%s\n" "#define HAVE_LIBREADLINE 1" >>confdefs.h if test "$with_readline" = "libedit"; then -$as_echo "#define HAVE_EDITLINE_READLINE 1" >>confdefs.h +printf "%s\n" "#define HAVE_EDITLINE_READLINE 1" >>confdefs.h else -$as_echo "#define HAVE_EDITLINE_READLINE 0" >>confdefs.h +printf "%s\n" "#define HAVE_EDITLINE_READLINE 0" >>confdefs.h fi ORIG_LIBS="$LIBS" LIBS="$ORIG_LIBS $ax_cv_lib_readline" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5 -$as_echo_n "checking whether readline supports history... " >&6; } -if ${ax_cv_lib_readline_history+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5 +printf %s "checking whether readline supports history... " >&6; } +if test ${ax_cv_lib_readline_history+y} +then : + printf %s "(cached) " >&6 +else $as_nop ax_cv_lib_readline_history="no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26242,49 +27894,47 @@ else /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char history_set_history_state (); int -main () +main (void) { return history_set_history_state (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_cv_lib_readline_history="yes" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline_history" >&5 -$as_echo "$ax_cv_lib_readline_history" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lib_readline_history" >&5 +printf "%s\n" "$ax_cv_lib_readline_history" >&6; } LIBS=$ORIG_LIBS if test "$ax_cv_lib_readline_history" = "yes"; then -$as_echo "#define HAVE_READLINE_HISTORY 1" >>confdefs.h +printf "%s\n" "#define HAVE_READLINE_HISTORY 1" >>confdefs.h - for ac_header in readline/history.h histedit.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default" +if test "x$ac_cv_header_readline_history_h" = xyes +then : + printf "%s\n" "#define HAVE_READLINE_HISTORY_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "histedit.h" "ac_cv_header_histedit_h" "$ac_includes_default" +if test "x$ac_cv_header_histedit_h" = xyes +then : + printf "%s\n" "#define HAVE_HISTEDIT_H 1" >>confdefs.h -done +fi else -$as_echo "#define HAVE_READLINE_HISTORY 0" >>confdefs.h +printf "%s\n" "#define HAVE_READLINE_HISTORY 0" >>confdefs.h fi fi @@ -26294,16 +27944,17 @@ $as_echo "#define HAVE_READLINE_HISTORY 0" >>confdefs.h # Check whether --with-nmcli was given. -if test "${with_nmcli+set}" = set; then : +if test ${with_nmcli+y} +then : withval=$with_nmcli; -else +else $as_nop with_nmcli=yes fi if test "$with_nmcli" == yes; then if test "$with_readline" = none; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "nmcli requires readline library. Use --with-readline or --with-nmcli=no See \`config.log' for more details" "$LINENO" 5; } fi @@ -26324,24 +27975,25 @@ fi # Check whether --with-nm-cloud-setup was given. -if test "${with_nm_cloud_setup+set}" = set; then : +if test ${with_nm_cloud_setup+y} +then : withval=$with_nm_cloud_setup; fi if test "$with_nm_cloud_setup" != no; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5 -$as_echo_n "checking for LIBCURL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBCURL" >&5 +printf %s "checking for LIBCURL... " >&6; } if test -n "$LIBCURL_CFLAGS"; then pkg_cv_LIBCURL_CFLAGS="$LIBCURL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcurl >= 7.24.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBCURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.24.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26355,10 +28007,10 @@ if test -n "$LIBCURL_LIBS"; then pkg_cv_LIBCURL_LIBS="$LIBCURL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.24.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "libcurl >= 7.24.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBCURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.24.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26372,8 +28024,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26390,14 +28042,14 @@ fi have_libcurl=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } have_libcurl=no else LIBCURL_CFLAGS=$pkg_cv_LIBCURL_CFLAGS LIBCURL_LIBS=$pkg_cv_LIBCURL_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } have_libcurl=yes fi if test "$have_libcurl" != "yes"; then @@ -26416,24 +28068,25 @@ fi # Check whether --with-nmtui was given. -if test "${with_nmtui+set}" = set; then : +if test ${with_nmtui+y} +then : withval=$with_nmtui; fi if test "$with_nmtui" != no; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NEWT" >&5 -$as_echo_n "checking for NEWT... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NEWT" >&5 +printf %s "checking for NEWT... " >&6; } if test -n "$NEWT_CFLAGS"; then pkg_cv_NEWT_CFLAGS="$NEWT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnewt >= 0.52.15\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnewt >= 0.52.15\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnewt >= 0.52.15") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NEWT_CFLAGS=`$PKG_CONFIG --cflags "libnewt >= 0.52.15" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26447,10 +28100,10 @@ if test -n "$NEWT_LIBS"; then pkg_cv_NEWT_LIBS="$NEWT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnewt >= 0.52.15\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnewt >= 0.52.15\""; } >&5 ($PKG_CONFIG --exists --print-errors "libnewt >= 0.52.15") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_NEWT_LIBS=`$PKG_CONFIG --libs "libnewt >= 0.52.15" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -26464,8 +28117,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -26482,14 +28135,14 @@ fi build_nmtui=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } build_nmtui=no else NEWT_CFLAGS=$pkg_cv_NEWT_CFLAGS NEWT_LIBS=$pkg_cv_NEWT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } build_nmtui=yes fi else @@ -26520,17 +28173,18 @@ else fi # Check whether --enable-more-warnings was given. -if test "${enable_more_warnings+set}" = set; then : +if test ${enable_more_warnings+y} +then : enableval=$enable_more_warnings; set_more_warnings="$enableval" -else +else $as_nop set_more_warnings=${more_warnings_default} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5 -$as_echo_n "checking for more warnings... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5 +printf %s "checking for more warnings... " >&6; } if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" @@ -26538,54 +28192,57 @@ $as_echo "yes" >&6; } /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "AM_CFLAGS='$AM_CFLAGS -Qunused-arguments'" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS="$CFLAGS_SAVED" CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wunknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-warning-option works as expected" >&5 -$as_echo_n "checking whether -Wunknown-warning-option works as expected... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-warning-option works as expected" >&5 +printf %s "checking whether -Wunknown-warning-option works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wunknown-warning-option'" -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wno-unknown-warning-option'" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -26634,44 +28291,46 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wall $(printf '%s' "$option" | sed -e 's/^-W\(no-\|no-error=\)/-W/')" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wall $(printf '%s' \"$option\" | sed -e 's/^-W\(no-\|no-error=\)/-W/') works as expected" >&5 -$as_echo_n "checking whether -Wall $(printf '%s' \"$option\" | sed -e 's/^-W\(no-\|no-error=\)/-W/') works as expected... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wall $(printf '%s' \"$option\" | sed -e 's/^-W\(no-\|no-error=\)/-W/') works as expected" >&5 +printf %s "checking whether -Wall $(printf '%s' \"$option\" | sed -e 's/^-W\(no-\|no-error=\)/-W/') works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS="$CFLAGS_SAVED" CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option" -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done unset option @@ -26681,44 +28340,46 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wunknown-attributes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-attributes works as expected" >&5 -$as_echo_n "checking whether -Wunknown-attributes works as expected... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wunknown-attributes works as expected" >&5 +printf %s "checking whether -Wunknown-attributes works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wunknown-attributes'" -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wno-unknown-attributes'" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -26726,44 +28387,46 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wtypedef-redefinition" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wtypedef-redefinition works as expected" >&5 -$as_echo_n "checking whether -Wtypedef-redefinition works as expected... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wtypedef-redefinition works as expected" >&5 +printf %s "checking whether -Wtypedef-redefinition works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wtypedef-redefinition'" -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wno-typedef-redefinition'" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -26771,14 +28434,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Warray-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Warray-bounds works as expected" >&5 -$as_echo_n "checking whether -Warray-bounds works as expected... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Warray-bounds works as expected" >&5 +printf %s "checking whether -Warray-bounds works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26786,31 +28450,32 @@ if ac_fn_c_try_compile "$LINENO"; then : void f () { strcmp ("something", "0"); } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Warray-bounds'" -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wno-array-bounds'" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -26818,14 +28483,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wparentheses-equality" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wparentheses-equality works as expected" >&5 -$as_echo_n "checking whether -Wparentheses-equality works as expected... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wparentheses-equality works as expected" >&5 +printf %s "checking whether -Wparentheses-equality works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26833,31 +28499,32 @@ if ac_fn_c_try_compile "$LINENO"; then : void f () { if (WIFCONTINUED(0)) return; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wparentheses-equality'" -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wno-parentheses-equality'" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -26865,14 +28532,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wunused-value" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wunused-value works as expected" >&5 -$as_echo_n "checking whether -Wunused-value works as expected... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wunused-value works as expected" >&5 +printf %s "checking whether -Wunused-value works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26880,31 +28548,32 @@ if ac_fn_c_try_compile "$LINENO"; then : int f () { int i = yolo; yolo; return i; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wunused-value'" -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wno-unused-value'" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -26912,14 +28581,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wcast-function-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wcast-function-type works as expected" >&5 -$as_echo_n "checking whether -Wcast-function-type works as expected... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wcast-function-type works as expected" >&5 +printf %s "checking whether -Wcast-function-type works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26931,31 +28601,32 @@ if ac_fn_c_try_compile "$LINENO"; then : G_DEFINE_TYPE (NMObject, nm_object, G_TYPE_OBJECT) _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wcast-function-type'" -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wno-cast-function-type'" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -26963,14 +28634,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror -Wimplicit-fallthrough" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -Wimplicit-fallthrough works as expected" >&5 -$as_echo_n "checking whether -Wimplicit-fallthrough works as expected... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wimplicit-fallthrough works as expected" >&5 +printf %s "checking whether -Wimplicit-fallthrough works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -26989,38 +28661,39 @@ int foo(int a); } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wimplicit-fallthrough'" -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS="$CFLAGS_SAVED" eval "AM_CFLAGS='$AM_CFLAGS -Wno-implicit-fallthrough'" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext eval "AM_CFLAGS='$CFLAGS_MORE_WARNINGS $AM_CFLAGS'" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -27028,47 +28701,49 @@ fi CFLAGS_SAVED="$CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS -Werror "-Wno-gnu-variable-sized-type-not-at-end"" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \"-Wno-gnu-variable-sized-type-not-at-end\" works as expected" >&5 -$as_echo_n "checking whether \"-Wno-gnu-variable-sized-type-not-at-end\" works as expected... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether \"-Wno-gnu-variable-sized-type-not-at-end\" works as expected" >&5 +printf %s "checking whether \"-Wno-gnu-variable-sized-type-not-at-end\" works as expected... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } CFLAGS="$CFLAGS_SAVED" eval "LIBSYSTEMD_NM_CFLAGS='$LIBSYSTEMD_NM_CFLAGS "-Wno-gnu-variable-sized-type-not-at-end"'" -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -else +else $as_nop - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 -$as_echo "not supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not supported" >&5 +printf "%s\n" "not supported" >&6; } CFLAGS="$CFLAGS_SAVED" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -27078,31 +28753,34 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fno-strict-aliasing \ ; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 -$as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } -if { as_var=`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 +printf %s "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } +if { as_var=`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval test \${$as_var+y}; } +then : + printf %s "(cached) " >&6 +else $as_nop eval "cc_save_CFLAGS='${CFLAGS}'" eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "$flag" | sed 's/^-Wno-/-W/'`'" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'" -else - eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'" +if ac_fn_c_try_link "$LINENO" +then : + eval "`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'" +else $as_nop + eval "`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext eval "CFLAGS='$cc_save_CFLAGS'" fi -eval ac_res=\$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +eval ac_res=\$`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } - if eval test x$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes; then : + if eval test x$`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes +then : eval "with_cflags='${with_cflags} $flag'" fi @@ -27111,7 +28789,8 @@ fi AM_CFLAGS="$AM_CFLAGS $with_cflags" # Check whether --enable-more-asserts was given. -if test "${enable_more_asserts+set}" = set; then : +if test ${enable_more_asserts+y} +then : enableval=$enable_more_asserts; fi @@ -27120,7 +28799,8 @@ if test "${enable_more_asserts}" = "yes"; then fi # Check whether --with-more-asserts was given. -if test "${with_more_asserts+set}" = set; then : +if test ${with_more_asserts+y} +then : withval=$with_more_asserts; more_asserts=${with_more_asserts} fi @@ -27135,13 +28815,12 @@ if test "${more_asserts}" = ""; then more_asserts=${more_asserts_default} fi -cat >>confdefs.h <<_ACEOF -#define NM_MORE_ASSERTS $more_asserts -_ACEOF +printf "%s\n" "#define NM_MORE_ASSERTS $more_asserts" >>confdefs.h # Check whether --enable-more-logging was given. -if test "${enable_more_logging+set}" = set; then : +if test ${enable_more_logging+y} +then : enableval=$enable_more_logging; fi @@ -27150,45 +28829,49 @@ if test "${enable_more_logging}" = ""; then fi if test "${enable_more_logging}" = "yes"; then -$as_echo "#define NM_MORE_LOGGING 1" >>confdefs.h +printf "%s\n" "#define NM_MORE_LOGGING 1" >>confdefs.h else -$as_echo "#define NM_MORE_LOGGING 0" >>confdefs.h +printf "%s\n" "#define NM_MORE_LOGGING 0" >>confdefs.h fi # Check whether --enable-lto was given. -if test "${enable_lto+set}" = set; then : +if test ${enable_lto+y} +then : enableval=$enable_lto; fi if (test "${enable_lto}" = "yes"); then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag -flto -flto-partition=none in envvar CFLAGS" >&5 -$as_echo_n "checking if $CC supports flag -flto -flto-partition=none in envvar CFLAGS... " >&6; } -if ${cc_cv_CFLAGS__flto__flto_partition_none+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag -flto -flto-partition=none in envvar CFLAGS" >&5 +printf %s "checking if $CC supports flag -flto -flto-partition=none in envvar CFLAGS... " >&6; } +if test ${cc_cv_CFLAGS__flto__flto_partition_none+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "cc_save_CFLAGS='${CFLAGS}'" eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "-flto -flto-partition=none" | sed 's/^-Wno-/-W/'`'" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "cc_cv_CFLAGS__flto__flto_partition_none='yes'" -else +else $as_nop eval "cc_cv_CFLAGS__flto__flto_partition_none='no'" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext eval "CFLAGS='$cc_save_CFLAGS'" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_cv_CFLAGS__flto__flto_partition_none" >&5 -$as_echo "$cc_cv_CFLAGS__flto__flto_partition_none" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cc_cv_CFLAGS__flto__flto_partition_none" >&5 +printf "%s\n" "$cc_cv_CFLAGS__flto__flto_partition_none" >&6; } - if eval test x$cc_cv_CFLAGS__flto__flto_partition_none = xyes; then : + if eval test x$cc_cv_CFLAGS__flto__flto_partition_none = xyes +then : eval "lto_flags='${lto_flags} -flto -flto-partition=none'" fi @@ -27202,36 +28885,40 @@ else fi # Check whether --enable-ld-gc was given. -if test "${enable_ld_gc+set}" = set; then : +if test ${enable_ld_gc+y} +then : enableval=$enable_ld_gc; fi if (test "${enable_ld_gc}" != "no"); then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag -fdata-sections -ffunction-sections -Wl,--gc-sections in envvar CFLAGS" >&5 -$as_echo_n "checking if $CC supports flag -fdata-sections -ffunction-sections -Wl,--gc-sections in envvar CFLAGS... " >&6; } -if ${cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag -fdata-sections -ffunction-sections -Wl,--gc-sections in envvar CFLAGS" >&5 +printf %s "checking if $CC supports flag -fdata-sections -ffunction-sections -Wl,--gc-sections in envvar CFLAGS... " >&6; } +if test ${cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "cc_save_CFLAGS='${CFLAGS}'" eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "-fdata-sections -ffunction-sections -Wl,--gc-sections" | sed 's/^-Wno-/-W/'`'" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections='yes'" -else +else $as_nop eval "cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections='no'" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext eval "CFLAGS='$cc_save_CFLAGS'" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections" >&5 -$as_echo "$cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections" >&5 +printf "%s\n" "$cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections" >&6; } - if eval test x$cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections = xyes; then : + if eval test x$cc_cv_CFLAGS__fdata_sections__ffunction_sections__Wl___gc_sections = xyes +then : eval "ld_gc_flags='${ld_gc_flags} -fdata-sections -ffunction-sections -Wl,--gc-sections'" fi @@ -27250,7 +28937,8 @@ fi # Check whether --with-address-sanitizer was given. -if test "${with_address_sanitizer+set}" = set; then : +if test ${with_address_sanitizer+y} +then : withval=$with_address_sanitizer; fi @@ -27258,44 +28946,48 @@ if test "$with_address_sanitizer" = yes -o "$with_address_sanitizer" = "exec"; t for flag in -fsanitize=address; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 -$as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } -if { as_var=`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 +printf %s "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } +if { as_var=`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval test \${$as_var+y}; } +then : + printf %s "(cached) " >&6 +else $as_nop eval "cc_save_CFLAGS='${CFLAGS}'" eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "$flag" | sed 's/^-Wno-/-W/'`'" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'" -else - eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'" +if ac_fn_c_try_link "$LINENO" +then : + eval "`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'" +else $as_nop + eval "`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext eval "CFLAGS='$cc_save_CFLAGS'" fi -eval ac_res=\$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +eval ac_res=\$`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } - if eval test x$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes; then : + if eval test x$`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes +then : eval "asan_cflags='${asan_cflags} $flag'" fi done - if test -z "$asan_cflags"; then : + if test -z "$asan_cflags" +then : as_fn_error $? "*** -fsanitize=address is not supported" "$LINENO" 5 fi sanitizer_exec_cflags="$sanitizer_exec_cflags -fsanitize=address" sanitizer_exec_ldflags="$sanitizer_exec_ldflags -Wc,-fsanitize=address" -$as_echo "#define ASAN_BUILD 1" >>confdefs.h +printf "%s\n" "#define ASAN_BUILD 1" >>confdefs.h if test "$with_address_sanitizer" = "yes"; then @@ -27313,7 +29005,8 @@ else fi # Check whether --enable-undefined-sanitizer was given. -if test "${enable_undefined_sanitizer+set}" = set; then : +if test ${enable_undefined_sanitizer+y} +then : enableval=$enable_undefined_sanitizer; fi @@ -27321,37 +29014,41 @@ if test "${enable_undefined_sanitizer}" = "yes"; then for flag in -fsanitize=undefined; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 -$as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } -if { as_var=`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5 +printf %s "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; } +if { as_var=`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh`; eval test \${$as_var+y}; } +then : + printf %s "(cached) " >&6 +else $as_nop eval "cc_save_CFLAGS='${CFLAGS}'" eval "CFLAGS='${cc_save_CFLAGS} -Werror `echo "$flag" | sed 's/^-Wno-/-W/'`'" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'" -else - eval "`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'" +if ac_fn_c_try_link "$LINENO" +then : + eval "`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh`='yes'" +else $as_nop + eval "`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh`='no'" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext eval "CFLAGS='$cc_save_CFLAGS'" fi -eval ac_res=\$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +eval ac_res=\$`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } - if eval test x$`$as_echo "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes; then : + if eval test x$`printf "%s\n" "cc_cv_CFLAGS_$flag" | $as_tr_sh` = xyes +then : eval "ubsan_cflags='${ubsan_cflags} $flag'" fi done - if test -z "$ubsan_cflags"; then : + if test -z "$ubsan_cflags" +then : as_fn_error $? "*** -fsanitize=undefined is not supported" "$LINENO" 5 fi @@ -27380,44 +29077,42 @@ if test -n "$sanitizers"; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CC support C11 _Generic()" >&5 -$as_echo_n "checking CC support C11 _Generic()... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CC support C11 _Generic()" >&5 +printf %s "checking CC support C11 _Generic()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo(void); static const char *const buf[1] = { "a" }; int foo() { int a = 0; int b = _Generic (a, int: 4) + _Generic(buf, const char *const*: 5); return b + a; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cc_support_generic=1 -else +else $as_nop cc_support_generic=0 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_support_generic" >&5 -$as_echo "$cc_support_generic" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cc_support_generic" >&5 +printf "%s\n" "$cc_support_generic" >&6; } -cat >>confdefs.h <<_ACEOF -#define _NM_CC_SUPPORT_GENERIC $cc_support_generic -_ACEOF +printf "%s\n" "#define _NM_CC_SUPPORT_GENERIC $cc_support_generic" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CC support gcc __auto_type" >&5 -$as_echo_n "checking CC support gcc __auto_type... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking CC support gcc __auto_type" >&5 +printf %s "checking CC support gcc __auto_type... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo(void); int foo() { int a = 0; __auto_type b = a; return b + a; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cc_support_auto_type=1 -else +else $as_nop cc_support_auto_type=0 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_support_auto_type" >&5 -$as_echo "$cc_support_auto_type" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cc_support_auto_type" >&5 +printf "%s\n" "$cc_support_auto_type" >&6; } -cat >>confdefs.h <<_ACEOF -#define _NM_CC_SUPPORT_AUTO_TYPE $cc_support_auto_type -_ACEOF +printf "%s\n" "#define _NM_CC_SUPPORT_AUTO_TYPE $cc_support_auto_type" >>confdefs.h @@ -27426,9 +29121,10 @@ _ACEOF # Check whether --enable-vala was given. -if test "${enable_vala+set}" = set; then : +if test ${enable_vala+y} +then : enableval=$enable_vala; -else +else $as_nop enable_vala=auto fi @@ -27438,7 +29134,8 @@ fi ;; #( yes) : - if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : + if test "x" != "xyes" -a "x$found_introspection" != "xyes" +then : as_fn_error $? "Vala bindings require GObject Introspection" "$LINENO" 5 @@ -27446,7 +29143,8 @@ fi ;; #( auto) : - if test "x" != "xyes" -a "x$found_introspection" != "xyes"; then : + if test "x" != "xyes" -a "x$found_introspection" != "xyes" +then : enable_vala=no @@ -27458,20 +29156,22 @@ fi ;; esac - if test "x" = "x"; then : + if test "x" = "x" +then : vapigen_pkg_name=vapigen -else +else $as_nop vapigen_pkg_name=vapigen- fi - if test "x0.17.1.24" = "x"; then : + if test "x0.17.1.24" = "x" +then : vapigen_pkg="$vapigen_pkg_name" -else +else $as_nop vapigen_pkg="$vapigen_pkg_name >= 0.17.1.24" @@ -27488,11 +29188,12 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -27502,11 +29203,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -27518,11 +29223,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -27531,11 +29236,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -27545,11 +29251,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -27561,11 +29271,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -27573,8 +29283,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -27586,26 +29296,27 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$vapigen_pkg\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$vapigen_pkg\""; } >&5 ($PKG_CONFIG --exists --print-errors "$vapigen_pkg") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$enable_vala" = "auto"; then : + if test "$enable_vala" = "auto" +then : enable_vala=yes @@ -27633,11 +29344,12 @@ fi VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen - if test "x" = "x"; then : + if test "x" = "x" +then : VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` -else +else $as_nop VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` @@ -27665,48 +29377,57 @@ ac_config_commands="$ac_config_commands vapi" # Tests, utilities and documentation # Check whether --enable-tests was given. -if test "${enable_tests+set}" = set; then : +if test ${enable_tests+y} +then : enableval=$enable_tests; fi # Check whether --with-valgrind was given. -if test "${with_valgrind+set}" = set; then : +if test ${with_valgrind+y} +then : withval=$with_valgrind; fi # Fallback to --with-tests # Check whether --with-tests was given. -if test "${with_tests+set}" = set; then : +if test ${with_tests+y} +then : withval=$with_tests; fi -if test -n "$with_tests"; then : +if test -n "$with_tests" +then : enable_tests="$with_tests" fi # Default to --enable-tests --with-valgrind=no -if test -z "$enable_tests"; then : +if test -z "$enable_tests" +then : enable_tests="yes" fi -if test -z "$with_valgrind"; then : +if test -z "$with_valgrind" +then : with_valgrind="no" fi # Normalize values -if test "$enable_tests" != "yes" -a "$enable_tests" != "root"; then : +if test "$enable_tests" != "yes" -a "$enable_tests" != "root" +then : enable_tests="no" fi # Search for tools -if test "$with_valgrind" = "yes"; then : +if test "$with_valgrind" = "yes" +then : for ac_prog in valgrind do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_with_valgrind+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_with_valgrind+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $with_valgrind in [\\/]* | ?:[\\/]*) ac_cv_path_with_valgrind="$with_valgrind" # Let the user override the test with a path. @@ -27716,11 +29437,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_with_valgrind="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_with_valgrind="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -27732,11 +29457,11 @@ esac fi with_valgrind=$ac_cv_path_with_valgrind if test -n "$with_valgrind"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_valgrind" >&5 -$as_echo "$with_valgrind" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_valgrind" >&5 +printf "%s\n" "$with_valgrind" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -27764,7 +29489,8 @@ fi # Check whether --with-valgrind-suppressions was given. -if test "${with_valgrind_suppressions+set}" = set; then : +if test ${with_valgrind_suppressions+y} +then : withval=$with_valgrind_suppressions; fi @@ -27778,21 +29504,22 @@ fi NM_LOG_COMPILER='LOG_COMPILER = "$(top_srcdir)/tools/run-nm-test.sh" --called-from-make "$(abs_top_builddir)" "$(LIBTOOL)" "$(with_valgrind)" "'"$with_valgrind_suppressions"'" --launch-dbus=auto' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } -if ${ac_cv_target+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 +printf %s "checking target system type... " >&6; } +if test ${ac_cv_target+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$target_alias" = x; then ac_cv_target=$ac_cv_host else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 + ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 +printf "%s\n" "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; @@ -27817,6 +29544,139 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test ${ac_cv_prog_CPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + @@ -27840,41 +29700,41 @@ if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then ax_pthread_save_CC="$CC" ax_pthread_save_CFLAGS="$CFLAGS" ax_pthread_save_LIBS="$LIBS" - if test "x$PTHREAD_CC" != "x"; then : + if test "x$PTHREAD_CC" != "x" +then : CC="$PTHREAD_CC" fi - if test "x$PTHREAD_CXX" != "x"; then : + if test "x$PTHREAD_CXX" != "x" +then : CXX="$PTHREAD_CXX" fi CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LIBS="$PTHREAD_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5 -$as_echo_n "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS" >&5 +printf %s "checking for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char pthread_join (); int -main () +main (void) { return pthread_join (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_pthread_ok=yes fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 -$as_echo "$ax_pthread_ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +printf "%s\n" "$ax_pthread_ok" >&6; } if test "x$ax_pthread_ok" = "xno"; then PTHREAD_LIBS="" PTHREAD_CFLAGS="" @@ -27952,11 +29812,12 @@ case $target_os in _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5 -$as_echo "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;} + $EGREP "AX_PTHREAD_ZOS_MISSING" >/dev/null 2>&1 +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&5 +printf "%s\n" "$as_me: WARNING: IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support." >&2;} fi -rm -f conftest* +rm -rf conftest* ;; @@ -27976,11 +29837,12 @@ esac # Are we compiling with Clang? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5 -$as_echo_n "checking whether $CC is Clang... " >&6; } -if ${ax_cv_PTHREAD_CLANG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC is Clang" >&5 +printf %s "checking whether $CC is Clang... " >&6; } +if test ${ax_cv_PTHREAD_CLANG+y} +then : + printf %s "(cached) " >&6 +else $as_nop ax_cv_PTHREAD_CLANG=no # Note that Autoconf sets GCC=yes for Clang as well as GCC if test "x$GCC" = "xyes"; then @@ -27993,16 +29855,17 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1; then : + $EGREP "AX_PTHREAD_CC_IS_CLANG" >/dev/null 2>&1 +then : ax_cv_PTHREAD_CLANG=yes fi -rm -f conftest* +rm -rf conftest* fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5 -$as_echo "$ax_cv_PTHREAD_CLANG" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG" >&5 +printf "%s\n" "$ax_cv_PTHREAD_CLANG" >&6; } ax_pthread_clang="$ax_cv_PTHREAD_CLANG" @@ -28016,13 +29879,15 @@ ax_pthread_clang="$ax_cv_PTHREAD_CLANG" # [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555 # To solve this, first try -pthread together with -lpthread for GCC -if test "x$GCC" = "xyes"; then : +if test "x$GCC" = "xyes" +then : ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags" fi # Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first -if test "x$ax_pthread_clang" = "xyes"; then : +if test "x$ax_pthread_clang" = "xyes" +then : ax_pthread_flags="-pthread,-lpthread -pthread" fi @@ -28044,9 +29909,10 @@ case $target_os in ax_pthread_check_macro="--" ;; esac -if test "x$ax_pthread_check_macro" = "x--"; then : +if test "x$ax_pthread_check_macro" = "x--" +then : ax_pthread_check_cond=0 -else +else $as_nop ax_pthread_check_cond="!defined($ax_pthread_check_macro)" fi @@ -28056,31 +29922,32 @@ for ax_pthread_try_flag in $ax_pthread_flags; do case $ax_pthread_try_flag in none) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 -$as_echo_n "checking whether pthreads work without any flags... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 +printf %s "checking whether pthreads work without any flags... " >&6; } ;; *,*) PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"` PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"" >&5 -$as_echo_n "checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"" >&5 +printf %s "checking whether pthreads work with \"$PTHREAD_CFLAGS\" and \"$PTHREAD_LIBS\"... " >&6; } ;; -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5 -$as_echo_n "checking whether pthreads work with $ax_pthread_try_flag... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $ax_pthread_try_flag" >&5 +printf %s "checking whether pthreads work with $ax_pthread_try_flag... " >&6; } PTHREAD_CFLAGS="$ax_pthread_try_flag" ;; pthread-config) # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ax_pthread_config+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ax_pthread_config+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ax_pthread_config"; then ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. else @@ -28088,11 +29955,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ax_pthread_config="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -28104,15 +29975,16 @@ fi fi ax_pthread_config=$ac_cv_prog_ax_pthread_config if test -n "$ax_pthread_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 -$as_echo "$ax_pthread_config" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 +printf "%s\n" "$ax_pthread_config" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - if test "x$ax_pthread_config" = "xno"; then : + if test "x$ax_pthread_config" = "xno" +then : continue fi PTHREAD_CFLAGS="`pthread-config --cflags`" @@ -28120,8 +29992,8 @@ fi ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5 -$as_echo_n "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$ax_pthread_try_flag" >&5 +printf %s "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; } PTHREAD_LIBS="-l$ax_pthread_try_flag" ;; esac @@ -28156,7 +30028,7 @@ $as_echo_n "checking for the pthreads library -l$ax_pthread_try_flag... " >&6; } } static void *start_routine(void *a) { return a; } int -main () +main (void) { pthread_t th; pthread_attr_t attr; pthread_create(&th, 0, start_routine, 0); @@ -28168,18 +30040,20 @@ pthread_t th; pthread_attr_t attr; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_pthread_ok=yes fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ax_pthread_save_CFLAGS" LIBS="$ax_pthread_save_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 -$as_echo "$ax_pthread_ok" >&6; } - if test "x$ax_pthread_ok" = "xyes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +printf "%s\n" "$ax_pthread_ok" >&6; } + if test "x$ax_pthread_ok" = "xyes" +then : break fi @@ -28225,11 +30099,12 @@ if test "x$ax_pthread_clang" = "xyes"; then # that build with -Werror. So if the active version of Clang has # this misfeature, we search for an option to squash it. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5 -$as_echo_n "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; } -if ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread" >&5 +printf %s "checking whether Clang needs flag to prevent \"argument unused\" warning when linking with -pthread... " >&6; } +if test ${ax_cv_PTHREAD_CLANG_NO_WARN_FLAG+y} +then : + printf %s "(cached) " >&6 +else $as_nop ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown # Create an alternate version of $ac_link that compiles and # links in two steps (.c -> .o, .o -> exe) instead of one @@ -28237,11 +30112,12 @@ else # step ax_pthread_save_ac_link="$ac_link" ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' - ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` + ax_pthread_link_step=`printf "%s\n" "$ac_link" | sed "$ax_pthread_sed"` ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" ax_pthread_save_CFLAGS="$CFLAGS" for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do - if test "x$ax_pthread_try" = "xunknown"; then : + if test "x$ax_pthread_try" = "xunknown" +then : break fi CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" @@ -28250,32 +30126,35 @@ fi /* end confdefs.h. */ int main(void){return 0;} _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_link="$ax_pthread_2step_ac_link" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(void){return 0;} _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : break fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext done ac_link="$ax_pthread_save_ac_link" CFLAGS="$ax_pthread_save_CFLAGS" - if test "x$ax_pthread_try" = "x"; then : + if test "x$ax_pthread_try" = "x" +then : ax_pthread_try=no fi ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5 -$as_echo "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&5 +printf "%s\n" "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" >&6; } case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in no | unknown) ;; @@ -28294,51 +30173,53 @@ if test "x$ax_pthread_ok" = "xyes"; then LIBS="$PTHREAD_LIBS $LIBS" # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 -$as_echo_n "checking for joinable pthread attribute... " >&6; } -if ${ax_cv_PTHREAD_JOINABLE_ATTR+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 +printf %s "checking for joinable pthread attribute... " >&6; } +if test ${ax_cv_PTHREAD_JOINABLE_ATTR+y} +then : + printf %s "(cached) " >&6 +else $as_nop ax_cv_PTHREAD_JOINABLE_ATTR=unknown for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { int attr = $ax_pthread_attr; return attr /* ; */ ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5 -$as_echo "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_JOINABLE_ATTR" >&5 +printf "%s\n" "$ax_cv_PTHREAD_JOINABLE_ATTR" >&6; } if test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \ test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \ - test "x$ax_pthread_joinable_attr_defined" != "xyes"; then : + test "x$ax_pthread_joinable_attr_defined" != "xyes" +then : -cat >>confdefs.h <<_ACEOF -#define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR -_ACEOF +printf "%s\n" "#define PTHREAD_CREATE_JOINABLE $ax_cv_PTHREAD_JOINABLE_ATTR" >>confdefs.h ax_pthread_joinable_attr_defined=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5 -$as_echo_n "checking whether more special flags are required for pthreads... " >&6; } -if ${ax_cv_PTHREAD_SPECIAL_FLAGS+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether more special flags are required for pthreads" >&5 +printf %s "checking whether more special flags are required for pthreads... " >&6; } +if test ${ax_cv_PTHREAD_SPECIAL_FLAGS+y} +then : + printf %s "(cached) " >&6 +else $as_nop ax_cv_PTHREAD_SPECIAL_FLAGS=no case $target_os in solaris*) @@ -28347,24 +30228,26 @@ else esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5 -$as_echo "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_SPECIAL_FLAGS" >&5 +printf "%s\n" "$ax_cv_PTHREAD_SPECIAL_FLAGS" >&6; } if test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \ - test "x$ax_pthread_special_flags_added" != "xyes"; then : + test "x$ax_pthread_special_flags_added" != "xyes" +then : PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS" ax_pthread_special_flags_added=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 -$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; } -if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 +printf %s "checking for PTHREAD_PRIO_INHERIT... " >&6; } +if test ${ax_cv_PTHREAD_PRIO_INHERIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { int i = PTHREAD_PRIO_INHERIT; return i; @@ -28372,21 +30255,23 @@ int i = PTHREAD_PRIO_INHERIT; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_cv_PTHREAD_PRIO_INHERIT=yes -else +else $as_nop ax_cv_PTHREAD_PRIO_INHERIT=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 -$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 +printf "%s\n" "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \ - test "x$ax_pthread_prio_inherit_defined" != "xyes"; then : + test "x$ax_pthread_prio_inherit_defined" != "xyes" +then : -$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h +printf "%s\n" "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h ax_pthread_prio_inherit_defined=yes @@ -28405,11 +30290,14 @@ fi case "x$CC" in #( x/*) : - if as_fn_executable_p ${CC}_r; then : + if as_fn_executable_p ${CC}_r +then : PTHREAD_CC="${CC}_r" fi - if test "x${CXX}" != "x"; then : - if as_fn_executable_p ${CXX}_r; then : + if test "x${CXX}" != "x" +then : + if as_fn_executable_p ${CXX}_r +then : PTHREAD_CXX="${CXX}_r" fi fi @@ -28420,11 +30308,12 @@ fi 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_PTHREAD_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_PTHREAD_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$PTHREAD_CC"; then ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test. else @@ -28432,11 +30321,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_PTHREAD_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -28447,11 +30340,11 @@ fi fi PTHREAD_CC=$ac_cv_prog_PTHREAD_CC if test -n "$PTHREAD_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 -$as_echo "$PTHREAD_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 +printf "%s\n" "$PTHREAD_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -28459,16 +30352,18 @@ fi done test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - if test "x${CXX}" != "x"; then : + if test "x${CXX}" != "x" +then : for ac_prog in ${CXX}_r 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_PTHREAD_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_PTHREAD_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$PTHREAD_CXX"; then ac_cv_prog_PTHREAD_CXX="$PTHREAD_CXX" # Let the user override the test. else @@ -28476,11 +30371,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_PTHREAD_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -28491,11 +30390,11 @@ fi fi PTHREAD_CXX=$ac_cv_prog_PTHREAD_CXX if test -n "$PTHREAD_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CXX" >&5 -$as_echo "$PTHREAD_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CXX" >&5 +printf "%s\n" "$PTHREAD_CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -28527,7 +30426,7 @@ test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX" # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: if test "x$ax_pthread_ok" = "xyes"; then -$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h +printf "%s\n" "#define HAVE_PTHREAD 1" >>confdefs.h : else @@ -28555,11 +30454,12 @@ if test -n "$PYTHON" ; then 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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PYTHON+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PYTHON in [\\/]* | ?:[\\/]*) ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. @@ -28569,11 +30469,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -28585,11 +30489,11 @@ 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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +printf "%s\n" "$PYTHON" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -28602,42 +30506,172 @@ test -n "$PYTHON" || PYTHON=":" if test "$PYTHON" = :; then - as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 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; print('%u.%u' % sys.version_info[:2])"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +printf %s "checking for $am_display_PYTHON version... " >&6; } +if test ${am_cv_python_version+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[:2])"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -$as_echo "$am_cv_python_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +printf "%s\n" "$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version - - PYTHON_PREFIX='${prefix}' - - PYTHON_EXEC_PREFIX='${exec_prefix}' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +printf %s "checking for $am_display_PYTHON platform... " >&6; } +if test ${am_cv_python_platform+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +printf "%s\n" "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + if test "x$prefix" = xNONE; then + am__usable_prefix=$ac_default_prefix + else + am__usable_prefix=$prefix + fi + + # Allow user to request using sys.* values from Python, + # instead of the GNU $prefix values. + +# Check whether --with-python-sys-prefix was given. +if test ${with_python_sys_prefix+y} +then : + withval=$with_python_sys_prefix; am_use_python_sys=: +else $as_nop + am_use_python_sys=false +fi + + + # Allow user to override whatever the default Python prefix is. + +# Check whether --with-python_prefix was given. +if test ${with_python_prefix+y} +then : + withval=$with_python_prefix; am_python_prefix_subst=$withval + am_cv_python_prefix=$withval + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit $am_display_PYTHON prefix" >&5 +printf %s "checking for explicit $am_display_PYTHON prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5 +printf "%s\n" "$am_cv_python_prefix" >&6; } +else $as_nop + + if $am_use_python_sys; then + # using python sys.prefix value, not GNU + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python default $am_display_PYTHON prefix" >&5 +printf %s "checking for python default $am_display_PYTHON prefix... " >&6; } +if test ${am_cv_python_prefix+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5 +printf "%s\n" "$am_cv_python_prefix" >&6; } + + case $am_cv_python_prefix in + $am__usable_prefix*) + am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'` + am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"` + ;; + *) + am_python_prefix_subst=$am_cv_python_prefix + ;; + esac + else # using GNU prefix value, not python sys.prefix + am_python_prefix_subst='${prefix}' + am_python_prefix=$am_python_prefix_subst + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU default $am_display_PYTHON prefix" >&5 +printf %s "checking for GNU default $am_display_PYTHON prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_prefix" >&5 +printf "%s\n" "$am_python_prefix" >&6; } + fi +fi - { $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)"` + # Substituting python_prefix_subst value. + PYTHON_PREFIX=$am_python_prefix_subst + + + # emacs-page Now do it all over again for Python exec_prefix, but with yet + # another conditional: fall back to regular prefix if that was specified. + +# Check whether --with-python_exec_prefix was given. +if test ${with_python_exec_prefix+y} +then : + withval=$with_python_exec_prefix; am_python_exec_prefix_subst=$withval + am_cv_python_exec_prefix=$withval + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for explicit $am_display_PYTHON exec_prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 +printf "%s\n" "$am_cv_python_exec_prefix" >&6; } +else $as_nop + + # no explicit --with-python_exec_prefix, but if + # --with-python_prefix was given, use its value for python_exec_prefix too. + if test -n "$with_python_prefix" +then : + am_python_exec_prefix_subst=$with_python_prefix + am_cv_python_exec_prefix=$with_python_prefix + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python_prefix-given $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for python_prefix-given $am_display_PYTHON exec_prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 +printf "%s\n" "$am_cv_python_exec_prefix" >&6; } +else $as_nop + + # Set am__usable_exec_prefix whether using GNU or Python values, + # since we use that variable for pyexecdir. + if test "x$exec_prefix" = xNONE; then + am__usable_exec_prefix=$am__usable_prefix + else + am__usable_exec_prefix=$exec_prefix + fi + # + if $am_use_python_sys; then # using python sys.exec_prefix, not GNU + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python default $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for python default $am_display_PYTHON exec_prefix... " >&6; } +if test ${am_cv_python_exec_prefix+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 +printf "%s\n" "$am_cv_python_exec_prefix" >&6; } + case $am_cv_python_exec_prefix in + $am__usable_exec_prefix*) + am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'` + am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"` + ;; + *) + am_python_exec_prefix_subst=$am_cv_python_exec_prefix + ;; + esac + else # using GNU $exec_prefix, not python sys.exec_prefix + am_python_exec_prefix_subst='${exec_prefix}' + am_python_exec_prefix=$am_python_exec_prefix_subst + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU default $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for GNU default $am_display_PYTHON exec_prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_exec_prefix" >&5 +printf "%s\n" "$am_python_exec_prefix" >&6; } + fi +fi 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 + # Substituting python_exec_prefix_subst. + PYTHON_EXEC_PREFIX=$am_python_exec_prefix_subst - # Just factor out some code duplication. + + # Factor out some code duplication into this shell variable. am_python_setup_sysconfig="\ import sys # Prefer sysconfig over distutils.sysconfig, for better compatibility @@ -28658,98 +30692,95 @@ 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 " + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory (pythondir)" >&5 +printf %s "checking for $am_display_PYTHON script directory (pythondir)... " >&6; } +if test ${am_cv_python_pythondir+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "x$am_cv_python_prefix" = x; then + am_py_prefix=$am__usable_prefix + else + am_py_prefix=$am_cv_python_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'}) + 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') + 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 - ;; + # + 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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +printf "%s\n" "$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir - - pkgpythondir=\${pythondir}/$PACKAGE + 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 " + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory (pyexecdir)" >&5 +printf %s "checking for $am_display_PYTHON extension module directory (pyexecdir)... " >&6; } +if test ${am_cv_python_pyexecdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "x$am_cv_python_exec_prefix" = x; then + am_py_exec_prefix=$am__usable_exec_prefix + else + am_py_exec_prefix=$am_cv_python_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'}) + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) else: - from distutils import sysconfig - sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_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 - ;; + # + 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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +printf "%s\n" "$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir - - pkgpyexecdir=\${pyexecdir}/$PACKAGE + pkgpyexecdir=\${pyexecdir}/$PACKAGE fi - else @@ -28759,8 +30790,8 @@ else if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3" >&5 -$as_echo_n "checking whether $PYTHON version is >= 3... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3" >&5 +printf %s "checking whether $PYTHON version is >= 3... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -28774,23 +30805,25 @@ sys.exit(sys.hexversion < minverhex)" ($PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + (exit $ac_status); } +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } as_fn_error $? "Python interpreter is too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3" >&5 -$as_echo_n "checking for a Python interpreter with version >= 3... " >&6; } -if ${am_cv_pathless_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3" >&5 +printf %s "checking for a Python interpreter with version >= 3... " >&6; } +if test ${am_cv_pathless_PYTHON+y} +then : + printf %s "(cached) " >&6 +else $as_nop for am_cv_pathless_PYTHON in python python2 python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break @@ -28807,24 +30840,26 @@ sys.exit(sys.hexversion < minverhex)" ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : + (exit $ac_status); } +then : break fi done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 -$as_echo "$am_cv_pathless_PYTHON" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 +printf "%s\n" "$am_cv_pathless_PYTHON" >&6; } # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. if test "$am_cv_pathless_PYTHON" = none; then PYTHON=: else # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; 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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PYTHON+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PYTHON in [\\/]* | ?:[\\/]*) ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. @@ -28834,11 +30869,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -28850,11 +30889,11 @@ 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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +printf "%s\n" "$PYTHON" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -28864,42 +30903,172 @@ fi 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; print('%u.%u' % sys.version_info[:2])"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +printf %s "checking for $am_display_PYTHON version... " >&6; } +if test ${am_cv_python_version+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[:2])"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -$as_echo "$am_cv_python_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +printf "%s\n" "$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version - - PYTHON_PREFIX='${prefix}' - - PYTHON_EXEC_PREFIX='${exec_prefix}' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +printf %s "checking for $am_display_PYTHON platform... " >&6; } +if test ${am_cv_python_platform+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +printf "%s\n" "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + if test "x$prefix" = xNONE; then + am__usable_prefix=$ac_default_prefix + else + am__usable_prefix=$prefix + fi + + # Allow user to request using sys.* values from Python, + # instead of the GNU $prefix values. + +# Check whether --with-python-sys-prefix was given. +if test ${with_python_sys_prefix+y} +then : + withval=$with_python_sys_prefix; am_use_python_sys=: +else $as_nop + am_use_python_sys=false +fi + + + # Allow user to override whatever the default Python prefix is. + +# Check whether --with-python_prefix was given. +if test ${with_python_prefix+y} +then : + withval=$with_python_prefix; am_python_prefix_subst=$withval + am_cv_python_prefix=$withval + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit $am_display_PYTHON prefix" >&5 +printf %s "checking for explicit $am_display_PYTHON prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5 +printf "%s\n" "$am_cv_python_prefix" >&6; } +else $as_nop + + if $am_use_python_sys; then + # using python sys.prefix value, not GNU + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python default $am_display_PYTHON prefix" >&5 +printf %s "checking for python default $am_display_PYTHON prefix... " >&6; } +if test ${am_cv_python_prefix+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5 +printf "%s\n" "$am_cv_python_prefix" >&6; } + + case $am_cv_python_prefix in + $am__usable_prefix*) + am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'` + am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"` + ;; + *) + am_python_prefix_subst=$am_cv_python_prefix + ;; + esac + else # using GNU prefix value, not python sys.prefix + am_python_prefix_subst='${prefix}' + am_python_prefix=$am_python_prefix_subst + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU default $am_display_PYTHON prefix" >&5 +printf %s "checking for GNU default $am_display_PYTHON prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_prefix" >&5 +printf "%s\n" "$am_python_prefix" >&6; } + fi +fi - { $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)"` + # Substituting python_prefix_subst value. + PYTHON_PREFIX=$am_python_prefix_subst + + + # emacs-page Now do it all over again for Python exec_prefix, but with yet + # another conditional: fall back to regular prefix if that was specified. + +# Check whether --with-python_exec_prefix was given. +if test ${with_python_exec_prefix+y} +then : + withval=$with_python_exec_prefix; am_python_exec_prefix_subst=$withval + am_cv_python_exec_prefix=$withval + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for explicit $am_display_PYTHON exec_prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 +printf "%s\n" "$am_cv_python_exec_prefix" >&6; } +else $as_nop + + # no explicit --with-python_exec_prefix, but if + # --with-python_prefix was given, use its value for python_exec_prefix too. + if test -n "$with_python_prefix" +then : + am_python_exec_prefix_subst=$with_python_prefix + am_cv_python_exec_prefix=$with_python_prefix + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python_prefix-given $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for python_prefix-given $am_display_PYTHON exec_prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 +printf "%s\n" "$am_cv_python_exec_prefix" >&6; } +else $as_nop + + # Set am__usable_exec_prefix whether using GNU or Python values, + # since we use that variable for pyexecdir. + if test "x$exec_prefix" = xNONE; then + am__usable_exec_prefix=$am__usable_prefix + else + am__usable_exec_prefix=$exec_prefix + fi + # + if $am_use_python_sys; then # using python sys.exec_prefix, not GNU + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python default $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for python default $am_display_PYTHON exec_prefix... " >&6; } +if test ${am_cv_python_exec_prefix+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 +printf "%s\n" "$am_cv_python_exec_prefix" >&6; } + case $am_cv_python_exec_prefix in + $am__usable_exec_prefix*) + am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'` + am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"` + ;; + *) + am_python_exec_prefix_subst=$am_cv_python_exec_prefix + ;; + esac + else # using GNU $exec_prefix, not python sys.exec_prefix + am_python_exec_prefix_subst='${exec_prefix}' + am_python_exec_prefix=$am_python_exec_prefix_subst + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU default $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for GNU default $am_display_PYTHON exec_prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_exec_prefix" >&5 +printf "%s\n" "$am_python_exec_prefix" >&6; } + fi +fi 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 + # Substituting python_exec_prefix_subst. + PYTHON_EXEC_PREFIX=$am_python_exec_prefix_subst - # Just factor out some code duplication. + + # Factor out some code duplication into this shell variable. am_python_setup_sysconfig="\ import sys # Prefer sysconfig over distutils.sysconfig, for better compatibility @@ -28920,98 +31089,95 @@ 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 " + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory (pythondir)" >&5 +printf %s "checking for $am_display_PYTHON script directory (pythondir)... " >&6; } +if test ${am_cv_python_pythondir+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "x$am_cv_python_prefix" = x; then + am_py_prefix=$am__usable_prefix + else + am_py_prefix=$am_cv_python_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'}) + 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') + 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 - ;; + # + 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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +printf "%s\n" "$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir - - pkgpythondir=\${pythondir}/$PACKAGE + 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 " + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory (pyexecdir)" >&5 +printf %s "checking for $am_display_PYTHON extension module directory (pyexecdir)... " >&6; } +if test ${am_cv_python_pyexecdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "x$am_cv_python_exec_prefix" = x; then + am_py_exec_prefix=$am__usable_exec_prefix + else + am_py_exec_prefix=$am_cv_python_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'}) + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) else: - from distutils import sysconfig - sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_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 - ;; + # + 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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +printf "%s\n" "$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir - - pkgpyexecdir=\${pyexecdir}/$PACKAGE + pkgpyexecdir=\${pyexecdir}/$PACKAGE fi - if test -z "$PYTHON"; then @@ -29025,11 +31191,12 @@ $as_echo "$am_cv_python_pyexecdir" >&6; } 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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PYTHON+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PYTHON in [\\/]* | ?:[\\/]*) ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. @@ -29039,11 +31206,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29055,11 +31226,11 @@ 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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +printf "%s\n" "$PYTHON" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -29072,42 +31243,172 @@ test -n "$PYTHON" || PYTHON=":" if test "$PYTHON" = :; then - as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 + as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 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; print('%u.%u' % sys.version_info[:2])"` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +printf %s "checking for $am_display_PYTHON version... " >&6; } +if test ${am_cv_python_version+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[:2])"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -$as_echo "$am_cv_python_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +printf "%s\n" "$am_cv_python_version" >&6; } PYTHON_VERSION=$am_cv_python_version - - PYTHON_PREFIX='${prefix}' - - PYTHON_EXEC_PREFIX='${exec_prefix}' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +printf %s "checking for $am_display_PYTHON platform... " >&6; } +if test ${am_cv_python_platform+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +printf "%s\n" "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform + if test "x$prefix" = xNONE; then + am__usable_prefix=$ac_default_prefix + else + am__usable_prefix=$prefix + fi + + # Allow user to request using sys.* values from Python, + # instead of the GNU $prefix values. + +# Check whether --with-python-sys-prefix was given. +if test ${with_python_sys_prefix+y} +then : + withval=$with_python_sys_prefix; am_use_python_sys=: +else $as_nop + am_use_python_sys=false +fi + + + # Allow user to override whatever the default Python prefix is. + +# Check whether --with-python_prefix was given. +if test ${with_python_prefix+y} +then : + withval=$with_python_prefix; am_python_prefix_subst=$withval + am_cv_python_prefix=$withval + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit $am_display_PYTHON prefix" >&5 +printf %s "checking for explicit $am_display_PYTHON prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5 +printf "%s\n" "$am_cv_python_prefix" >&6; } +else $as_nop + + if $am_use_python_sys; then + # using python sys.prefix value, not GNU + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python default $am_display_PYTHON prefix" >&5 +printf %s "checking for python default $am_display_PYTHON prefix... " >&6; } +if test ${am_cv_python_prefix+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_prefix" >&5 +printf "%s\n" "$am_cv_python_prefix" >&6; } + + case $am_cv_python_prefix in + $am__usable_prefix*) + am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'` + am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"` + ;; + *) + am_python_prefix_subst=$am_cv_python_prefix + ;; + esac + else # using GNU prefix value, not python sys.prefix + am_python_prefix_subst='${prefix}' + am_python_prefix=$am_python_prefix_subst + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU default $am_display_PYTHON prefix" >&5 +printf %s "checking for GNU default $am_display_PYTHON prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_prefix" >&5 +printf "%s\n" "$am_python_prefix" >&6; } + fi +fi - { $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)"` + # Substituting python_prefix_subst value. + PYTHON_PREFIX=$am_python_prefix_subst + + + # emacs-page Now do it all over again for Python exec_prefix, but with yet + # another conditional: fall back to regular prefix if that was specified. + +# Check whether --with-python_exec_prefix was given. +if test ${with_python_exec_prefix+y} +then : + withval=$with_python_exec_prefix; am_python_exec_prefix_subst=$withval + am_cv_python_exec_prefix=$withval + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for explicit $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for explicit $am_display_PYTHON exec_prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 +printf "%s\n" "$am_cv_python_exec_prefix" >&6; } +else $as_nop + + # no explicit --with-python_exec_prefix, but if + # --with-python_prefix was given, use its value for python_exec_prefix too. + if test -n "$with_python_prefix" +then : + am_python_exec_prefix_subst=$with_python_prefix + am_cv_python_exec_prefix=$with_python_prefix + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python_prefix-given $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for python_prefix-given $am_display_PYTHON exec_prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 +printf "%s\n" "$am_cv_python_exec_prefix" >&6; } +else $as_nop + + # Set am__usable_exec_prefix whether using GNU or Python values, + # since we use that variable for pyexecdir. + if test "x$exec_prefix" = xNONE; then + am__usable_exec_prefix=$am__usable_prefix + else + am__usable_exec_prefix=$exec_prefix + fi + # + if $am_use_python_sys; then # using python sys.exec_prefix, not GNU + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python default $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for python default $am_display_PYTHON exec_prefix... " >&6; } +if test ${am_cv_python_exec_prefix+y} +then : + printf %s "(cached) " >&6 +else $as_nop + am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_exec_prefix" >&5 +printf "%s\n" "$am_cv_python_exec_prefix" >&6; } + case $am_cv_python_exec_prefix in + $am__usable_exec_prefix*) + am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'` + am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"` + ;; + *) + am_python_exec_prefix_subst=$am_cv_python_exec_prefix + ;; + esac + else # using GNU $exec_prefix, not python sys.exec_prefix + am_python_exec_prefix_subst='${exec_prefix}' + am_python_exec_prefix=$am_python_exec_prefix_subst + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU default $am_display_PYTHON exec_prefix" >&5 +printf %s "checking for GNU default $am_display_PYTHON exec_prefix... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_python_exec_prefix" >&5 +printf "%s\n" "$am_python_exec_prefix" >&6; } + fi +fi 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 + # Substituting python_exec_prefix_subst. + PYTHON_EXEC_PREFIX=$am_python_exec_prefix_subst - # Just factor out some code duplication. + + # Factor out some code duplication into this shell variable. am_python_setup_sysconfig="\ import sys # Prefer sysconfig over distutils.sysconfig, for better compatibility @@ -29128,143 +31429,139 @@ 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 " + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory (pythondir)" >&5 +printf %s "checking for $am_display_PYTHON script directory (pythondir)... " >&6; } +if test ${am_cv_python_pythondir+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "x$am_cv_python_prefix" = x; then + am_py_prefix=$am__usable_prefix + else + am_py_prefix=$am_cv_python_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'}) + 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') + 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 - ;; + # + 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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +printf "%s\n" "$am_cv_python_pythondir" >&6; } pythondir=$am_cv_python_pythondir - - pkgpythondir=\${pythondir}/$PACKAGE + 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 " + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory (pyexecdir)" >&5 +printf %s "checking for $am_display_PYTHON extension module directory (pyexecdir)... " >&6; } +if test ${am_cv_python_pyexecdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "x$am_cv_python_exec_prefix" = x; then + am_py_exec_prefix=$am__usable_exec_prefix + else + am_py_exec_prefix=$am_cv_python_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'}) + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) else: - from distutils import sysconfig - sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_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 - ;; + # + 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; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +printf "%s\n" "$am_cv_python_pyexecdir" >&6; } pyexecdir=$am_cv_python_pyexecdir - - pkgpyexecdir=\${pyexecdir}/$PACKAGE + pkgpyexecdir=\${pyexecdir}/$PACKAGE fi - fi fi PYTHON=$PYTHON -cat >>confdefs.h <<_ACEOF -#define TEST_NM_PYTHON "$PYTHON" -_ACEOF +printf "%s\n" "#define TEST_NM_PYTHON \"$PYTHON\"" >>confdefs.h gtk_doc_requires="gtk-doc >= 1.0" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 -$as_echo_n "checking for gtk-doc... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +printf %s "checking for gtk-doc... " >&6; } if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then have_gtk_doc=yes else have_gtk_doc=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 -$as_echo "$have_gtk_doc" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +printf "%s\n" "$have_gtk_doc" >&6; } if test "$have_gtk_doc" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You will not be able to create source packages with 'make dist' because $gtk_doc_requires is not found." >&5 -$as_echo "$as_me: WARNING: +printf "%s\n" "$as_me: WARNING: You will not be able to create source packages with 'make dist' because $gtk_doc_requires is not found." >&2;} fi # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_GTKDOC_CHECK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$GTKDOC_CHECK"; then ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. else @@ -29272,11 +31569,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29287,21 +31588,22 @@ fi fi GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +printf "%s\n" "$GTKDOC_CHECK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GTKDOC_CHECK_PATH+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $GTKDOC_CHECK_PATH in [\\/]* | ?:[\\/]*) ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. @@ -29311,11 +31613,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_CHECK_PATH="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29327,11 +31633,11 @@ esac fi GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH if test -n "$GTKDOC_CHECK_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 -$as_echo "$GTKDOC_CHECK_PATH" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +printf "%s\n" "$GTKDOC_CHECK_PATH" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -29339,11 +31645,12 @@ fi 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_GTKDOC_REBASE+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GTKDOC_REBASE+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $GTKDOC_REBASE in [\\/]* | ?:[\\/]*) ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path. @@ -29353,11 +31660,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_REBASE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29369,11 +31680,11 @@ esac fi GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE if test -n "$GTKDOC_REBASE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 -$as_echo "$GTKDOC_REBASE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5 +printf "%s\n" "$GTKDOC_REBASE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -29383,11 +31694,12 @@ test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true" # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args. set dummy gtkdoc-mkpdf; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_MKPDF+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GTKDOC_MKPDF+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $GTKDOC_MKPDF in [\\/]* | ?:[\\/]*) ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path. @@ -29397,11 +31709,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_MKPDF="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29413,20 +31729,21 @@ esac fi GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF if test -n "$GTKDOC_MKPDF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 -$as_echo "$GTKDOC_MKPDF" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5 +printf "%s\n" "$GTKDOC_MKPDF" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Check whether --with-html-dir was given. -if test "${with_html_dir+set}" = set; then : +if test ${with_html_dir+y} +then : withval=$with_html_dir; -else +else $as_nop with_html_dir='${datadir}/gtk-doc/html' fi @@ -29434,17 +31751,18 @@ fi # Check whether --enable-gtk-doc was given. -if test "${enable_gtk_doc+set}" = set; then : +if test ${enable_gtk_doc+y} +then : enableval=$enable_gtk_doc; -else +else $as_nop enable_gtk_doc=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +printf %s "checking whether to build gtk-doc documentation... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +printf "%s\n" "$enable_gtk_doc" >&6; } if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then as_fn_error $? " @@ -29456,17 +31774,17 @@ $as_echo "$enable_gtk_doc" >&6; } if test "x$PACKAGE_NAME" != "xglib"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 -$as_echo_n "checking for GTKDOC_DEPS... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +printf %s "checking for GTKDOC_DEPS... " >&6; } if test -n "$GTKDOC_DEPS_CFLAGS"; then pkg_cv_GTKDOC_DEPS_CFLAGS="$GTKDOC_DEPS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29480,10 +31798,10 @@ if test -n "$GTKDOC_DEPS_LIBS"; then pkg_cv_GTKDOC_DEPS_LIBS="$GTKDOC_DEPS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -29497,8 +31815,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -29515,29 +31833,31 @@ fi : elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } : else GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi # Check whether --enable-gtk-doc-html was given. -if test "${enable_gtk_doc_html+set}" = set; then : +if test ${enable_gtk_doc_html+y} +then : enableval=$enable_gtk_doc_html; -else +else $as_nop enable_gtk_doc_html=yes fi # Check whether --enable-gtk-doc-pdf was given. -if test "${enable_gtk_doc_pdf+set}" = set; then : +if test ${enable_gtk_doc_pdf+y} +then : enableval=$enable_gtk_doc_pdf; -else +else $as_nop enable_gtk_doc_pdf=no fi @@ -29611,11 +31931,12 @@ if test -n "$INTROSPECTION_MAKEFILE"; then # 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 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PERL+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PERL in [\\/]* | ?:[\\/]*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. @@ -29625,11 +31946,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29641,11 +31966,11 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +printf "%s\n" "$PERL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -29654,11 +31979,12 @@ fi fi # 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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XSLTPROC+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XSLTPROC in [\\/]* | ?:[\\/]*) ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. @@ -29668,11 +31994,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XSLTPROC="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -29684,11 +32014,11 @@ 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; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +printf "%s\n" "$XSLTPROC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -29785,8 +32115,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -29816,15 +32146,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -29838,8 +32168,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -29856,7 +32186,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -29867,14 +32197,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -30068,8 +32398,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -30092,14 +32422,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -30109,46 +32441,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -30157,13 +32489,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -30172,8 +32497,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -30185,30 +32514,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -30221,13 +32530,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -30254,18 +32564,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -30277,12 +32589,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -30313,7 +32626,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -30335,6 +32648,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -30348,6 +32665,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -30389,7 +32712,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -30398,7 +32721,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -30460,8 +32783,8 @@ 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.38.2, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by NetworkManager $as_me 1.38.4, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -30523,14 +32846,16 @@ $config_commands Report bugs to ." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -NetworkManager config.status 1.38.2 -configured by $0, generated by GNU Autoconf 2.69, +NetworkManager config.status 1.38.4 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -30570,15 +32895,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -30586,7 +32911,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -30595,7 +32920,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -30623,7 +32948,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -30637,7 +32962,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -30689,6 +33014,7 @@ lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_q lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' @@ -30697,6 +33023,7 @@ want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -30871,6 +33198,7 @@ LN_S \ lt_SP2NL \ lt_NL2SP \ reload_flag \ +FILECMD \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -30879,7 +33207,6 @@ want_nocaseglob \ DLLTOOL \ sharedlib_from_linklib_cmd \ AR \ -AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -31069,9 +33396,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -31407,7 +33734,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -31415,17 +33742,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -31442,7 +33769,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -31466,9 +33793,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$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|/||'` + ac_top_builddir_sub=`printf "%s\n" "$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/ ;; @@ -31530,8 +33857,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -31575,9 +33902,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -31593,20 +33920,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -31626,7 +33953,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | +printf "%s\n" X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -31646,8 +33973,8 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -31673,7 +34000,7 @@ esac for am_mf do # Strip MF so we end up with the name of the file. - am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile which includes # dependency-tracking related rules and includes. # Grep'ing the whole file directly is not great: AIX grep has a line @@ -31685,7 +34012,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$am_mf" : 'X\(//\)[^/]' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$am_mf" | +printf "%s\n" X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -31707,7 +34034,7 @@ $as_echo X"$am_mf" | $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$am_mf" | +printf "%s\n" X/"$am_mf" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -31732,8 +34059,8 @@ $as_echo X/"$am_mf" | (exit $ac_status); } || am_rc=$? done if test $am_rc -ne 0; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments for automatic dependency tracking. If GNU make was not used, consider re-running the configure script with MAKE=\"gmake\" (or whatever is @@ -31884,6 +34211,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# A file(cmd) program that detects file types. +FILECMD=$lt_FILECMD + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -31908,8 +34238,11 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd # The archiver. AR=$lt_AR +# Flags to create an archive (by configure). +lt_ar_flags=$lt_ar_flags + # Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS +AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -32291,6 +34624,7 @@ _LT_EOF esac + ltmain=$ac_aux_dir/ltmain.sh @@ -32298,7 +34632,7 @@ ltmain=$ac_aux_dir/ltmain.sh # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -32627,8 +34961,8 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 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;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi @@ -32720,3 +35054,4 @@ echo " Mozilla Public Suffix List: $with_libpsl" echo " eBPF: $have_ebpf" echo " readline: $with_readline" echo + diff --git a/configure.ac b/configure.ac index e907620a..7390800d 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [38]) -m4_define([nm_micro_version], [2]) +m4_define([nm_micro_version], [4]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index b5e385ea..b24b8b6b 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -184,6 +184,8 @@ CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -205,8 +207,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELOGIND_INHIBIT_CFLAGS = @ELOGIND_INHIBIT_CFLAGS@ ELOGIND_INHIBIT_LIBS = @ELOGIND_INHIBIT_LIBS@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -567,6 +571,7 @@ DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ + $(DOC_MODULE).actions \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ $(DOC_MODULE).interfaces \ @@ -664,7 +669,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml b/docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml index a3e0d61c..c649b74a 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml @@ -22,7 +22,9 @@ Description - + + + Property Details @@ -32,8 +34,10 @@ Flags readable u - Flags describing the capabilities of the access point. - Returns: NM80211ApFlags + +Flags describing the capabilities of the access point. + +Returns: NM80211ApFlags @@ -42,9 +46,11 @@ Flags readable u WpaFlags readable u - Flags describing the access point's capabilities according to WPA (Wifi - Protected Access). - Returns: NM80211ApSecurityFlags + +Flags describing the access point's capabilities according to WPA (Wifi +Protected Access). + +Returns: NM80211ApSecurityFlags @@ -53,9 +59,11 @@ WpaFlags readable u RsnFlags readable u - Flags describing the access point's capabilities according to the RSN - (Robust Secure Network) protocol. - Returns: NM80211ApSecurityFlags + +Flags describing the access point's capabilities according to the RSN +(Robust Secure Network) protocol. + +Returns: NM80211ApSecurityFlags @@ -64,7 +72,8 @@ RsnFlags readable u Ssid readable ay - The Service Set Identifier identifying the access point. + +The Service Set Identifier identifying the access point. @@ -73,7 +82,8 @@ Ssid readable ay Frequency readable u - The radio channel frequency in use by the access point, in MHz. + +The radio channel frequency in use by the access point, in MHz. @@ -82,7 +92,8 @@ Frequency readable u HwAddress readable s - The hardware address (BSSID) of the access point. + +The hardware address (BSSID) of the access point. @@ -91,8 +102,10 @@ HwAddress readable s Mode readable u - Describes the operating mode of the access point. - Returns: NM80211Mode + +Describes the operating mode of the access point. + +Returns: NM80211Mode @@ -101,8 +114,9 @@ Mode readable u MaxBitrate readable u - The maximum bitrate this access point is capable of, in kilobits/second - (Kb/s). + +The maximum bitrate this access point is capable of, in kilobits/second +(Kb/s). @@ -111,7 +125,8 @@ MaxBitrate readable u Strength readable y - The current signal quality of the access point, in percent. + +The current signal quality of the access point, in percent. @@ -120,9 +135,10 @@ Strength readable y LastSeen readable i - The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access - point was found in scan results. A value of -1 means the access point has - never been found in scan results. + +The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access +point was found in scan results. A value of -1 means the access point has +never been found in scan results. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml b/docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml index b6a73b6a..7a9b048d 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml @@ -16,7 +16,9 @@ Description - + + + Method Details @@ -26,13 +28,16 @@ Register (IN s identifier); - Called by secret Agents to register their ability to provide and save - network secrets. + +Called by secret Agents to register their ability to provide and save +network secrets. IN s identifier: - Identifies this agent; only one agent in each user session may use the same identifier. Identifier formatting follows the same rules as D-Bus bus names with the exception that the ':' character is not allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the identifier is limited in length to 255 characters with a minimum of 3 characters. An example valid identifier is 'org.gnome.nm-applet' (without quotes). + +Identifies this agent; only one agent in each user session may use the same identifier. Identifier formatting follows the same rules as D-Bus bus names with the exception that the ':' character is not allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the identifier is limited in length to 255 characters with a minimum of 3 characters. An example valid identifier is 'org.gnome.nm-applet' (without quotes). + @@ -43,16 +48,21 @@ Register (IN s identifier); RegisterWithCapabilities (IN s identifier, IN u capabilities); - Like Register() but indicates agent capabilities to NetworkManager. + +Like Register() but indicates agent capabilities to NetworkManager. IN s identifier: - See the Register() method's identifier argument. + +See the Register() method's identifier argument. + IN u capabilities: - (NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager. + +(NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager. + @@ -62,9 +72,10 @@ RegisterWithCapabilities (IN s identifier, Unregister (); - Called by secret Agents to notify NetworkManager that they will no longer - handle requests for network secrets. Agents are automatically unregistered - when they disconnect from D-Bus. + +Called by secret Agents to notify NetworkManager that they will no longer +handle requests for network secrets. Agents are automatically unregistered +when they disconnect from D-Bus. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml index d083906a..00f2a708 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml @@ -35,20 +35,21 @@ Description - Objects that implement the Connection.Active interface represent an - attempt to connect to a network using the details provided by a Connection - object. The Connection.Active object tracks the life-cycle of the - connection attempt and if successful indicates whether the connected - network is the "default" or preferred network for access. NetworkManager - has the concept of connections, which can be thought of as settings, a - profile or a configuration that can be applied on a networking device. - Such settings-connections are exposed as D-Bus object and the - active-connection expresses this relationship between device and - settings-connection. At any time a settings-connection can only be - activated on one device and vice versa. However, during activation and - deactivation multiple active-connections can reference the same device or - settings-connection as they are waiting to be activated or to be - deactivated. + +Objects that implement the Connection.Active interface represent an +attempt to connect to a network using the details provided by a Connection +object. The Connection.Active object tracks the life-cycle of the +connection attempt and if successful indicates whether the connected +network is the "default" or preferred network for access. NetworkManager +has the concept of connections, which can be thought of as settings, a +profile or a configuration that can be applied on a networking device. +Such settings-connections are exposed as D-Bus object and the +active-connection expresses this relationship between device and +settings-connection. At any time a settings-connection can only be +activated on one device and vice versa. However, during activation and +deactivation multiple active-connections can reference the same device or +settings-connection as they are waiting to be activated or to be +deactivated. @@ -60,16 +61,21 @@ StateChanged (u state, u reason); - Emitted when the state of the active connection has changed. + +Emitted when the state of the active connection has changed. u state: - (NMActiveConnectionState) The new state of the active connection. + +(NMActiveConnectionState) The new state of the active connection. + u reason: - (NMActiveConnectionStateReason) Reason code describing the change to the new state. + +(NMActiveConnectionStateReason) Reason code describing the change to the new state. + Since 1.8 @@ -83,7 +89,8 @@ StateChanged (u state, Connection readable o - The path of the connection. + +The path of the connection. @@ -92,9 +99,10 @@ Connection readable o SpecificObject readable o - A specific object associated with the active connection. This property - reflects the specific object used during connection activation, and will - not change over the lifetime of the ActiveConnection once set. + +A specific object associated with the active connection. This property +reflects the specific object used during connection activation, and will +not change over the lifetime of the ActiveConnection once set. @@ -103,8 +111,9 @@ SpecificObject readable o Id readable s - The ID of the connection, provided as a convenience so that clients do not - have to retrieve all connection details. + +The ID of the connection, provided as a convenience so that clients do not +have to retrieve all connection details. @@ -113,8 +122,9 @@ Id readable s Uuid readable s - The UUID of the connection, provided as a convenience so that clients do - not have to retrieve all connection details. + +The UUID of the connection, provided as a convenience so that clients do +not have to retrieve all connection details. @@ -123,8 +133,9 @@ Uuid readable s Type readable s - The type of the connection, provided as a convenience so that clients do - not have to retrieve all connection details. + +The type of the connection, provided as a convenience so that clients do +not have to retrieve all connection details. @@ -133,8 +144,9 @@ Type readable s Devices readable ao - Array of object paths representing devices which are part of this active - connection. + +Array of object paths representing devices which are part of this active +connection. @@ -143,8 +155,10 @@ Devices readable ao State readable u - The state of this active connection. - Returns: NMActiveConnectionState + +The state of this active connection. + +Returns: NMActiveConnectionState @@ -153,8 +167,10 @@ State readable u StateFlags readable u - The state flags of this active connection. - Returns: NMActivationStateFlags + +The state flags of this active connection. + +Returns: NMActivationStateFlags @@ -163,8 +179,9 @@ StateFlags readable u Default readable b - Whether this active connection is the default IPv4 connection, i.e. - whether it currently owns the default IPv4 route. + +Whether this active connection is the default IPv4 connection, i.e. +whether it currently owns the default IPv4 route. @@ -173,9 +190,10 @@ Default readable b Ip4Config readable o - Object path of the Ip4Config object describing the configuration of the - connection. Only valid when the connection is in the - NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + +Object path of the Ip4Config object describing the configuration of the +connection. Only valid when the connection is in the +NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. @@ -184,9 +202,10 @@ Ip4Config readable o Dhcp4Config readable o - Object path of the Dhcp4Config object describing the DHCP options returned - by the DHCP server (assuming the connection used DHCP). Only valid when - the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + +Object path of the Dhcp4Config object describing the DHCP options returned +by the DHCP server (assuming the connection used DHCP). Only valid when +the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. @@ -195,8 +214,9 @@ Dhcp4Config readable o Default6 readable b - Whether this active connection is the default IPv6 connection, i.e. - whether it currently owns the default IPv6 route. + +Whether this active connection is the default IPv6 connection, i.e. +whether it currently owns the default IPv6 route. @@ -205,9 +225,10 @@ Default6 readable b Ip6Config readable o - Object path of the Ip6Config object describing the configuration of the - connection. Only valid when the connection is in the - NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + +Object path of the Ip6Config object describing the configuration of the +connection. Only valid when the connection is in the +NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. @@ -216,9 +237,10 @@ Ip6Config readable o Dhcp6Config readable o - Object path of the Dhcp6Config object describing the DHCP options returned - by the DHCP server (assuming the connection used DHCP). Only valid when - the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. + +Object path of the Dhcp6Config object describing the DHCP options returned +by the DHCP server (assuming the connection used DHCP). Only valid when +the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. @@ -227,7 +249,8 @@ Dhcp6Config readable o Vpn readable b - Whether this active connection is also a VPN connection. + +Whether this active connection is also a VPN connection. @@ -236,7 +259,8 @@ Vpn readable b Master readable o - The path to the master device if the connection is a slave. + +The path to the master device if the connection is a slave. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml b/docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml index 957ed31b..6b879a0a 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml @@ -13,7 +13,8 @@ Description - Options and configuration returned by the IPv4 DHCP server. + +Options and configuration returned by the IPv4 DHCP server. @@ -24,7 +25,8 @@ Options readable a{sv} - Configuration options returned by a DHCP server, if any. + +Configuration options returned by a DHCP server, if any. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml b/docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml index 292abdcd..9a82ff45 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml @@ -13,7 +13,8 @@ Description - Options and configuration returned by the IPv6 DHCP server. + +Options and configuration returned by the IPv6 DHCP server. @@ -24,7 +25,8 @@ Options readable a{sv} - Configuration options returned by a DHCP server, if any. + +Configuration options returned by a DHCP server, if any. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml index 3b2695aa..7846247c 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml @@ -13,7 +13,9 @@ Description - + + + Property Details @@ -23,9 +25,11 @@ Carrier readable b - Indicates whether the physical carrier is found. - DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. + +Indicates whether the physical carrier is found. + +DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml index 6072730d..689ddce7 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml @@ -15,7 +15,9 @@ Description - + + + Property Details @@ -25,8 +27,10 @@ HwAddress readable s - Bluetooth hardware address of the device. - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. + +Bluetooth hardware address of the device. + +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -35,7 +39,8 @@ HwAddress readable s Name readable s - Bluetooth name of the device. + +Bluetooth name of the device. @@ -44,8 +49,10 @@ Name readable s BtCapabilities readable u - Bluetooth capabilities of the device (either DUN or NAP). - Returns: NMBluetoothCapabilities + +Bluetooth capabilities of the device (either DUN or NAP). + +Returns: NMBluetoothCapabilities diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml index f7fcacbd..34d1badf 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml @@ -15,7 +15,9 @@ Description - + + + Property Details @@ -25,9 +27,10 @@ HwAddress readable s - Hardware address of the device. + +Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -36,10 +39,12 @@ n Carrier readable b - Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). - DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. + +Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not). + +DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface. @@ -48,9 +53,10 @@ Carrier readable b Slaves readable ao - DEPRECATED. Use the "Ports" property in - "org.freedesktop.NetworkManager.Device" instead which exists since - version NetworkManager 1.34.0. + +DEPRECATED. Use the "Ports" property in +"org.freedesktop.NetworkManager.Device" instead which exists since +version NetworkManager 1.34.0. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml index 7fa0aad6..18dd8e74 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml @@ -15,7 +15,9 @@ Description - + + + Property Details @@ -25,9 +27,10 @@ HwAddress readable s - Hardware address of the device. + +Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -36,10 +39,12 @@ n Carrier readable b - Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). - DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. + +Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not). + +DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface. @@ -48,9 +53,10 @@ Carrier readable b Slaves readable ao - DEPRECATED. Use the "Ports" property in - "org.freedesktop.NetworkManager.Device" instead which exists since - version NetworkManager 1.34.0. + +DEPRECATED. Use the "Ports" property in +"org.freedesktop.NetworkManager.Device" instead which exists since +version NetworkManager 1.34.0. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml index 62b26cce..05ca8ed9 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Dummy.xml @@ -13,7 +13,9 @@ Description - + + + Property Details @@ -23,9 +25,10 @@ HwAddress readable s - Hardware address of the device. + +Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml index 3a353bf6..f907a844 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml @@ -14,7 +14,9 @@ Description - + + + Property Details @@ -24,9 +26,10 @@ HwAddress readable s - Hardware address of the device. + +Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -35,7 +38,8 @@ n TypeDescription readable s - A (non-localized) description of the interface type, if known. + +A (non-localized) description of the interface type, if known. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml index f57e395f..ffd540f8 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml @@ -24,7 +24,9 @@ Description - + + + Property Details @@ -34,7 +36,8 @@ Mode readable u - The tunneling mode. + +The tunneling mode. @@ -43,7 +46,8 @@ Mode readable u Parent readable o - The object path of the parent device. + +The object path of the parent device. @@ -52,7 +56,8 @@ Parent readable o Local readable s - The local endpoint of the tunnel. + +The local endpoint of the tunnel. @@ -61,7 +66,8 @@ Local readable s Remote readable s - The remote endpoint of the tunnel. + +The remote endpoint of the tunnel. @@ -70,8 +76,9 @@ Remote readable s Ttl readable y - The TTL assigned to tunneled packets. 0 is a special value meaning that - packets inherit the TTL value + +The TTL assigned to tunneled packets. 0 is a special value meaning that +packets inherit the TTL value @@ -80,8 +87,9 @@ Ttl readable y Tos readable y - The type of service (IPv4) or traffic class (IPv6) assigned to tunneled - packets. + +The type of service (IPv4) or traffic class (IPv6) assigned to tunneled +packets. @@ -90,7 +98,8 @@ Tos readable y PathMtuDiscovery readable b - Whether path MTU discovery is enabled on this tunnel. + +Whether path MTU discovery is enabled on this tunnel. @@ -99,7 +108,8 @@ PathMtuDiscovery readable b InputKey readable s - The key used for incoming packets. + +The key used for incoming packets. @@ -108,7 +118,8 @@ InputKey readable s OutputKey readable s - The key used for outgoing packets. + +The key used for outgoing packets. @@ -117,8 +128,9 @@ OutputKey readable s EncapsulationLimit readable y - How many additional levels of encapsulation are permitted to be prepended - to packets. This property applies only to IPv6 tunnels. + +How many additional levels of encapsulation are permitted to be prepended +to packets. This property applies only to IPv6 tunnels. @@ -127,8 +139,9 @@ EncapsulationLimit readable y FlowLabel readable u - The flow label to assign to tunnel packets. This property applies only to - IPv6 tunnels. + +The flow label to assign to tunnel packets. This property applies only to +IPv6 tunnels. @@ -137,7 +150,8 @@ FlowLabel readable u Flags readable u - Tunnel flags. + +Tunnel flags. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml index ae354cd6..ed6533ae 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml @@ -14,7 +14,9 @@ Description - + + + Property Details @@ -24,9 +26,10 @@ HwAddress readable s - Hardware address of the device. + +Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -35,10 +38,12 @@ n Carrier readable b - Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). - DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. + +Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not). + +DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml index 4b1b6a2c..17b772ba 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macsec.xml @@ -25,7 +25,9 @@ Description - + + + Property Details @@ -35,7 +37,8 @@ Parent readable o - The object path of the parent device. + +The object path of the parent device. @@ -44,7 +47,8 @@ Parent readable o Sci readable t - The Secure Channel Identifier in use. + +The Secure Channel Identifier in use. @@ -53,7 +57,8 @@ Sci readable t IcvLength readable y - The length of ICV (Integrity Check Value). + +The length of ICV (Integrity Check Value). @@ -62,8 +67,9 @@ IcvLength readable y CipherSuite readable t - The set of cryptographic algorithms in use - (e.g. 0x0080020001000001 for GCM-AES-128). + +The set of cryptographic algorithms in use +(e.g. 0x0080020001000001 for GCM-AES-128). @@ -72,7 +78,8 @@ CipherSuite readable t Window readable u - The size of the replay window. + +The size of the replay window. @@ -81,8 +88,9 @@ Window readable u EncodingSa readable y - The value of the Association Number (0..3) for the Security - Association in use. + +The value of the Association Number (0..3) for the Security +Association in use. @@ -91,8 +99,9 @@ EncodingSa readable y Validation readable s - The validation mode for incoming packets (strict, check, - disabled). + +The validation mode for incoming packets (strict, check, +disabled). @@ -101,7 +110,8 @@ Validation readable s Encrypt readable b - Whether encryption of transmitted frames is enabled. + +Whether encryption of transmitted frames is enabled. @@ -110,7 +120,8 @@ Encrypt readable b Protect readable b - Whether protection of transmitted frames is enabled. + +Whether protection of transmitted frames is enabled. @@ -119,8 +130,9 @@ Protect readable b IncludeSci readable b - Whether the SCI is always included in SecTAG for transmitted - frames. + +Whether the SCI is always included in SecTAG for transmitted +frames. @@ -129,8 +141,9 @@ IncludeSci readable b Es readable b - Whether the ES (End station) bit is enabled in SecTAG for - transmitted frames. + +Whether the ES (End station) bit is enabled in SecTAG for +transmitted frames. @@ -139,8 +152,9 @@ Es readable b Scb readable b - Whether the SCB (Single Copy Broadcast) bit is enabled in - SecTAG for transmitted frames. + +Whether the SCB (Single Copy Broadcast) bit is enabled in +SecTAG for transmitted frames. @@ -149,7 +163,8 @@ Scb readable b ReplayProtect readable b - Whether replay protection is enabled. + +Whether replay protection is enabled. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml index 5d8b8d45..bec10ff1 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml @@ -16,7 +16,9 @@ Description - + + + Property Details @@ -26,7 +28,8 @@ Parent readable o - The object path of the parent device. + +The object path of the parent device. @@ -35,7 +38,8 @@ Parent readable o Mode readable s - The macvlan mode, one of "private", "vepa", "bridge", or "passthru". + +The macvlan mode, one of "private", "vepa", "bridge", or "passthru". @@ -44,7 +48,8 @@ Mode readable s NoPromisc readable b - Whether the device is blocked from going into promiscuous mode. + +Whether the device is blocked from going into promiscuous mode. @@ -53,7 +58,8 @@ NoPromisc readable b Tap readable b - Whether the device is a macvtap. + +Whether the device is a macvtap. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml index 1eedf1f7..49c4e009 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml @@ -17,7 +17,9 @@ Description - + + + Property Details @@ -27,11 +29,13 @@ ModemCapabilities readable u - The generic family of access technologies the modem supports. Not all - capabilities are available at the same time however; some modems require a - firmware reload or other reinitialization to switch between eg CDMA/EVDO - and GSM/UMTS. - Returns: NMDeviceModemCapabilities + +The generic family of access technologies the modem supports. Not all +capabilities are available at the same time however; some modems require a +firmware reload or other reinitialization to switch between eg CDMA/EVDO +and GSM/UMTS. + +Returns: NMDeviceModemCapabilities @@ -40,9 +44,11 @@ ModemCapabilities readable u CurrentCapabilities readable u - The generic family of access technologies the modem currently supports - without a firmware reload or reinitialization. - Returns: NMDeviceModemCapabilities + +The generic family of access technologies the modem currently supports +without a firmware reload or reinitialization. + +Returns: NMDeviceModemCapabilities @@ -51,9 +57,10 @@ CurrentCapabilities readable u DeviceId readable s - An identifier used by the modem backend (ModemManager) that aims to - uniquely identify the a device. Can be used to match a connection to a - particular device. + +An identifier used by the modem backend (ModemManager) that aims to +uniquely identify the a device. Can be used to match a connection to a +particular device. Since 1.20 @@ -63,8 +70,9 @@ DeviceId readable s OperatorCode readable s - The MCC and MNC (concatenated) of the network the modem is connected to. - Blank if disconnected or not a 3GPP modem. + +The MCC and MNC (concatenated) of the network the modem is connected to. +Blank if disconnected or not a 3GPP modem. Since 1.20 @@ -74,7 +82,8 @@ OperatorCode readable s Apn readable s - The access point name the modem is connected to. Blank if disconnected. + +The access point name the modem is connected to. Blank if disconnected. Since 1.20 diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml index cb71a023..8fc2d33f 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml @@ -15,7 +15,9 @@ Description - + + + Property Details @@ -25,8 +27,10 @@ HwAddress readable s - The hardware address of the device. - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. + +The hardware address of the device. + +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -35,7 +39,8 @@ HwAddress readable s Companion readable o - The object path of the companion device. + +The object path of the companion device. @@ -44,7 +49,8 @@ Companion readable o ActiveChannel readable u - The currently active channel. + +The currently active channel. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml index fce89f6d..97fa4586 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml @@ -15,7 +15,9 @@ Description - + + + Property Details @@ -25,10 +27,11 @@ RefreshRateMs readwrite u - Refresh rate of the rest of properties of this interface. The properties - are guaranteed to be refreshed each RefreshRateMs milliseconds in case - the underlying counter has changed too. - If zero, there is no guaranteed refresh rate of the properties. + +Refresh rate of the rest of properties of this interface. The properties +are guaranteed to be refreshed each RefreshRateMs milliseconds in case +the underlying counter has changed too. +If zero, there is no guaranteed refresh rate of the properties. @@ -37,7 +40,8 @@ RefreshRateMs readwrite u TxBytes readable t - Number of transmitted bytes + +Number of transmitted bytes @@ -46,7 +50,8 @@ TxBytes readable t RxBytes readable t - Number of received bytes + +Number of received bytes diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml index ce1889e3..d63bad6a 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml @@ -16,7 +16,9 @@ Description - + + + Property Details @@ -26,9 +28,10 @@ HwAddress readable s - Hardware address of the device. + +Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -37,10 +40,12 @@ n Carrier readable b - Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). - DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. + +Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not). + +DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface. @@ -49,9 +54,10 @@ Carrier readable b Slaves readable ao - DEPRECATED. Use the "Ports" property in - "org.freedesktop.NetworkManager.Device" instead which exists since - version NetworkManager 1.34.0. + +DEPRECATED. Use the "Ports" property in +"org.freedesktop.NetworkManager.Device" instead which exists since +version NetworkManager 1.34.0. @@ -60,7 +66,8 @@ Slaves readable ao Config readable s - The JSON configuration currently applied on the device. + +The JSON configuration currently applied on the device. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml index 5f1ea7e4..0b5f198a 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml @@ -19,7 +19,9 @@ Description - + + + Property Details @@ -29,7 +31,8 @@ Owner readable x - The uid of the tunnel owner, or -1 if it has no owner. + +The uid of the tunnel owner, or -1 if it has no owner. @@ -38,7 +41,8 @@ Owner readable x Group readable x - The gid of the tunnel group, or -1 if it has no owner. + +The gid of the tunnel group, or -1 if it has no owner. @@ -47,7 +51,8 @@ Group readable x Mode readable s - The tunnel mode, either "tun" or "tap". + +The tunnel mode, either "tun" or "tap". @@ -56,8 +61,9 @@ Mode readable s NoPi readable b - The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to - the tunnel packets. + +The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to +the tunnel packets. @@ -66,8 +72,9 @@ NoPi readable b VnetHdr readable b - The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a - virtio network header. + +The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a +virtio network header. @@ -76,8 +83,9 @@ VnetHdr readable b MultiQueue readable b - The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap - device multiple times, for multiple send/receive queues. + +The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap +device multiple times, for multiple send/receive queues. @@ -86,9 +94,10 @@ MultiQueue readable b HwAddress readable s - Hardware address of the device. + +Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml index 3e34a661..fba9ac92 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml @@ -13,7 +13,9 @@ Description - + + + Property Details @@ -23,7 +25,8 @@ Peer readable o - The object path of the device's peer. + +The object path of the device's peer. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml index 21e224ad..2752e5b6 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml @@ -16,7 +16,9 @@ Description - + + + Property Details @@ -26,9 +28,10 @@ HwAddress readable s - Hardware address of the device. + +Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -37,10 +40,12 @@ n Carrier readable b - Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). - DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. + +Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not). + +DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface. @@ -49,7 +54,8 @@ Carrier readable b Parent readable o - Object path of the parent device of this VLAN device. + +Object path of the parent device of this VLAN device. @@ -58,7 +64,8 @@ Parent readable o VlanId readable u - The VLAN ID of this VLAN interface. + +The VLAN ID of this VLAN interface. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml index 9b11c25a..b4940213 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml @@ -29,7 +29,9 @@ Description - + + + Property Details @@ -39,8 +41,9 @@ Parent readable o - The object path of the parent device (if the VXLAN is not purely internal - to this host). + +The object path of the parent device (if the VXLAN is not purely internal +to this host). @@ -49,9 +52,10 @@ Parent readable o HwAddress readable s - Hardware address of the device. + +Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -60,7 +64,8 @@ n Id readable u - The VXLAN Network Identifier (VNI). + +The VXLAN Network Identifier (VNI). @@ -69,8 +74,9 @@ Id readable u Group readable s - The IP (v4 or v6) multicast group used to communicate with other physical - hosts on this VXLAN. + +The IP (v4 or v6) multicast group used to communicate with other physical +hosts on this VXLAN. @@ -79,8 +85,9 @@ Group readable s Local readable s - The local IPv4 or IPv6 address to use when sending VXLAN packets to other - physical hosts. + +The local IPv4 or IPv6 address to use when sending VXLAN packets to other +physical hosts. @@ -89,8 +96,9 @@ Local readable s Tos readable y - The value to use in the IP ToS field for VXLAN packets sent to other - physical hosts. + +The value to use in the IP ToS field for VXLAN packets sent to other +physical hosts. @@ -99,8 +107,9 @@ Tos readable y Ttl readable y - The value to use in the IP TTL field for VXLAN packets sent to other - physical hosts. + +The value to use in the IP TTL field for VXLAN packets sent to other +physical hosts. @@ -109,7 +118,8 @@ Ttl readable y Learning readable b - True if the VXLAN dynamically learns remote IP addresses. + +True if the VXLAN dynamically learns remote IP addresses. @@ -118,7 +128,8 @@ Learning readable b Ageing readable u - The interval in seconds at which the kernel purges stale cached addresses. + +The interval in seconds at which the kernel purges stale cached addresses. @@ -127,8 +138,9 @@ Ageing readable u Limit readable u - The maximum number of entries that can be added to the VXLAN's forwarding - table. + +The maximum number of entries that can be added to the VXLAN's forwarding +table. @@ -137,7 +149,8 @@ Limit readable u DstPort readable q - Destination port for outgoing VXLAN packets. + +Destination port for outgoing VXLAN packets. @@ -146,7 +159,8 @@ DstPort readable q SrcPortMin readable q - The lowest source port number to use for outgoing VXLAN packets. + +The lowest source port number to use for outgoing VXLAN packets. @@ -155,7 +169,8 @@ SrcPortMin readable q SrcPortMax readable q - The highest source port number to use for outgoing VXLAN packets. + +The highest source port number to use for outgoing VXLAN packets. @@ -164,7 +179,8 @@ SrcPortMax readable q Proxy readable b - True if the VXLAN is implementing DOVE ARP proxying for remote clients. + +True if the VXLAN is implementing DOVE ARP proxying for remote clients. @@ -173,8 +189,9 @@ Proxy readable b Rsc readable b - True if the VXLAN is implementing DOVE route short-circuiting of known - remote IP addresses. + +True if the VXLAN is implementing DOVE route short-circuiting of known +remote IP addresses. @@ -183,7 +200,8 @@ Rsc readable b L2miss readable b - True if the VXLAN will emit netlink notifications of L2 switch misses. + +True if the VXLAN will emit netlink notifications of L2 switch misses. @@ -192,7 +210,8 @@ L2miss readable b L3miss readable b - True if the VXLAN will emit netlink notifications of L3 switch misses. + +True if the VXLAN will emit netlink notifications of L3 switch misses. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml index 78d31736..f34c309b 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.WifiP2P.xml @@ -28,7 +28,9 @@ Description - + + + Since 1.16 @@ -39,20 +41,25 @@ StartFind (IN a{sv} options); - Start a find operation for Wi-Fi P2P peers. - The options argument accepts the following keys: - - - i timeout: - Timeout value in the range of 1-600 seconds. - The default is 30 seconds. - - + +Start a find operation for Wi-Fi P2P peers. + +The options argument accepts the following keys: + + + +i timeout: +Timeout value in the range of 1-600 seconds. +The default is 30 seconds. + + IN a{sv} options: - Options of find. + +Options of find. + Since 1.16 @@ -63,7 +70,8 @@ StartFind (IN a{sv} options); StopFind (); - Stop an ongoing find operation again. + +Stop an ongoing find operation again. Since 1.16 @@ -76,12 +84,15 @@ StopFind (); PeerAdded (o peer); - Emitted when a new Wi-Fi P2P peer is found by the device. + +Emitted when a new Wi-Fi P2P peer is found by the device. o peer: - The object path of the newly found access point. + +The object path of the newly found access point. + Since 1.16 @@ -92,12 +103,15 @@ PeerAdded (o peer); PeerRemoved (o peer); - Emitted when a Wi-Fi P2P peer disappears from view of the device. + +Emitted when a Wi-Fi P2P peer disappears from view of the device. o peer: - The object path of the Wi-Fi P2P peer that has disappeared. + +The object path of the Wi-Fi P2P peer that has disappeared. + Since 1.16 @@ -111,8 +125,10 @@ PeerRemoved (o peer); HwAddress readable s - The active hardware address of the device. - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. + +The active hardware address of the device. + +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. Since 1.16 @@ -122,7 +138,8 @@ HwAddress readable s Peers readable ao - List of object paths of peers visible to this Wi-Fi P2P device. + +List of object paths of peers visible to this Wi-Fi P2P device. Since 1.16 diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml index 0c6fa36e..3a754296 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml @@ -15,7 +15,9 @@ Description - + + + Property Details @@ -25,7 +27,8 @@ PublicKey readable ay - 32-byte public WireGuard key. + +32-byte public WireGuard key. @@ -34,7 +37,8 @@ PublicKey readable ay ListenPort readable q - Local UDP listening port. + +Local UDP listening port. @@ -43,8 +47,9 @@ ListenPort readable q FwMark readable u - Optional 32-bit mark used to set routing policy for outgoing encrypted packets. - See: ip-rule(8) + +Optional 32-bit mark used to set routing policy for outgoing encrypted packets. +See: ip-rule(8) diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml index 8f92f11a..320300db 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml @@ -17,7 +17,9 @@ Description - + + + Property Details @@ -27,8 +29,10 @@ HwAddress readable s - Active hardware address of the device. - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. + +Active hardware address of the device. + +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -37,7 +41,8 @@ HwAddress readable s PermHwAddress readable s - Permanent hardware address of the device. + +Permanent hardware address of the device. @@ -46,7 +51,8 @@ PermHwAddress readable s Speed readable u - Design speed of the device, in megabits/second (Mb/s). + +Design speed of the device, in megabits/second (Mb/s). @@ -55,7 +61,8 @@ Speed readable u S390Subchannels readable as - Array of S/390 subchannels for S/390 or z/Architecture devices. + +Array of S/390 subchannels for S/390 or z/Architecture devices. @@ -64,10 +71,12 @@ S390Subchannels readable as Carrier readable b - Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). - DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. + +Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not). + +DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml index 7987e594..8a2e6740 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml @@ -35,7 +35,9 @@ Description - + + + Method Details @@ -45,15 +47,18 @@ GetAccessPoints (OUT ao access_points); - DEPRECATED. Get the list of access points visible to this device. Note - that this list does not include access points which hide their SSID. To - retrieve a list of all access points (including hidden ones) use the - GetAllAccessPoints() method. + +DEPRECATED. Get the list of access points visible to this device. Note +that this list does not include access points which hide their SSID. To +retrieve a list of all access points (including hidden ones) use the +GetAllAccessPoints() method. OUT ao access_points: - List of access point object paths. + +List of access point object paths. + @@ -63,13 +68,16 @@ GetAccessPoints (OUT ao access_points); GetAllAccessPoints (OUT ao access_points); - Get the list of all access points visible to this device, including hidden - ones for which the SSID is not yet known. + +Get the list of all access points visible to this device, including hidden +ones for which the SSID is not yet known. OUT ao access_points: - List of access point object paths. + +List of access point object paths. + @@ -79,12 +87,15 @@ GetAllAccessPoints (OUT ao access_points); RequestScan (IN a{sv} options); - Request the device to scan. To know when the scan is finished, use the "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" to listen to changes to the "LastScan" property. + +Request the device to scan. To know when the scan is finished, use the "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" to listen to changes to the "LastScan" property. IN a{sv} options: - Options of scan. Currently, 'ssids' option with value of "aay" type is supported. + +Options of scan. Currently, 'ssids' option with value of "aay" type is supported. + @@ -97,12 +108,15 @@ RequestScan (IN a{sv} options); AccessPointAdded (o access_point); - Emitted when a new access point is found by the device. + +Emitted when a new access point is found by the device. o access_point: - The object path of the newly found access point. + +The object path of the newly found access point. + @@ -112,12 +126,15 @@ AccessPointAdded (o access_point); AccessPointRemoved (o access_point); - Emitted when an access point disappears from view of the device. + +Emitted when an access point disappears from view of the device. o access_point: - The object path of the access point that has disappeared. + +The object path of the access point that has disappeared. + @@ -130,8 +147,10 @@ AccessPointRemoved (o access_point); HwAddress readable s - The active hardware address of the device. - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. + +The active hardware address of the device. + +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. @@ -140,7 +159,8 @@ HwAddress readable s PermHwAddress readable s - The permanent hardware address of the device. + +The permanent hardware address of the device. @@ -149,8 +169,10 @@ PermHwAddress readable s Mode readable u - The operating mode of the wireless device. - Returns: NM80211Mode + +The operating mode of the wireless device. + +Returns: NM80211Mode @@ -159,8 +181,9 @@ Mode readable u Bitrate readable u - The bit rate currently used by the wireless device, in kilobits/second - (Kb/s). + +The bit rate currently used by the wireless device, in kilobits/second +(Kb/s). @@ -169,7 +192,8 @@ Bitrate readable u AccessPoints readable ao - List of object paths of access point visible to this wireless device. + +List of object paths of access point visible to this wireless device. @@ -178,7 +202,8 @@ AccessPoints readable ao ActiveAccessPoint readable o - Object path of the access point currently used by the wireless device. + +Object path of the access point currently used by the wireless device. @@ -187,8 +212,10 @@ ActiveAccessPoint readable o WirelessCapabilities readable u - The capabilities of the wireless device. - Returns: NMDeviceWifiCapabilities + +The capabilities of the wireless device. + +Returns: NMDeviceWifiCapabilities @@ -197,8 +224,9 @@ WirelessCapabilities readable u LastScan readable x - The timestamp (in CLOCK_BOOTTIME milliseconds) for the last finished network scan. - A value of -1 means the device never scanned for access points. + +The timestamp (in CLOCK_BOOTTIME milliseconds) for the last finished network scan. +A value of -1 means the device never scanned for access points. Since 1.12 diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml index cf1410be..0d73ca72 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Device.xml @@ -65,7 +65,9 @@ Description - + + + Method Details @@ -77,39 +79,46 @@ Reapply (IN a{sa{sv}} connection, IN t version_id, IN u flags); - Attempts to update the configuration of a device without deactivating it. - NetworkManager has the concept of connections, which are profiles that - contain the configuration for a networking device. Those connections are - exposed via D-Bus as individual objects that can be created, modified and - deleted. When activating such a settings-connection on a device, the - settings-connection is cloned to become an applied-connection and used to - configure the device (see GetAppliedConnection). Subsequent modification - of the settings-connection don't propagate automatically to the device's - applied-connection (with exception of the firewall-zone and the metered - property). For the changes to take effect, you can either re-activate the - settings-connection, or call Reapply. The Reapply call allows you to - directly update the applied-connection and reconfigure the device. Reapply - can also be useful if the currently applied-connection is equal to the - connection that is about to be reapplied. This allows to reconfigure the - device and revert external changes like removing or adding an IP address - (which NetworkManager doesn't revert automatically because it is assumed - that the user made these changes intentionally outside of NetworkManager). - Reapply can make the applied-connection different from the - settings-connection, just like updating the settings-connection can make - them different. + +Attempts to update the configuration of a device without deactivating it. +NetworkManager has the concept of connections, which are profiles that +contain the configuration for a networking device. Those connections are +exposed via D-Bus as individual objects that can be created, modified and +deleted. When activating such a settings-connection on a device, the +settings-connection is cloned to become an applied-connection and used to +configure the device (see GetAppliedConnection). Subsequent modification +of the settings-connection don't propagate automatically to the device's +applied-connection (with exception of the firewall-zone and the metered +property). For the changes to take effect, you can either re-activate the +settings-connection, or call Reapply. The Reapply call allows you to +directly update the applied-connection and reconfigure the device. Reapply +can also be useful if the currently applied-connection is equal to the +connection that is about to be reapplied. This allows to reconfigure the +device and revert external changes like removing or adding an IP address +(which NetworkManager doesn't revert automatically because it is assumed +that the user made these changes intentionally outside of NetworkManager). +Reapply can make the applied-connection different from the +settings-connection, just like updating the settings-connection can make +them different. IN a{sa{sv}} connection: - The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarily differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses. + +The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarily differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses. + IN t version_id: - If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply. + +If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply. + IN u flags: - Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0. + +Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0. + @@ -121,26 +130,33 @@ GetAppliedConnection (IN u flags, OUT a{sa{sv}} connection, OUT t version_id); - Get the currently applied connection on the device. This is a snapshot of - the last activated connection on the device, that is the configuration - that is currently applied on the device. Usually this is the same as - GetSettings of the referenced settings connection. However, it can differ - if the settings connection was subsequently modified or the applied - connection was modified by Reapply. The applied connection is set when - activating a device or when calling Reapply. + +Get the currently applied connection on the device. This is a snapshot of +the last activated connection on the device, that is the configuration +that is currently applied on the device. Usually this is the same as +GetSettings of the referenced settings connection. However, it can differ +if the settings connection was subsequently modified or the applied +connection was modified by Reapply. The applied connection is set when +activating a device or when calling Reapply. IN u flags: - Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0. + +Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0. + OUT a{sa{sv}} connection: - The effective connection settings that the connection has currently applied. + +The effective connection settings that the connection has currently applied. + OUT t version_id: - The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail. + +The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail. + @@ -150,8 +166,9 @@ GetAppliedConnection (IN u flags, Disconnect (); - Disconnects a device and prevents the device from automatically activating - further connections without user intervention. + +Disconnects a device and prevents the device from automatically activating +further connections without user intervention. @@ -160,9 +177,10 @@ Disconnect (); Delete (); - Deletes a software device from NetworkManager and removes the interface - from the system. The method returns an error when called for a hardware - device. + +Deletes a software device from NetworkManager and removes the interface +from the system. The method returns an error when called for a hardware +device. @@ -176,19 +194,27 @@ StateChanged (u new_state, u old_state, u reason); - + + + u new_state: - (NMDeviceState) The new state of the device. + +(NMDeviceState) The new state of the device. + u old_state: - (NMDeviceState) The previous state of the device. + +(NMDeviceState) The previous state of the device. + u reason: - (NMDeviceStateReason) A reason for the state transition. + +(NMDeviceStateReason) A reason for the state transition. + @@ -201,19 +227,21 @@ StateChanged (u new_state, Udi readable s - Operating-system specific transient device hardware identifier. This is an - opaque string representing the underlying hardware for the device, and - shouldn't be used to keep track of individual devices. For some device - types (Bluetooth, Modems) it is an identifier used by the hardware service - (ie bluez or ModemManager) to refer to that device, and client programs - use it get additional information from those services which NM does not - provide. The Udi is not guaranteed to be consistent across reboots or - hotplugs of the hardware. If you're looking for a way to uniquely track - each device in your application, use the object path. If you're looking - for a way to track a specific piece of hardware across reboot or hotplug, - use a MAC address or USB serial number. - Note that non-UTF-8 characters are backslash escaped. Use g_strcompress() - to obtain the true (non-UTF-8) string. + +Operating-system specific transient device hardware identifier. This is an +opaque string representing the underlying hardware for the device, and +shouldn't be used to keep track of individual devices. For some device +types (Bluetooth, Modems) it is an identifier used by the hardware service +(ie bluez or ModemManager) to refer to that device, and client programs +use it get additional information from those services which NM does not +provide. The Udi is not guaranteed to be consistent across reboots or +hotplugs of the hardware. If you're looking for a way to uniquely track +each device in your application, use the object path. If you're looking +for a way to track a specific piece of hardware across reboot or hotplug, +use a MAC address or USB serial number. + +Note that non-UTF-8 characters are backslash escaped. Use g_strcompress() +to obtain the true (non-UTF-8) string. @@ -222,9 +250,11 @@ Udi readable s Path readable s - The path of the device as exposed by the udev property ID_PATH. - Note that non-UTF-8 characters are backslash escaped. Use g_strcompress() - to obtain the true (non-UTF-8) string. + +The path of the device as exposed by the udev property ID_PATH. + +Note that non-UTF-8 characters are backslash escaped. Use g_strcompress() +to obtain the true (non-UTF-8) string. @@ -233,10 +263,11 @@ Path readable s Interface readable s - The name of the device's control (and often data) interface. - Note that non UTF-8 characters are backslash escaped, so the - resulting name may be longer then 15 characters. Use g_strcompress() - to revert the escaping. + +The name of the device's control (and often data) interface. +Note that non UTF-8 characters are backslash escaped, so the +resulting name may be longer then 15 characters. Use g_strcompress() +to revert the escaping. @@ -245,13 +276,14 @@ Interface readable s IpInterface readable s - The name of the device's data interface when available. This property may - not refer to the actual data interface until the device has successfully - established a data connection, indicated by the device's State becoming - ACTIVATED. - Note that non UTF-8 characters are backslash escaped, so the - resulting name may be longer then 15 characters. Use g_strcompress() - to revert the escaping. + +The name of the device's data interface when available. This property may +not refer to the actual data interface until the device has successfully +established a data connection, indicated by the device's State becoming +ACTIVATED. +Note that non UTF-8 characters are backslash escaped, so the +resulting name may be longer then 15 characters. Use g_strcompress() +to revert the escaping. @@ -260,9 +292,10 @@ IpInterface readable s Driver readable s - The driver handling the device. - Non-UTF-8 sequences are backslash escaped. Use g_strcompress() - to revert. + +The driver handling the device. +Non-UTF-8 sequences are backslash escaped. Use g_strcompress() +to revert. @@ -271,9 +304,10 @@ Driver readable s DriverVersion readable s - The version of the driver handling the device. - Non-UTF-8 sequences are backslash escaped. Use g_strcompress() - to revert. + +The version of the driver handling the device. +Non-UTF-8 sequences are backslash escaped. Use g_strcompress() +to revert. @@ -282,9 +316,10 @@ DriverVersion readable s FirmwareVersion readable s - The firmware version for the device. - Non-UTF-8 sequences are backslash escaped. Use g_strcompress() - to revert. + +The firmware version for the device. +Non-UTF-8 sequences are backslash escaped. Use g_strcompress() +to revert. @@ -293,8 +328,10 @@ FirmwareVersion readable s Capabilities readable u - Flags describing the capabilities of the device. - Returns: NMDeviceCapabilities + +Flags describing the capabilities of the device. + +Returns: NMDeviceCapabilities @@ -303,8 +340,9 @@ Capabilities readable u Ip4Address readable u - DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object - instead. This property always returns 0.0.0.0 (numeric 0) as address. + +DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object +instead. This property always returns 0.0.0.0 (numeric 0) as address. @@ -313,8 +351,10 @@ Ip4Address readable u State readable u - The current state of the device. - Returns: NMDeviceState + +The current state of the device. + +Returns: NMDeviceState @@ -323,8 +363,10 @@ State readable u StateReason readable (uu) - The current state and reason for changing to that state. - Returns: A tuple of NMDeviceState and NMDeviceStateReason. + +The current state and reason for changing to that state. + +Returns: A tuple of NMDeviceState and NMDeviceStateReason. @@ -333,10 +375,11 @@ StateReason readable (uu) ActiveConnection readable o - Object path of an ActiveConnection object that "owns" this device during - activation. The ActiveConnection object tracks the life-cycle of a - connection to a specific network and implements the - org.freedesktop.NetworkManager.Connection.Active D-Bus interface. + +Object path of an ActiveConnection object that "owns" this device during +activation. The ActiveConnection object tracks the life-cycle of a +connection to a specific network and implements the +org.freedesktop.NetworkManager.Connection.Active D-Bus interface. @@ -345,9 +388,10 @@ ActiveConnection readable o Ip4Config readable o - Object path of the Ip4Config object describing the configuration of the - device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED - state. + +Object path of the Ip4Config object describing the configuration of the +device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED +state. @@ -356,9 +400,10 @@ Ip4Config readable o Dhcp4Config readable o - Object path of the Dhcp4Config object describing the DHCP options returned - by the DHCP server. Only valid when the device is in the - NM_DEVICE_STATE_ACTIVATED state. + +Object path of the Dhcp4Config object describing the DHCP options returned +by the DHCP server. Only valid when the device is in the +NM_DEVICE_STATE_ACTIVATED state. @@ -367,9 +412,10 @@ Dhcp4Config readable o Ip6Config readable o - Object path of the Ip6Config object describing the configuration of the - device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED - state. + +Object path of the Ip6Config object describing the configuration of the +device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED +state. @@ -378,9 +424,10 @@ Ip6Config readable o Dhcp6Config readable o - Object path of the Dhcp6Config object describing the DHCP options returned - by the DHCP server. Only valid when the device is in the - NM_DEVICE_STATE_ACTIVATED state. + +Object path of the Dhcp6Config object describing the DHCP options returned +by the DHCP server. Only valid when the device is in the +NM_DEVICE_STATE_ACTIVATED state. @@ -389,10 +436,11 @@ Dhcp6Config readable o Managed readwrite b - Whether or not this device is managed by NetworkManager. Setting this - property has a similar effect to configuring the device as unmanaged via - the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to - this value are not persistent and lost after NetworkManager restart. + +Whether or not this device is managed by NetworkManager. Setting this +property has a similar effect to configuring the device as unmanaged via +the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to +this value are not persistent and lost after NetworkManager restart. @@ -401,11 +449,12 @@ Managed readwrite b Autoconnect readwrite b - If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual - intervention is required before the device will automatically connect to a - known network, such as activating a connection using the device, or - setting this property to TRUE. This property cannot be set to TRUE for - default-unmanaged devices, since they never autoconnect. + +If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual +intervention is required before the device will automatically connect to a +known network, such as activating a connection using the device, or +setting this property to TRUE. This property cannot be set to TRUE for +default-unmanaged devices, since they never autoconnect. @@ -414,8 +463,9 @@ Autoconnect readwrite b FirmwareMissing readable b - If TRUE, indicates the device is likely missing firmware necessary for its - operation. + +If TRUE, indicates the device is likely missing firmware necessary for its +operation. @@ -424,8 +474,9 @@ FirmwareMissing readable b NmPluginMissing readable b - If TRUE, indicates the NetworkManager plugin for the device is likely - missing or misconfigured. + +If TRUE, indicates the NetworkManager plugin for the device is likely +missing or misconfigured. @@ -434,8 +485,10 @@ NmPluginMissing readable b DeviceType readable u - The general type of the network device; ie Ethernet, Wi-Fi, etc. - Returns: NMDeviceType + +The general type of the network device; ie Ethernet, Wi-Fi, etc. + +Returns: NMDeviceType @@ -444,8 +497,9 @@ DeviceType readable u AvailableConnections readable ao - An array of object paths of every configured connection that is currently - 'available' through this device. + +An array of object paths of every configured connection that is currently +'available' through this device. @@ -454,10 +508,11 @@ AvailableConnections readable ao PhysicalPortId readable s - If non-empty, an (opaque) indicator of the physical network port - associated with the device. This can be used to recognize when two - seemingly-separate hardware devices are actually just different virtual - interfaces to the same physical port. + +If non-empty, an (opaque) indicator of the physical network port +associated with the device. This can be used to recognize when two +seemingly-separate hardware devices are actually just different virtual +interfaces to the same physical port. @@ -466,7 +521,8 @@ PhysicalPortId readable s Mtu readable u - The device MTU (maximum transmission unit). + +The device MTU (maximum transmission unit). @@ -475,9 +531,11 @@ Mtu readable u Metered readable u - Whether the amount of traffic flowing through the device is subject to - limitations, for example set by service providers. - Returns: NMMetered + +Whether the amount of traffic flowing through the device is subject to +limitations, for example set by service providers. + +Returns: NMMetered @@ -486,8 +544,9 @@ Metered readable u LldpNeighbors readable aa{sv} - Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV - names to variant boxed values. + +Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV +names to variant boxed values. @@ -496,9 +555,10 @@ LldpNeighbors readable aa{sv} Real readable b - True if the device exists, or False for placeholder devices that do not - yet exist but could be automatically created by NetworkManager if one of - their AvailableConnections was activated. + +True if the device exists, or False for placeholder devices that do not +yet exist but could be automatically created by NetworkManager if one of +their AvailableConnections was activated. @@ -507,8 +567,10 @@ Real readable b Ip4Connectivity readable u - The result of the last IPv4 connectivity check. - Returns: NMConnectivityState + +The result of the last IPv4 connectivity check. + +Returns: NMConnectivityState Since 1.16 @@ -518,8 +580,10 @@ Ip4Connectivity readable u Ip6Connectivity readable u - The result of the last IPv6 connectivity check. - Returns: NMConnectivityState + +The result of the last IPv6 connectivity check. + +Returns: NMConnectivityState Since 1.16 @@ -529,9 +593,10 @@ Ip6Connectivity readable u InterfaceFlags readable u - The flags of the network interface. See - NMDeviceInterfaceFlags for - the currently defined flags. + +The flags of the network interface. See +NMDeviceInterfaceFlags for +the currently defined flags. Since 1.22 @@ -541,8 +606,10 @@ InterfaceFlags readable u HwAddress readable s - The hardware address of the device. - This replaces the other 'HwAddress' properties on the device-specific D-Bus interfaces. + +The hardware address of the device. + +This replaces the other 'HwAddress' properties on the device-specific D-Bus interfaces. Since 1.24 @@ -552,10 +619,12 @@ HwAddress readable s Ports readable ao - The port devices of the controller device. - Array of object paths representing devices which are currently set as - port of this device. This replaces the 'Slaves' properties on the - device-specific D-Bus interfaces. + +The port devices of the controller device. + +Array of object paths representing devices which are currently set as +port of this device. This replaces the 'Slaves' properties on the +device-specific D-Bus interfaces. Since 1.34 diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml b/docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml index 70b30f88..0488bd65 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml @@ -15,7 +15,8 @@ Description - The interface contains DNS-related information. + +The interface contains DNS-related information. @@ -26,7 +27,8 @@ Mode readable s - The current DNS processing mode. + +The current DNS processing mode. @@ -35,7 +37,8 @@ Mode readable s RcManager readable s - The current resolv.conf management mode. + +The current resolv.conf management mode. @@ -44,13 +47,14 @@ RcManager readable s Configuration readable aa{sv} - The current DNS configuration represented as an array of - dictionaries. Each dictionary has the "nameservers", - "priority" keys and, optionally, "interface" and "vpn". - "nameservers" is the list of DNS servers, "priority" their - relative priority, "interface" the interface on which these - servers are contacted, "vpn" a boolean telling whether the - configuration was obtained from a VPN connection. + +The current DNS configuration represented as an array of +dictionaries. Each dictionary has the "nameservers", +"priority" keys and, optionally, "interface" and "vpn". +"nameservers" is the list of DNS servers, "priority" their +relative priority, "interface" the interface on which these +servers are contacted, "vpn" a boolean telling whether the +configuration was obtained from a VPN connection. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml b/docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml index 4f90746c..94a9ec44 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml @@ -25,7 +25,9 @@ Description - + + + Property Details @@ -35,9 +37,10 @@ Addresses readable aau - Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each - array are in network byte order. Essentially: [(addr, prefix, gateway), - (addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway + +Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each +array are in network byte order. Essentially: [(addr, prefix, gateway), +(addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway @@ -46,9 +49,10 @@ Addresses readable aau AddressData readable aa{sv} - Array of IP address data objects. All addresses will include "address" (an - IP address string), and "prefix" (a uint). Some addresses may include - additional attributes. + +Array of IP address data objects. All addresses will include "address" (an +IP address string), and "prefix" (a uint). Some addresses may include +additional attributes. @@ -57,7 +61,8 @@ AddressData readable aa{sv} Gateway readable s - The gateway in use. + +The gateway in use. @@ -66,11 +71,12 @@ Gateway readable s Routes readable aau - Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple - are in network byte order. 'route' and 'next hop' are IPv4 addresses, - while prefix and metric are simple unsigned integers. Essentially: - [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), - ...] Deprecated: use RouteData + +Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple +are in network byte order. 'route' and 'next hop' are IPv4 addresses, +while prefix and metric are simple unsigned integers. Essentially: +[(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), +...] Deprecated: use RouteData @@ -79,9 +85,10 @@ Routes readable aau RouteData readable aa{sv} - Array of IP route data objects. All routes will include "dest" (an IP - address string) and "prefix" (a uint). Some routes may include "next-hop" - (an IP address string), "metric" (a uint), and additional attributes. + +Array of IP route data objects. All routes will include "dest" (an IP +address string) and "prefix" (a uint). Some routes may include "next-hop" +(an IP address string), "metric" (a uint), and additional attributes. @@ -90,7 +97,8 @@ RouteData readable aa{sv} Nameservers readable au - The nameservers in use. Deprecated: use NameserverData + +The nameservers in use. Deprecated: use NameserverData @@ -99,8 +107,9 @@ Nameservers readable au NameserverData readable aa{sv} - The nameservers in use. Currently, only the value "address" - is recognized (with an IP address string). + +The nameservers in use. Currently, only the value "address" +is recognized (with an IP address string). Since 1.14 @@ -110,7 +119,8 @@ NameserverData readable aa{sv} Domains readable as - A list of domains this address belongs to. + +A list of domains this address belongs to. @@ -119,7 +129,8 @@ Domains readable as Searches readable as - A list of dns searches. + +A list of dns searches. @@ -128,8 +139,9 @@ Searches readable as DnsOptions readable as - A list of DNS options that modify the behavior of the DNS resolver. See - resolv.conf(5) manual page for the list of supported options. + +A list of DNS options that modify the behavior of the DNS resolver. See +resolv.conf(5) manual page for the list of supported options. @@ -138,7 +150,8 @@ DnsOptions readable as DnsPriority readable i - The relative priority of DNS servers. + +The relative priority of DNS servers. @@ -147,8 +160,9 @@ DnsPriority readable i WinsServers readable au - The Windows Internet Name Service servers associated with the connection. - Each address is in network byte order. Deprecated: use WinsServerData + +The Windows Internet Name Service servers associated with the connection. +Each address is in network byte order. Deprecated: use WinsServerData @@ -157,7 +171,8 @@ WinsServers readable au WinsServerData readable as - The Windows Internet Name Service servers associated with the connection. + +The Windows Internet Name Service servers associated with the connection. Since 1.14 diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml b/docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml index aebdc684..00074df2 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml @@ -22,7 +22,9 @@ Description - + + + Property Details @@ -32,8 +34,9 @@ Addresses readable a(ayuay) - Array of tuples of IPv6 address/prefix/gateway. Deprecated: use - AddressData and Gateway. + +Array of tuples of IPv6 address/prefix/gateway. Deprecated: use +AddressData and Gateway. @@ -42,9 +45,10 @@ Addresses readable a(ayuay) AddressData readable aa{sv} - Array of IP address data objects. All addresses will include "address" (an - IP address string), and "prefix" (a uint). Some addresses may include - additional attributes. + +Array of IP address data objects. All addresses will include "address" (an +IP address string), and "prefix" (a uint). Some addresses may include +additional attributes. @@ -53,7 +57,8 @@ AddressData readable aa{sv} Gateway readable s - The gateway in use. + +The gateway in use. @@ -62,7 +67,8 @@ Gateway readable s Routes readable a(ayuayu) - Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData + +Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData @@ -71,9 +77,10 @@ Routes readable a(ayuayu) RouteData readable aa{sv} - Array of IP route data objects. All routes will include "dest" (an IP - address string) and "prefix" (a uint). Some routes may include "next-hop" - (an IP address string), "metric" (a uint), and additional attributes. + +Array of IP route data objects. All routes will include "dest" (an IP +address string) and "prefix" (a uint). Some routes may include "next-hop" +(an IP address string), "metric" (a uint), and additional attributes. @@ -82,7 +89,8 @@ RouteData readable aa{sv} Nameservers readable aay - The nameservers in use. + +The nameservers in use. @@ -91,7 +99,8 @@ Nameservers readable aay Domains readable as - A list of domains this address belongs to. + +A list of domains this address belongs to. @@ -100,7 +109,8 @@ Domains readable as Searches readable as - A list of dns searches. + +A list of dns searches. @@ -109,8 +119,9 @@ Searches readable as DnsOptions readable as - A list of DNS options that modify the behavior of the DNS resolver. See - resolv.conf(5) manual page for the list of supported options. + +A list of DNS options that modify the behavior of the DNS resolver. See +resolv.conf(5) manual page for the list of supported options. @@ -119,7 +130,8 @@ DnsOptions readable as DnsPriority readable i - The relative priority of DNS servers. + +The relative priority of DNS servers. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml b/docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml index aae14d35..a2222ff5 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml @@ -18,7 +18,9 @@ Description - + + + Method Details @@ -29,15 +31,21 @@ NeedSecrets (OUT s username, OUT s password); - + + + OUT s username: - + + + OUT s password: - + + + @@ -47,11 +55,15 @@ NeedSecrets (OUT s username, SetIp4Config (IN a{sv} config); - + + + IN a{sv} config: - + + + @@ -61,11 +73,15 @@ SetIp4Config (IN a{sv} config); SetIp6Config (IN a{sv} config); - + + + IN a{sv} config: - + + + @@ -75,11 +91,15 @@ SetIp6Config (IN a{sv} config); SetState (IN u state); - + + + IN u state: - + + + @@ -89,11 +109,15 @@ SetState (IN u state); SetIfindex (IN i ifindex); - + + + IN i ifindex: - + + + diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml b/docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml index 3a9cfa42..69e76573 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml @@ -24,15 +24,16 @@ Description - Private D-Bus interface used by secret agents that store and provide - secrets to NetworkManager. If an agent provides secrets to NetworkManager - as part of connection creation, and the some of those secrets are "agent - owned" the agent should store those secrets itself and should not expect - its SaveSecrets() method to be called. SaveSecrets() will be called eg if - some program other than the agent itself (like a connection editor) - changes the secrets out of band. The agent should implement this D-Bus - interface on an object with the path - /org/freedesktop/NetworkManager/SecretAgent. + +Private D-Bus interface used by secret agents that store and provide +secrets to NetworkManager. If an agent provides secrets to NetworkManager +as part of connection creation, and the some of those secrets are "agent +owned" the agent should store those secrets itself and should not expect +its SaveSecrets() method to be called. SaveSecrets() will be called eg if +some program other than the agent itself (like a connection editor) +changes the secrets out of band. The agent should implement this D-Bus +interface on an object with the path +/org/freedesktop/NetworkManager/SecretAgent. @@ -48,38 +49,51 @@ GetSecrets (IN a{sa{sv}} connection, IN u flags, OUT a{sa{sv}} secrets); - Retrieve and return stored secrets, if any, or request new secrets from - the agent's user. If user interaction is allowed and the user enters new - secrets, the agent is expected to save the new secrets to persistent - storage (if the secret's flags include AGENT_OWNED) as NetworkManager will - not send these secrets back to the same agent via a SaveSecrets() call. If - the user canceled any interaction, the agent should return the - UserCanceled error (see below). + +Retrieve and return stored secrets, if any, or request new secrets from +the agent's user. If user interaction is allowed and the user enters new +secrets, the agent is expected to save the new secrets to persistent +storage (if the secret's flags include AGENT_OWNED) as NetworkManager will +not send these secrets back to the same agent via a SaveSecrets() call. If +the user canceled any interaction, the agent should return the +UserCanceled error (see below). IN a{sa{sv}} connection: - Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction. + +Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction. + IN o connection_path: - Object path of the connection for which secrets are being requested. + +Object path of the connection for which secrets are being requested. + IN s setting_name: - Setting name for which secrets are being requested. + +Setting name for which secrets are being requested. + IN as hints: - Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:". + +Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:". + IN u flags: - (NMSecretAgentGetSecretsFlags) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user. + +(NMSecretAgentGetSecretsFlags) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user. + OUT a{sa{sv}} secrets: - Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets. + +Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets. + @@ -90,18 +104,23 @@ GetSecrets (IN a{sa{sv}} connection, CancelGetSecrets (IN o connection_path, IN s setting_name); - Cancel a pending GetSecrets request for secrets of the given connection. - Any GetSecrets request with the same 'connection_path' and 'setting_name' - that are given in a CancelGetSecrets request should be canceled. + +Cancel a pending GetSecrets request for secrets of the given connection. +Any GetSecrets request with the same 'connection_path' and 'setting_name' +that are given in a CancelGetSecrets request should be canceled. IN o connection_path: - Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled. + +Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled. + IN s setting_name: - Setting name for which secrets for this connection were originally being requested. + +Setting name for which secrets for this connection were originally being requested. + @@ -112,16 +131,21 @@ CancelGetSecrets (IN o connection_path, SaveSecrets (IN a{sa{sv}} connection, IN o connection_path); - Save given secrets to backing storage. + +Save given secrets to backing storage. IN a{sa{sv}} connection: - Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already. + +Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already. + IN o connection_path: - Object path of the connection for which the agent should save secrets to backing storage. + +Object path of the connection for which the agent should save secrets to backing storage. + @@ -132,16 +156,21 @@ SaveSecrets (IN a{sa{sv}} connection, DeleteSecrets (IN a{sa{sv}} connection, IN o connection_path); - Delete secrets from backing storage. + +Delete secrets from backing storage. IN a{sa{sv}} connection: - Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage. + +Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage. + IN o connection_path: - Object path of the connection for which the agent should delete secrets from backing storage. + +Object path of the connection for which the agent should delete secrets from backing storage. + diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml index d7648152..bdd3c2a4 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml @@ -39,7 +39,8 @@ Description - Represents a single network connection configuration. + +Represents a single network connection configuration. @@ -50,16 +51,19 @@ Update (IN a{sa{sv}} properties); - Update the connection with new settings and properties (replacing all - previous settings and properties) and save the connection to disk. Secrets - may be part of the update request, and will be either stored in persistent - storage or sent to a Secret Agent for storage, depending on the flags - associated with each secret. + +Update the connection with new settings and properties (replacing all +previous settings and properties) and save the connection to disk. Secrets +may be part of the update request, and will be either stored in persistent +storage or sent to a Secret Agent for storage, depending on the flags +associated with each secret. IN a{sa{sv}} properties: - New connection settings, properties, and (optionally) secrets. + +New connection settings, properties, and (optionally) secrets. + @@ -69,19 +73,22 @@ Update (IN a{sa{sv}} properties); UpdateUnsaved (IN a{sa{sv}} properties); - Update the connection with new settings and properties (replacing all - previous settings and properties) but do not immediately save the - connection to disk. Secrets may be part of the update request and may sent - to a Secret Agent for storage, depending on the flags associated with each - secret. Use the 'Save' method to save these changes to disk. Note that - unsaved changes will be lost if the connection is reloaded from disk - (either automatically on file change or due to an explicit - ReloadConnections call). + +Update the connection with new settings and properties (replacing all +previous settings and properties) but do not immediately save the +connection to disk. Secrets may be part of the update request and may sent +to a Secret Agent for storage, depending on the flags associated with each +secret. Use the 'Save' method to save these changes to disk. Note that +unsaved changes will be lost if the connection is reloaded from disk +(either automatically on file change or due to an explicit +ReloadConnections call). IN a{sa{sv}} properties: - New connection settings, properties, and (optionally) secrets. + +New connection settings, properties, and (optionally) secrets. + @@ -91,7 +98,8 @@ UpdateUnsaved (IN a{sa{sv}} properties); Delete (); - Delete the connection. + +Delete the connection. @@ -100,15 +108,18 @@ Delete (); GetSettings (OUT a{sa{sv}} settings); - Get the settings maps describing this network configuration. This will - never include any secrets required for connection to the network, as those - are often protected. Secrets must be requested separately using the - GetSecrets() call. + +Get the settings maps describing this network configuration. This will +never include any secrets required for connection to the network, as those +are often protected. Secrets must be requested separately using the +GetSecrets() call. OUT a{sa{sv}} settings: - The nested settings maps describing this object. + +The nested settings maps describing this object. + @@ -119,19 +130,24 @@ GetSettings (OUT a{sa{sv}} settings); GetSecrets (IN s setting_name, OUT a{sa{sv}} secrets); - Get the secrets belonging to this network configuration. Only secrets from - persistent storage or a Secret Agent running in the requestor's session - will be returned. The user will never be prompted for secrets as a result - of this request. + +Get the secrets belonging to this network configuration. Only secrets from +persistent storage or a Secret Agent running in the requestor's session +will be returned. The user will never be prompted for secrets as a result +of this request. IN s setting_name: - Name of the setting to return secrets for. If empty, all secrets will be returned. + +Name of the setting to return secrets for. If empty, all secrets will be returned. + OUT a{sa{sv}} secrets: - Nested settings maps containing secrets. + +Nested settings maps containing secrets. + @@ -141,7 +157,8 @@ GetSecrets (IN s setting_name, ClearSecrets (); - Clear the secrets belonging to this network connection profile. + +Clear the secrets belonging to this network connection profile. @@ -150,8 +167,9 @@ ClearSecrets (); Save (); - Saves a "dirty" connection (that had previously been updated with - UpdateUnsaved) to persistent storage. + +Saves a "dirty" connection (that had previously been updated with +UpdateUnsaved) to persistent storage. @@ -163,78 +181,93 @@ Update2 (IN a{sa{sv}} settings, IN a{sv} args, OUT a{sv} result); - Update the connection with new settings and properties (replacing all - previous settings and properties). - Update2 is an alternative to - Update, - UpdateUnsaved - and Save - extensible with extra flags and args arguments. - The flags argument accepts the combination of following values, - logically or-ed together: - - - 0x1 (to-disk): - The connection is persisted to disk. - - - 0x2 (in-memory): - The change is only made in memory (without touching an eventual - profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory - only, if the connection is already in memory only. - - - 0x4 (in-memory-detached): - Like "in-memory", but behaves slightly different when migrating - the profile from disk to in-memory. - - - 0x8 (in-memory-only): - Like "in-memory", but behaves slightly different when migrating - the profile from disk to in-memory. - - - 0x10 (volatile): - - - 0x20 (block-autoconnect): - Blocks auto-connect on the updated profile - - - 0x40 (no-reapply): - Prevents "connection.zone" and "connection.metered" properties - to take effect on currently active devices. - - - The args argument accepts the following keys: - - - plugin: - The settings plugin the connection will be migrated to - such as "keyfile" or "ifcfg-rh". - Since 1.38 - - - Secrets may be part of the update request, and will be either stored in persistent - storage or sent to a Secret Agent for storage, depending on the flags - associated with each secret. + +Update the connection with new settings and properties (replacing all +previous settings and properties). + +Update2 is an alternative to +Update, +UpdateUnsaved +and Save +extensible with extra flags and args arguments. + +The flags argument accepts the combination of following values, +logically or-ed together: + + + +0x1 (to-disk): +The connection is persisted to disk. + + +0x2 (in-memory): +The change is only made in memory (without touching an eventual +profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory +only, if the connection is already in memory only. + + +0x4 (in-memory-detached): +Like "in-memory", but behaves slightly different when migrating +the profile from disk to in-memory. + + +0x8 (in-memory-only): +Like "in-memory", but behaves slightly different when migrating +the profile from disk to in-memory. + + +0x10 (volatile): + + +0x20 (block-autoconnect): +Blocks auto-connect on the updated profile + + +0x40 (no-reapply): +Prevents "connection.zone" and "connection.metered" properties +to take effect on currently active devices. + + + +The args argument accepts the following keys: + + + +plugin: +The settings plugin the connection will be migrated to +such as "keyfile" or "ifcfg-rh". +Since 1.38 + + + +Secrets may be part of the update request, and will be either stored in persistent +storage or sent to a Secret Agent for storage, depending on the flags +associated with each secret. IN a{sa{sv}} settings: - New connection settings, properties, and (optionally) secrets. Provide an empty array to use the current settings. + +New connection settings, properties, and (optionally) secrets. Provide an empty array to use the current settings. + IN u flags: - Optional flags. Unknown flags cause the call to fail. + +Optional flags. Unknown flags cause the call to fail. + IN a{sv} args: - Optional arguments dictionary, for extentibility. Specifying unknown keys causes the call to fail. + +Optional arguments dictionary, for extentibility. Specifying unknown keys causes the call to fail. + OUT a{sv} result: - Currently no results are returned. + +Currently no results are returned. + Since 1.12 @@ -248,10 +281,11 @@ Update2 (IN a{sa{sv}} settings, Updated (); - Emitted when any settings or permissions change. When handling this - signal, clients should re-read the connection using the GetSettings method - to get the changes and to ensure the client still has permission to access - the connection. + +Emitted when any settings or permissions change. When handling this +signal, clients should re-read the connection using the GetSettings method +to get the changes and to ensure the client still has permission to access +the connection. @@ -260,10 +294,11 @@ Updated (); Removed (); - Emitted when this connection is no longer available. This happens when the - connection is deleted or if it is no longer accessible by any of the - system's logged-in users. After receipt of this signal, the object no - longer exists. Also see the Settings.ConnectionRemoved signal. + +Emitted when this connection is no longer available. This happens when the +connection is deleted or if it is no longer accessible by any of the +system's logged-in users. After receipt of this signal, the object no +longer exists. Also see the Settings.ConnectionRemoved signal. @@ -275,10 +310,11 @@ Removed (); Unsaved readable b - If set, indicates that the in-memory state of the connection does not - match the on-disk state. This flag will be set when UpdateUnsaved() is - called or when any connection details change, and cleared when the - connection is saved to disk via Save() or from internal operations. + +If set, indicates that the in-memory state of the connection does not +match the on-disk state. This flag will be set when UpdateUnsaved() is +called or when any connection details change, and cleared when the +connection is saved to disk via Save() or from internal operations. @@ -287,8 +323,10 @@ Unsaved readable b Flags readable u - Additional flags of the connection profile. - Returns: NMSettingsConnectionFlags + +Additional flags of the connection profile. + +Returns: NMSettingsConnectionFlags Since 1.12 @@ -298,7 +336,8 @@ Flags readable u Filename readable s - File that stores the connection in case the connection is file-backed. + +File that stores the connection in case the connection is file-backed. Since 1.12 diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml index 3dfc50e1..b501ea69 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml @@ -44,8 +44,9 @@ Description - The Settings interface allows clients to view and administrate the - connections stored and used by NetworkManager. + +The Settings interface allows clients to view and administrate the +connections stored and used by NetworkManager. @@ -56,12 +57,15 @@ ListConnections (OUT ao connections); - List the saved network connections known to NetworkManager. + +List the saved network connections known to NetworkManager. OUT ao connections: - List of connections. + +List of connections. + @@ -72,16 +76,21 @@ ListConnections (OUT ao connections); GetConnectionByUuid (IN s uuid, OUT o connection); - Retrieve the object path of a connection, given that connection's UUID. + +Retrieve the object path of a connection, given that connection's UUID. IN s uuid: - The UUID to find the connection object path for. + +The UUID to find the connection object path for. + OUT o connection: - The connection's object path. + +The connection's object path. + @@ -92,19 +101,24 @@ GetConnectionByUuid (IN s uuid, AddConnection (IN a{sa{sv}} connection, OUT o path); - Add new connection and save it to disk. This operation does not start the - network connection unless (1) device is idle and able to connect to the - network described by the new connection, and (2) the connection is allowed - to be started automatically. + +Add new connection and save it to disk. This operation does not start the +network connection unless (1) device is idle and able to connect to the +network described by the new connection, and (2) the connection is allowed +to be started automatically. IN a{sa{sv}} connection: - Connection settings and properties. + +Connection settings and properties. + OUT o path: - Object path of the new connection that was just added. + +Object path of the new connection that was just added. + @@ -115,20 +129,25 @@ AddConnection (IN a{sa{sv}} connection, AddConnectionUnsaved (IN a{sa{sv}} connection, OUT o path); - Add new connection but do not save it to disk immediately. This operation - does not start the network connection unless (1) device is idle and able - to connect to the network described by the new connection, and (2) the - connection is allowed to be started automatically. Use the 'Save' method - on the connection to save these changes to disk. + +Add new connection but do not save it to disk immediately. This operation +does not start the network connection unless (1) device is idle and able +to connect to the network described by the new connection, and (2) the +connection is allowed to be started automatically. Use the 'Save' method +on the connection to save these changes to disk. IN a{sa{sv}} connection: - Connection settings and properties. + +Connection settings and properties. + OUT o path: - Object path of the new connection that was just added. + +Object path of the new connection that was just added. + @@ -142,64 +161,81 @@ AddConnection2 (IN a{sa{sv}} settings, OUT o path, OUT a{sv} result); - Add a new connection profile. - AddConnection2 is an alternative to - AddConnection and - AddConnectionUnsaved. - The new variant can do everything that the older variants could, and more. - Its behavior is extensible via extra flags and args arguments. - The flags argument accepts the combination of following values, - logically or-ed together: - - - 0x1 (to-disk): - The connection is persisted to disk. - - - 0x2 (in-memory): - The change is only made in memory (without touching an eventual - profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory - only, if the connection is already in memory only. - - - 0x20 (block-autoconnect): - Blocks auto-connect on the new profile - - - The args argument accepts the following keys: - - - plugin: - The settings plugin the newly added connection will - use, such as "keyfile" or "ifcfg-rh". - Since 1.38 - - - Either the flags 0x1 (to-disk) or 0x2 (in-memory) must be specified. - The effect is whether to behave like - AddConnection or - AddConnectionUnsaved. + +Add a new connection profile. + +AddConnection2 is an alternative to +AddConnection and +AddConnectionUnsaved. +The new variant can do everything that the older variants could, and more. +Its behavior is extensible via extra flags and args arguments. + +The flags argument accepts the combination of following values, +logically or-ed together: + + + +0x1 (to-disk): +The connection is persisted to disk. + + +0x2 (in-memory): +The change is only made in memory (without touching an eventual +profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory +only, if the connection is already in memory only. + + +0x20 (block-autoconnect): +Blocks auto-connect on the new profile + + + +The args argument accepts the following keys: + + + +plugin: +The settings plugin the newly added connection will +use, such as "keyfile" or "ifcfg-rh". +Since 1.38 + + + +Either the flags 0x1 (to-disk) or 0x2 (in-memory) must be specified. +The effect is whether to behave like +AddConnection or +AddConnectionUnsaved. IN a{sa{sv}} settings: - New connection settings, properties, and (optionally) secrets. + +New connection settings, properties, and (optionally) secrets. + IN u flags: - Flags. Unknown flags cause the call to fail. + +Flags. Unknown flags cause the call to fail. + IN a{sv} args: - Optional arguments dictionary, for extentibility. Specifying unknown keys causes the call to fail. + +Optional arguments dictionary, for extentibility. Specifying unknown keys causes the call to fail. + OUT o path: - Object path of the new connection that was just added. + +Object path of the new connection that was just added. + OUT a{sv} result: - Output argument, currently no additional results are returned. + +Output argument, currently no additional results are returned. + Since 1.20 @@ -212,27 +248,35 @@ LoadConnections (IN as filenames, OUT b status, OUT as failures); - Loads or reloads the indicated connections from disk. You should call this - after making changes directly to an on-disk connection file to make sure - that NetworkManager sees the changes. - As with AddConnection(), this operation does not necessarily - start the network connection. - Note that before 1.20, NetworkManager had a bug and this status value was wrong. - It is better to assume success if the method does not return with a D-Bus error. - On top of that, you can look at failures to know whether any of the requested files failed. + +Loads or reloads the indicated connections from disk. You should call this +after making changes directly to an on-disk connection file to make sure +that NetworkManager sees the changes. +As with AddConnection(), this operation does not necessarily +start the network connection. + +Note that before 1.20, NetworkManager had a bug and this status value was wrong. +It is better to assume success if the method does not return with a D-Bus error. +On top of that, you can look at failures to know whether any of the requested files failed. IN as filenames: - Array of paths to on-disk connection profiles in directories monitored by NetworkManager. + +Array of paths to on-disk connection profiles in directories monitored by NetworkManager. + OUT b status: - Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied). + +Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied). + OUT as failures: - Paths of connection files that could not be loaded. + +Paths of connection files that could not be loaded. + @@ -242,13 +286,16 @@ LoadConnections (IN as filenames, ReloadConnections (OUT b status); - Tells NetworkManager to reload all connection files from disk, including - noticing any added or deleted connection files. + +Tells NetworkManager to reload all connection files from disk, including +noticing any added or deleted connection files. OUT b status: - This always returns TRUE. + +This always returns TRUE. + @@ -258,12 +305,15 @@ ReloadConnections (OUT b status); SaveHostname (IN s hostname); - Save the hostname to persistent configuration. + +Save the hostname to persistent configuration. IN s hostname: - The hostname to save to persistent configuration. If blank, the persistent hostname is cleared. + +The hostname to save to persistent configuration. If blank, the persistent hostname is cleared. + @@ -276,19 +326,22 @@ SaveHostname (IN s hostname); NewConnection (o connection); - Emitted when a new connection has been added after NetworkManager has - started up and initialized. This signal is not emitted for connections - read while starting up, because NetworkManager's D-Bus service is only - available after all connections have been read, and to prevent spamming - listeners with too many signals at one time. To retrieve the initial - connection list, call the ListConnections() method once, and then listen - for individual Settings.NewConnection and Settings.Connection.Deleted - signals for further updates. + +Emitted when a new connection has been added after NetworkManager has +started up and initialized. This signal is not emitted for connections +read while starting up, because NetworkManager's D-Bus service is only +available after all connections have been read, and to prevent spamming +listeners with too many signals at one time. To retrieve the initial +connection list, call the ListConnections() method once, and then listen +for individual Settings.NewConnection and Settings.Connection.Deleted +signals for further updates. o connection: - Object path of the new connection. + +Object path of the new connection. + @@ -298,16 +351,19 @@ NewConnection (o connection); ConnectionRemoved (o connection); - Emitted when a connection is no longer available. This happens when the - connection is deleted or if it is no longer accessible by any of the - system's logged-in users. After receipt of this signal, the connection no - longer exists and cannot be used. Also see the Settings.Connection.Removed - signal. + +Emitted when a connection is no longer available. This happens when the +connection is deleted or if it is no longer accessible by any of the +system's logged-in users. After receipt of this signal, the connection no +longer exists and cannot be used. Also see the Settings.Connection.Removed +signal. o connection: - Object path of the removed connection. + +Object path of the removed connection. + @@ -320,7 +376,8 @@ ConnectionRemoved (o connection); Connections readable ao - List of object paths of available network connection profiles. + +List of object paths of available network connection profiles. @@ -329,7 +386,8 @@ Connections readable ao Hostname readable s - The machine hostname stored in persistent configuration. + +The machine hostname stored in persistent configuration. @@ -338,7 +396,8 @@ Hostname readable s CanModify readable b - If true, adding and modifying connections is supported. + +If true, adding and modifying connections is supported. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml b/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml index 1ba37bf2..6a23fae4 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml @@ -21,7 +21,8 @@ Description - Represents an active connection to a Virtual Private Network. + +Represents an active connection to a Virtual Private Network. @@ -33,16 +34,21 @@ VpnStateChanged (u state, u reason); - Emitted when the state of the VPN connection has changed. + +Emitted when the state of the VPN connection has changed. u state: - (NMVpnConnectionState) The new state of the VPN connection. + +(NMVpnConnectionState) The new state of the VPN connection. + u reason: - (NMActiveConnectionStateReason) Reason code describing the change to the new state. + +(NMActiveConnectionStateReason) Reason code describing the change to the new state. + @@ -55,8 +61,10 @@ VpnStateChanged (u state, VpnState readable u - The VPN-specific state of the connection. - Returns: NMVpnConnectionState + +The VPN-specific state of the connection. + +Returns: NMVpnConnectionState @@ -65,7 +73,8 @@ VpnState readable u Banner readable s - The banner string of the VPN connection. + +The banner string of the VPN connection. diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml b/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml index 5604099d..0efccfe7 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml @@ -42,8 +42,9 @@ Description - This interface is provided by plugins providing VPN services to the - NetworkManager daemon. + +This interface is provided by plugins providing VPN services to the +NetworkManager daemon. @@ -54,13 +55,16 @@ Connect (IN a{sa{sv}} connection); - Tells the plugin to connect. Interactive secrets requests (eg, emitting - the SecretsRequired signal) are not allowed. + +Tells the plugin to connect. Interactive secrets requests (eg, emitting +the SecretsRequired signal) are not allowed. IN a{sa{sv}} connection: - Describes the connection to be established. + +Describes the connection to be established. + @@ -71,18 +75,23 @@ Connect (IN a{sa{sv}} connection); ConnectInteractive (IN a{sa{sv}} connection, IN a{sv} details); - Tells the plugin to connect, allowing interactive secrets requests (eg the - plugin is allowed to emit the SecretsRequired signal if the VPN service - indicates that it needs additional secrets during the connect process). + +Tells the plugin to connect, allowing interactive secrets requests (eg the +plugin is allowed to emit the SecretsRequired signal if the VPN service +indicates that it needs additional secrets during the connect process). IN a{sa{sv}} connection: - Describes the connection to be established. + +Describes the connection to be established. + IN a{sv} details: - Additional details about the Connect process. + +Additional details about the Connect process. + @@ -93,17 +102,22 @@ ConnectInteractive (IN a{sa{sv}} connection, NeedSecrets (IN a{sa{sv}} settings, OUT s setting_name); - Asks the plugin whether the provided connection will require secrets to - connect successfully. + +Asks the plugin whether the provided connection will require secrets to +connect successfully. IN a{sa{sv}} settings: - Describes the connection that may need secrets. + +Describes the connection that may need secrets. + OUT s setting_name: - The setting name within the provided connection that requires secrets, if any. + +The setting name within the provided connection that requires secrets, if any. + @@ -113,7 +127,8 @@ NeedSecrets (IN a{sa{sv}} settings, Disconnect (); - Disconnect the plugin. + +Disconnect the plugin. @@ -122,12 +137,15 @@ Disconnect (); SetConfig (IN a{sv} config); - Set generic connection details on the connection. + +Set generic connection details on the connection. IN a{sv} config: - Generic configuration details for the connection. + +Generic configuration details for the connection. + @@ -137,12 +155,15 @@ SetConfig (IN a{sv} config); SetIp4Config (IN a{sv} config); - Set IPv4 details on the connection. + +Set IPv4 details on the connection. IN a{sv} config: - Ip4Config details for the connection. You must call SetConfig() before calling this. + +Ip4Config details for the connection. You must call SetConfig() before calling this. + @@ -152,12 +173,15 @@ SetIp4Config (IN a{sv} config); SetIp6Config (IN a{sv} config); - Set IPv6 details on the connection. + +Set IPv6 details on the connection. IN a{sv} config: - Ip6Config details for the connection. You must call SetConfig() before calling this. + +Ip6Config details for the connection. You must call SetConfig() before calling this. + @@ -167,12 +191,15 @@ SetIp6Config (IN a{sv} config); SetFailure (IN s reason); - Indicate a failure to the plugin. + +Indicate a failure to the plugin. IN s reason: - The reason for the failure. + +The reason for the failure. + @@ -182,13 +209,16 @@ SetFailure (IN s reason); NewSecrets (IN a{sa{sv}} connection); - Called in response to a SecretsRequired signal to deliver updated secrets - or other information to the plugin. + +Called in response to a SecretsRequired signal to deliver updated secrets +or other information to the plugin. IN a{sa{sv}} connection: - Describes the connection including the new secrets. + +Describes the connection including the new secrets. + @@ -201,12 +231,15 @@ NewSecrets (IN a{sa{sv}} connection); StateChanged (u state); - Emitted when the plugin state changes. + +Emitted when the plugin state changes. u state: - (NMVpnServiceState) The new state of the plugin. + +(NMVpnServiceState) The new state of the plugin. + @@ -217,18 +250,23 @@ StateChanged (u state); SecretsRequired (s message, as secrets); - Emitted during an ongoing ConnectInteractive() request when the plugin has - determined that new secrets are required. NetworkManager will then call - the NewSecrets() method with a connection hash including the new secrets. + +Emitted during an ongoing ConnectInteractive() request when the plugin has +determined that new secrets are required. NetworkManager will then call +the NewSecrets() method with a connection hash including the new secrets. s message: - Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN. + +Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN. + as secrets: - Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end. + +Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end. + @@ -238,12 +276,15 @@ SecretsRequired (s message, Config (a{sv} config); - The plugin obtained generic configuration information. + +The plugin obtained generic configuration information. a{sv} config: - The configuration information. + +The configuration information. + @@ -253,12 +294,15 @@ Config (a{sv} config); Ip4Config (a{sv} ip4config); - The plugin obtained an IPv4 configuration. + +The plugin obtained an IPv4 configuration. a{sv} ip4config: - The IPv4 configuration. + +The IPv4 configuration. + @@ -268,12 +312,15 @@ Ip4Config (a{sv} ip4config); Ip6Config (a{sv} ip6config); - The plugin obtained an IPv6 configuration. + +The plugin obtained an IPv6 configuration. a{sv} ip6config: - The IPv6 configuration. + +The IPv6 configuration. + @@ -283,12 +330,15 @@ Ip6Config (a{sv} ip6config); LoginBanner (s banner); - Emitted when the plugin receives a login banner from the VPN service. + +Emitted when the plugin receives a login banner from the VPN service. s banner: - The login banner string. + +The login banner string. + @@ -298,12 +348,15 @@ LoginBanner (s banner); Failure (u reason); - Emitted when a failure in the VPN plugin occurs. + +Emitted when a failure in the VPN plugin occurs. u reason: - (NMVpnPluginFailure) Reason code for the failure. + +(NMVpnPluginFailure) Reason code for the failure. + @@ -316,8 +369,10 @@ Failure (u reason); State readable u - The state of the plugin. - Returns: NMVpnServiceState + +The state of the plugin. + +Returns: NMVpnServiceState diff --git a/docs/api/dbus-org.freedesktop.NetworkManager.xml b/docs/api/dbus-org.freedesktop.NetworkManager.xml index 89664bbc..31d0ad28 100644 --- a/docs/api/dbus-org.freedesktop.NetworkManager.xml +++ b/docs/api/dbus-org.freedesktop.NetworkManager.xml @@ -91,7 +91,9 @@ Description - + + + Method Details @@ -101,30 +103,34 @@ Reload (IN u flags); - Reload NetworkManager's configuration and perform certain updates, like flushing a cache or - rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it - allows for more fine-grained control over what to reload (see flags). It also allows - non-root access via PolicyKit and contrary to signals it is synchronous. - No flags (0x00) means to reload everything that is supported which is identical to - sending a SIGHUP. - (0x01) means to reload the NetworkManager.conf configuration from disk. Note that this - does not include connections, which can be reloaded via Setting's ReloadConnections. - (0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf - anew. - (0x04) means to restart the DNS plugin. This is for example useful when using - dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d. - If you edit those files, you can restart the DNS plugin. This action shortly interrupts - name resolution. - Note that flags may affect each other. For example, restarting the DNS plugin (0x04) - implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes - to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting - the DNS plugin (0x04) or update resolv.conf (0x02), unless the DNS related configuration - changes in NetworkManager.conf. + +Reload NetworkManager's configuration and perform certain updates, like flushing a cache or +rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it +allows for more fine-grained control over what to reload (see flags). It also allows +non-root access via PolicyKit and contrary to signals it is synchronous. + +No flags (0x00) means to reload everything that is supported which is identical to +sending a SIGHUP. +(0x01) means to reload the NetworkManager.conf configuration from disk. Note that this +does not include connections, which can be reloaded via Setting's ReloadConnections. +(0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf +anew. +(0x04) means to restart the DNS plugin. This is for example useful when using +dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d. +If you edit those files, you can restart the DNS plugin. This action shortly interrupts +name resolution. +Note that flags may affect each other. For example, restarting the DNS plugin (0x04) +implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes +to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting +the DNS plugin (0x04) or update resolv.conf (0x02), unless the DNS related configuration +changes in NetworkManager.conf. IN u flags: - Optional flags to specify which parts shall be reloaded. + +Optional flags to specify which parts shall be reloaded. + @@ -134,12 +140,15 @@ Reload (IN u flags); GetDevices (OUT ao devices); - Get the list of realized network devices. + +Get the list of realized network devices. OUT ao devices: - List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()). + +List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()). + @@ -149,12 +158,15 @@ GetDevices (OUT ao devices); GetAllDevices (OUT ao devices); - Get the list of all network devices. + +Get the list of all network devices. OUT ao devices: - List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated). + +List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated). + @@ -165,18 +177,23 @@ GetAllDevices (OUT ao devices); GetDeviceByIpIface (IN s iface, OUT o device); - Return the object path of the network device referenced by its IP - interface name. Note that some devices (usually modems) only have an IP - interface name when they are connected. + +Return the object path of the network device referenced by its IP +interface name. Note that some devices (usually modems) only have an IP +interface name when they are connected. IN s iface: - Interface name of the device to find. + +Interface name of the device to find. + OUT o device: - Object path of the network device. + +Object path of the network device. + @@ -189,24 +206,33 @@ ActivateConnection (IN o connection, IN o specific_object, OUT o active_connection); - Activate a connection using the supplied device. + +Activate a connection using the supplied device. IN o connection: - The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path. + +The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path. + IN o device: - The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use. + +The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use. + IN o specific_object: - The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device. + +The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device. + OUT o active_connection: - The path of the active connection object representing this active connection. + +The path of the active connection object representing this active connection. + @@ -220,32 +246,44 @@ AddAndActivateConnection (IN a{sa{sv}} connection, OUT o path, OUT o active_connection); - Adds a new connection using the given details (if any) as a template - (automatically filling in missing settings with the capabilities of the - given device and specific object), then activate the new connection. - Cannot be used for VPN connections at this time. - See also AddAndActivateConnection2. + +Adds a new connection using the given details (if any) as a template +(automatically filling in missing settings with the capabilities of the +given device and specific object), then activate the new connection. +Cannot be used for VPN connections at this time. + +See also AddAndActivateConnection2. IN a{sa{sv}} connection: - Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object. + +Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object. + IN o device: - The object path of device to be activated using the given connection. + +The object path of device to be activated using the given connection. + IN o specific_object: - The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection. + +The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection. + OUT o path: - Object path of the new connection that was just added. + +Object path of the new connection that was just added. + OUT o active_connection: - The path of the active connection object representing this active connection. + +The path of the active connection object representing this active connection. + @@ -261,43 +299,60 @@ AddAndActivateConnection2 (IN a{sa{sv}} connection, OUT o active_connection, OUT a{sv} result); - Adds a new connection using the given details (if any) as a template - (automatically filling in missing settings with the capabilities of the - given device and specific object), then activate the new connection. - Cannot be used for VPN connections at this time. - This method extends AddAndActivateConnection to allow passing further - parameters. At this time the following options are supported: - * persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected. - * bind-activation: Bind the activation lifetime. Set to "dbus-name" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally. + +Adds a new connection using the given details (if any) as a template +(automatically filling in missing settings with the capabilities of the +given device and specific object), then activate the new connection. +Cannot be used for VPN connections at this time. + +This method extends AddAndActivateConnection to allow passing further +parameters. At this time the following options are supported: + +* persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected. +* bind-activation: Bind the activation lifetime. Set to "dbus-name" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally. IN a{sa{sv}} connection: - Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object. + +Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object. + IN o device: - The object path of device to be activated using the given connection. + +The object path of device to be activated using the given connection. + IN o specific_object: - The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection. + +The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection. + IN a{sv} options: - Further options for the method call. + +Further options for the method call. + OUT o path: - Object path of the new connection that was just added. + +Object path of the new connection that was just added. + OUT o active_connection: - The path of the active connection object representing this active connection. + +The path of the active connection object representing this active connection. + OUT a{sv} result: - A dictionary of additional output arguments for future extension. Currently, not additional output arguments are supported. + +A dictionary of additional output arguments for future extension. Currently, not additional output arguments are supported. + @@ -307,12 +362,15 @@ AddAndActivateConnection2 (IN a{sa{sv}} connection, DeactivateConnection (IN o active_connection); - Deactivate an active connection. + +Deactivate an active connection. IN o active_connection: - The currently active connection to deactivate. + +The currently active connection to deactivate. + @@ -322,15 +380,18 @@ DeactivateConnection (IN o active_connection); Sleep (IN b sleep); - Control the NetworkManager daemon's sleep state. When asleep, all - interfaces that it manages are deactivated. When awake, devices are - available to be activated. This command should not be called directly by - users or clients; it is intended for system suspend/resume tracking. + +Control the NetworkManager daemon's sleep state. When asleep, all +interfaces that it manages are deactivated. When awake, devices are +available to be activated. This command should not be called directly by +users or clients; it is intended for system suspend/resume tracking. IN b sleep: - Indicates whether the NetworkManager daemon should sleep or wake. + +Indicates whether the NetworkManager daemon should sleep or wake. + @@ -340,16 +401,19 @@ Sleep (IN b sleep); Enable (IN b enable); - Control whether overall networking is enabled or disabled. When disabled, - all interfaces that NM manages are deactivated. When enabled, all managed - interfaces are re-enabled and available to be activated. This command - should be used by clients that provide to users the ability to - enable/disable all networking. + +Control whether overall networking is enabled or disabled. When disabled, +all interfaces that NM manages are deactivated. When enabled, all managed +interfaces are re-enabled and available to be activated. This command +should be used by clients that provide to users the ability to +enable/disable all networking. IN b enable: - If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices. + +If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices. + @@ -359,14 +423,17 @@ Enable (IN b enable); GetPermissions (OUT a{ss} permissions); - Returns the permissions a caller has for various authenticated operations - that NetworkManager provides, like Enable/Disable networking, changing - Wi-Fi, WWAN, and WiMAX state, etc. + +Returns the permissions a caller has for various authenticated operations +that NetworkManager provides, like Enable/Disable networking, changing +Wi-Fi, WWAN, and WiMAX state, etc. OUT a{ss} permissions: - Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations. + +Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations. + @@ -377,16 +444,21 @@ GetPermissions (OUT a{ss} permissions); SetLogging (IN s level, IN s domains); - Set logging verbosity and which operations are logged. + +Set logging verbosity and which operations are logged. IN s level: - One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain. + +One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain. + IN s domains: - A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged. + +A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged. + @@ -397,16 +469,21 @@ SetLogging (IN s level, GetLogging (OUT s level, OUT s domains); - Get current logging verbosity level and operations domains. + +Get current logging verbosity level and operations domains. OUT s level: - One of [ERR, WARN, INFO, DEBUG, TRACE]. + +One of [ERR, WARN, INFO, DEBUG, TRACE]. + OUT s domains: - For available domains see SetLogging() call. + +For available domains see SetLogging() call. + @@ -416,12 +493,15 @@ GetLogging (OUT s level, CheckConnectivity (OUT u connectivity); - Re-check the network connectivity state. + +Re-check the network connectivity state. OUT u connectivity: - (NMConnectivityState) The current connectivity state. + +(NMConnectivityState) The current connectivity state. + @@ -431,13 +511,16 @@ CheckConnectivity (OUT u connectivity); state (OUT u state); - The overall networking state as determined by the NetworkManager daemon, - based on the state of network devices under its management. + +The overall networking state as determined by the NetworkManager daemon, +based on the state of network devices under its management. OUT u state: - NMState + +NMState + @@ -450,26 +533,35 @@ CheckpointCreate (IN ao devices, IN u flags, OUT o checkpoint); - Create a checkpoint of the current networking configuration - for given interfaces. If rollback_timeout is not zero, a - rollback is automatically performed after the given timeout. + +Create a checkpoint of the current networking configuration +for given interfaces. If rollback_timeout is not zero, a +rollback is automatically performed after the given timeout. IN ao devices: - A list of device paths for which a checkpoint should be created. An empty list means all devices. + +A list of device paths for which a checkpoint should be created. An empty list means all devices. + IN u rollback_timeout: - The time in seconds until NetworkManager will automatically rollback to the checkpoint. Set to zero for infinite. + +The time in seconds until NetworkManager will automatically rollback to the checkpoint. Set to zero for infinite. + IN u flags: - (NMCheckpointCreateFlags) Flags for the creation. + +(NMCheckpointCreateFlags) Flags for the creation. + OUT o checkpoint: - On success, the path of the new checkpoint. + +On success, the path of the new checkpoint. + @@ -479,12 +571,15 @@ CheckpointCreate (IN ao devices, CheckpointDestroy (IN o checkpoint); - Destroy a previously created checkpoint. + +Destroy a previously created checkpoint. IN o checkpoint: - The checkpoint to be destroyed. Set to empty to cancel all pending checkpoints. + +The checkpoint to be destroyed. Set to empty to cancel all pending checkpoints. + @@ -495,16 +590,21 @@ CheckpointDestroy (IN o checkpoint); CheckpointRollback (IN o checkpoint, OUT a{su} result); - Rollback a checkpoint before the timeout is reached. + +Rollback a checkpoint before the timeout is reached. IN o checkpoint: - The checkpoint to be rolled back. + +The checkpoint to be rolled back. + OUT a{su} result: - On return, a dictionary of devices and results. Devices are represented by their original D-Bus path; each result is a RollbackResult. + +On return, a dictionary of devices and results. Devices are represented by their original D-Bus path; each result is a RollbackResult. + @@ -515,23 +615,29 @@ CheckpointRollback (IN o checkpoint, CheckpointAdjustRollbackTimeout (IN o checkpoint, IN u add_timeout); - Reset the timeout for rollback for the checkpoint. - Note that the added seconds start counting from now, - not "Created" timestamp or the previous expiration - time. Note that the "Created" property of the checkpoint - will stay unchanged by this call. However, the "RollbackTimeout" - will be recalculated to give the approximate new expiration time. - The new "RollbackTimeout" property will be approximate up to - one second precision, which is the accuracy of the property. + +Reset the timeout for rollback for the checkpoint. + +Note that the added seconds start counting from now, +not "Created" timestamp or the previous expiration +time. Note that the "Created" property of the checkpoint +will stay unchanged by this call. However, the "RollbackTimeout" +will be recalculated to give the approximate new expiration time. +The new "RollbackTimeout" property will be approximate up to +one second precision, which is the accuracy of the property. IN o checkpoint: - The checkpoint to be rolled back. + +The checkpoint to be rolled back. + IN u add_timeout: - Number of seconds from now in which the timeout will expire. Set to 0 to disable the timeout. + +Number of seconds from now in which the timeout will expire. Set to 0 to disable the timeout. + Since 1.12 @@ -545,8 +651,9 @@ CheckpointAdjustRollbackTimeout (IN o checkpoint, CheckPermissions (); - Emitted when system authorization details change, indicating that clients - may wish to recheck permissions with GetPermissions. + +Emitted when system authorization details change, indicating that clients +may wish to recheck permissions with GetPermissions. @@ -555,12 +662,15 @@ CheckPermissions (); StateChanged (u state); - NetworkManager's state changed. + +NetworkManager's state changed. u state: - (NMState) The new state of NetworkManager. + +(NMState) The new state of NetworkManager. + @@ -570,12 +680,15 @@ StateChanged (u state); DeviceAdded (o device_path); - A device was added to the system + +A device was added to the system o device_path: - The object path of the newly added device. + +The object path of the newly added device. + @@ -585,12 +698,15 @@ DeviceAdded (o device_path); DeviceRemoved (o device_path); - A device was removed from the system, and is no longer available. + +A device was removed from the system, and is no longer available. o device_path: - The object path of the device that was just removed. + +The object path of the device that was just removed. + @@ -603,9 +719,10 @@ DeviceRemoved (o device_path); Devices readable ao - The list of realized network devices. Realized devices are those which - have backing resources (eg from the kernel or a management daemon like - ModemManager, teamd, etc). + +The list of realized network devices. Realized devices are those which +have backing resources (eg from the kernel or a management daemon like +ModemManager, teamd, etc). @@ -614,9 +731,10 @@ Devices readable ao AllDevices readable ao - The list of both realized and un-realized network devices. Un-realized - devices are software devices which do not yet have backing resources, but - for which backing resources can be created if the device is activated. + +The list of both realized and un-realized network devices. Un-realized +devices are software devices which do not yet have backing resources, but +for which backing resources can be created if the device is activated. @@ -625,7 +743,8 @@ AllDevices readable ao Checkpoints readable ao - The list of active checkpoints. + +The list of active checkpoints. @@ -634,8 +753,9 @@ Checkpoints readable ao NetworkingEnabled readable b - Indicates if overall networking is currently enabled or not. See the - Enable() method. + +Indicates if overall networking is currently enabled or not. See the +Enable() method. @@ -644,7 +764,8 @@ NetworkingEnabled readable b WirelessEnabled readwrite b - Indicates if wireless is currently enabled or not. + +Indicates if wireless is currently enabled or not. @@ -653,8 +774,9 @@ WirelessEnabled readwrite b WirelessHardwareEnabled readable b - Indicates if the wireless hardware is currently enabled, i.e. the state of - the RF kill switch. + +Indicates if the wireless hardware is currently enabled, i.e. the state of +the RF kill switch. @@ -663,7 +785,8 @@ WirelessHardwareEnabled readable b WwanEnabled readwrite b - Indicates if mobile broadband devices are currently enabled or not. + +Indicates if mobile broadband devices are currently enabled or not. @@ -672,8 +795,9 @@ WwanEnabled readwrite b WwanHardwareEnabled readable b - Indicates if the mobile broadband hardware is currently enabled, i.e. the - state of the RF kill switch. + +Indicates if the mobile broadband hardware is currently enabled, i.e. the +state of the RF kill switch. @@ -682,8 +806,9 @@ WwanHardwareEnabled readable b WimaxEnabled readwrite b - DEPRECATED. Doesn't have any meaning and is around only for - compatibility reasons. + +DEPRECATED. Doesn't have any meaning and is around only for +compatibility reasons. @@ -692,8 +817,9 @@ WimaxEnabled readwrite b WimaxHardwareEnabled readable b - DEPRECATED. Doesn't have any meaning and is around only for - compatibility reasons. + +DEPRECATED. Doesn't have any meaning and is around only for +compatibility reasons. @@ -702,9 +828,10 @@ WimaxHardwareEnabled readable b RadioFlags readable u - Flags related to radio devices. See NMRadioFlags for the list of flags - supported. + +Flags related to radio devices. See NMRadioFlags for the list of flags +supported. Since 1.38 @@ -714,7 +841,8 @@ RadioFlags readable u ActiveConnections readable ao - List of active connection object paths. + +List of active connection object paths. @@ -723,11 +851,12 @@ ActiveConnections readable ao PrimaryConnection readable o - The object path of the "primary" active connection being used to access - the network. In particular, if there is no VPN active, or the VPN does not - have the default route, then this indicates the connection that has the - default route. If there is a VPN active with the default route, then this - indicates the connection that contains the route to the VPN endpoint. + +The object path of the "primary" active connection being used to access +the network. In particular, if there is no VPN active, or the VPN does not +have the default route, then this indicates the connection that has the +default route. If there is a VPN active with the default route, then this +indicates the connection that contains the route to the VPN endpoint. @@ -736,9 +865,10 @@ PrimaryConnection readable o PrimaryConnectionType readable s - The connection type of the "primary" active connection being used to - access the network. This is the same as the Type property on the object - indicated by PrimaryConnection. + +The connection type of the "primary" active connection being used to +access the network. This is the same as the Type property on the object +indicated by PrimaryConnection. @@ -747,9 +877,11 @@ PrimaryConnectionType readable s Metered readable u - Indicates whether the connectivity is metered. This is equivalent to the - metered property of the device associated with the primary connection. - Returns: NMMetered + +Indicates whether the connectivity is metered. This is equivalent to the +metered property of the device associated with the primary connection. + +Returns: NMMetered @@ -758,9 +890,10 @@ Metered readable u ActivatingConnection readable o - The object path of an active connection that is currently being activated - and which is expected to become the new PrimaryConnection when it finishes - activating. + +The object path of an active connection that is currently being activated +and which is expected to become the new PrimaryConnection when it finishes +activating. @@ -769,9 +902,10 @@ ActivatingConnection readable o Startup readable b - Indicates whether NM is still starting up; this becomes FALSE when NM has - finished attempting to activate every connection that it might be able to - activate at startup. + +Indicates whether NM is still starting up; this becomes FALSE when NM has +finished attempting to activate every connection that it might be able to +activate at startup. @@ -780,7 +914,8 @@ Startup readable b Version readable s - NetworkManager version. + +NetworkManager version. @@ -789,10 +924,11 @@ Version readable s Capabilities readable au - The current set of capabilities. See NMCapability for currently - defined capability numbers. The array is guaranteed to - be sorted in ascending order without duplicates. + +The current set of capabilities. See NMCapability for currently +defined capability numbers. The array is guaranteed to +be sorted in ascending order without duplicates. @@ -801,15 +937,19 @@ Capabilities readable au State readable u - The overall state of the NetworkManager daemon. - This takes state of all active connections and the connectivity state into account - to produce a single indicator of the network accessibility status. - The graphical shells may use this property to provide network connection status - indication and applications may use this to check if Internet connection is - accessible. Shell that is able to cope with captive portals should use the - "Connectivity" property to decide whether to present a captive portal authentication - dialog. - Returns: NMState + +The overall state of the NetworkManager daemon. + +This takes state of all active connections and the connectivity state into account +to produce a single indicator of the network accessibility status. + +The graphical shells may use this property to provide network connection status +indication and applications may use this to check if Internet connection is +accessible. Shell that is able to cope with captive portals should use the +"Connectivity" property to decide whether to present a captive portal authentication +dialog. + +Returns: NMState @@ -818,18 +958,22 @@ State readable u Connectivity readable u - The result of the last connectivity check. The connectivity check is triggered - automatically when a default connection becomes available, periodically and by - calling a CheckConnectivity() method. - This property is in general useful for the graphical shell to determine whether - the Internet access is being hijacked by an authentication gateway (a "captive - portal"). In such case it would typically present a web browser window to give - the user a chance to authenticate and call CheckConnectivity() when the user - submits a form or dismisses the window. - To determine the whether the user is able to access the Internet without dealing - with captive portals (e.g. to provide a network connection indicator or disable - controls that require Internet access), the "State" property is more suitable. - Returns: NMConnectivityState + +The result of the last connectivity check. The connectivity check is triggered +automatically when a default connection becomes available, periodically and by +calling a CheckConnectivity() method. + +This property is in general useful for the graphical shell to determine whether +the Internet access is being hijacked by an authentication gateway (a "captive +portal"). In such case it would typically present a web browser window to give +the user a chance to authenticate and call CheckConnectivity() when the user +submits a form or dismisses the window. + +To determine the whether the user is able to access the Internet without dealing +with captive portals (e.g. to provide a network connection indicator or disable +controls that require Internet access), the "State" property is more suitable. + +Returns: NMConnectivityState @@ -838,12 +982,14 @@ Connectivity readable u ConnectivityCheckAvailable readable b - Indicates whether connectivity checking service has been - configured. This may return true even if the service is not - currently enabled. - This is primarily intended for use in a privacy control panel, - as a way to determine whether to show an option to - enable/disable the feature. + +Indicates whether connectivity checking service has been +configured. This may return true even if the service is not +currently enabled. + +This is primarily intended for use in a privacy control panel, +as a way to determine whether to show an option to +enable/disable the feature. @@ -852,9 +998,10 @@ ConnectivityCheckAvailable readable b ConnectivityCheckEnabled readwrite b - Indicates whether connectivity checking is enabled. This - property can also be written to disable connectivity - checking (as a privacy control panel might want to do). + +Indicates whether connectivity checking is enabled. This +property can also be written to disable connectivity +checking (as a privacy control panel might want to do). @@ -863,7 +1010,8 @@ ConnectivityCheckEnabled readwrite b ConnectivityCheckUri readable s - The URI that NetworkManager will hit to check if there is internet connectivity. + +The URI that NetworkManager will hit to check if there is internet connectivity. @@ -872,14 +1020,15 @@ ConnectivityCheckUri readable s GlobalDnsConfiguration readwrite a{sv} - Dictionary of global DNS settings where the key is one of "searches", - "options" and "domains". The values for the "searches" and "options" keys - are string arrays describing the list of search domains and resolver - options, respectively. The value of the "domains" key is a second-level - dictionary, where each key is a domain name, and each key's value is a - third-level dictionary with the keys "servers" and "options". "servers" is - a string array of DNS servers, "options" is a string array of - domain-specific options. + +Dictionary of global DNS settings where the key is one of "searches", +"options" and "domains". The values for the "searches" and "options" keys +are string arrays describing the list of search domains and resolver +options, respectively. The value of the "domains" key is a second-level +dictionary, where each key is a domain name, and each key's value is a +third-level dictionary with the keys "servers" and "options". "servers" is +a string array of DNS servers, "options" is a string array of +domain-specific options. diff --git a/docs/api/html/NetworkManager-dispatcher.html b/docs/api/html/NetworkManager-dispatcher.html index 07397a71..d9a80e2f 100644 --- a/docs/api/html/NetworkManager-dispatcher.html +++ b/docs/api/html/NetworkManager-dispatcher.html @@ -8,7 +8,7 @@ - + @@ -325,6 +325,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/NetworkManager-wait-online.service.html b/docs/api/html/NetworkManager-wait-online.service.html index 2e252200..3f6d63d1 100644 --- a/docs/api/html/NetworkManager-wait-online.service.html +++ b/docs/api/html/NetworkManager-wait-online.service.html @@ -8,7 +8,7 @@ - + @@ -145,6 +145,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 1a3152ee..15dfe367 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -8,7 +8,7 @@ - + @@ -1841,6 +1841,6 @@ interface-name:vboxnet*,except:interface-name:vboxnet2
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html index 5119eacf..91e7e085 100644 --- a/docs/api/html/NetworkManager.html +++ b/docs/api/html/NetworkManager.html @@ -8,7 +8,7 @@ - + @@ -339,6 +339,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ch01.html b/docs/api/html/ch01.html index 9863c8bd..e4cd603e 100644 --- a/docs/api/html/ch01.html +++ b/docs/api/html/ch01.html @@ -8,7 +8,7 @@ - + @@ -182,6 +182,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/dbus-secret-agent.html b/docs/api/html/dbus-secret-agent.html index 77edc023..b66890fd 100644 --- a/docs/api/html/dbus-secret-agent.html +++ b/docs/api/html/dbus-secret-agent.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/dbus-types.html b/docs/api/html/dbus-types.html index cfdccb55..b5eb97fd 100644 --- a/docs/api/html/dbus-types.html +++ b/docs/api/html/dbus-types.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/dbus-vpn-plugin.html b/docs/api/html/dbus-vpn-plugin.html index da728ca0..bb39e395 100644 --- a/docs/api/html/dbus-vpn-plugin.html +++ b/docs/api/html/dbus-vpn-plugin.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/dbus-vpn-types.html b/docs/api/html/dbus-vpn-types.html index a6c5d516..bb2edb32 100644 --- a/docs/api/html/dbus-vpn-types.html +++ b/docs/api/html/dbus-vpn-types.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html index 99dcc77b..31349078 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html @@ -8,7 +8,7 @@ - + @@ -49,7 +49,10 @@

Description

-

+

+

+

+

Property Details

@@ -58,9 +61,11 @@ 
 Flags  readable   u
-

Flags describing the capabilities of the access point. +

+Flags describing the capabilities of the access point.

-

Returns: NM80211ApFlags +

+Returns: NM80211ApFlags

@@ -69,10 +74,12 @@ Flags readable u 
 WpaFlags  readable   u
-

Flags describing the access point's capabilities according to WPA (Wifi - Protected Access). +

+Flags describing the access point's capabilities according to WPA (Wifi +Protected Access).

-

Returns: NM80211ApSecurityFlags +

+Returns: NM80211ApSecurityFlags

@@ -81,10 +88,12 @@ WpaFlags readable u 
 RsnFlags  readable   u
-

Flags describing the access point's capabilities according to the RSN - (Robust Secure Network) protocol. +

+Flags describing the access point's capabilities according to the RSN +(Robust Secure Network) protocol.

-

Returns: NM80211ApSecurityFlags +

+Returns: NM80211ApSecurityFlags

@@ -93,7 +102,8 @@ RsnFlags readable u 
 Ssid  readable   ay
-

The Service Set Identifier identifying the access point. +

+The Service Set Identifier identifying the access point.

@@ -102,7 +112,8 @@ Ssid readable ay 
 Frequency  readable   u
-

The radio channel frequency in use by the access point, in MHz. +

+The radio channel frequency in use by the access point, in MHz.

@@ -111,7 +122,8 @@ Frequency readable u 
 HwAddress  readable   s
-

The hardware address (BSSID) of the access point. +

+The hardware address (BSSID) of the access point.

@@ -120,9 +132,11 @@ HwAddress readable s 
 Mode  readable   u
-

Describes the operating mode of the access point. +

+Describes the operating mode of the access point.

-

Returns: NM80211Mode +

+Returns: NM80211Mode

@@ -131,8 +145,9 @@ Mode readable u 
 MaxBitrate  readable   u
-

The maximum bitrate this access point is capable of, in kilobits/second - (Kb/s). +

+The maximum bitrate this access point is capable of, in kilobits/second +(Kb/s).

@@ -141,7 +156,8 @@ MaxBitrate readable u 
 Strength  readable   y
-

The current signal quality of the access point, in percent. +

+The current signal quality of the access point, in percent.

@@ -150,14 +166,15 @@ Strength readable y 
 LastSeen  readable   i
-

The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access - point was found in scan results. A value of -1 means the access point has - never been found in scan results. +

+The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access +point was found in scan results. A value of -1 means the access point has +never been found in scan results.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html index 242f8f0b..f230e84f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html @@ -8,7 +8,7 @@ - + @@ -42,7 +42,10 @@

Description

-

+

+

+

+

Method Details

@@ -51,8 +54,9 @@ 
 Register (IN  s identifier);
-

Called by secret Agents to register their ability to provide and save - network secrets. +

+Called by secret Agents to register their ability to provide and save +network secrets.

@@ -61,7 +65,9 @@ Register (IN s identifier); - +

IN s identifier:

Identifies this agent; only one agent in each user session may use the same identifier. Identifier formatting follows the same rules as D-Bus bus names with the exception that the ':' character is not allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the identifier is limited in length to 255 characters with a minimum of 3 characters. An example valid identifier is 'org.gnome.nm-applet' (without quotes).

+Identifies this agent; only one agent in each user session may use the same identifier. Identifier formatting follows the same rules as D-Bus bus names with the exception that the ':' character is not allowed. The valid set of characters is "[A-Z][a-z][0-9]_-." and the identifier is limited in length to 255 characters with a minimum of 3 characters. An example valid identifier is 'org.gnome.nm-applet' (without quotes). +
@@ -72,7 +78,8 @@ Register (IN s identifier); RegisterWithCapabilities (IN s identifier, IN u capabilities); -

Like Register() but indicates agent capabilities to NetworkManager. +

+Like Register() but indicates agent capabilities to NetworkManager.

@@ -82,11 +89,15 @@ RegisterWithCapabilities (IN s identifier, - + - +

IN s identifier:

See the Register() method's identifier argument.

+See the Register() method's identifier argument. +

IN u capabilities:

(NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager.

+(NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager. +
@@ -97,14 +108,15 @@ RegisterWithCapabilities (IN s identifier, 
 Unregister ();
-

Called by secret Agents to notify NetworkManager that they will no longer - handle requests for network secrets. Agents are automatically unregistered - when they disconnect from D-Bus. +

+Called by secret Agents to notify NetworkManager that they will no longer +handle requests for network secrets. Agents are automatically unregistered +when they disconnect from D-Bus.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html index 4247998b..729e0741 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html @@ -8,7 +8,7 @@ - + @@ -42,7 +42,8 @@

Description

-

A snapshot of NetworkManager state for a given device list +

+A snapshot of NetworkManager state for a given device list

@@ -52,8 +53,9 @@ 
 Devices  readable   ao
-

Array of object paths for devices which are part of this - checkpoint. +

+Array of object paths for devices which are part of this +checkpoint.

@@ -62,7 +64,8 @@ Devices readable ao 
 Created  readable   x
-

The timestamp (in CLOCK_BOOTTIME milliseconds) of checkpoint creation. +

+The timestamp (in CLOCK_BOOTTIME milliseconds) of checkpoint creation.

@@ -71,12 +74,13 @@ Created readable x 
 RollbackTimeout  readable   u
-

Timeout in seconds for automatic rollback, or zero. +

+Timeout in seconds for automatic rollback, or zero.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html index b3526674..f6e96ea6 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html @@ -8,7 +8,7 @@ - + @@ -63,20 +63,21 @@

Description

-

Objects that implement the Connection.Active interface represent an - attempt to connect to a network using the details provided by a Connection - object. The Connection.Active object tracks the life-cycle of the - connection attempt and if successful indicates whether the connected - network is the "default" or preferred network for access. NetworkManager - has the concept of connections, which can be thought of as settings, a - profile or a configuration that can be applied on a networking device. - Such settings-connections are exposed as D-Bus object and the - active-connection expresses this relationship between device and - settings-connection. At any time a settings-connection can only be - activated on one device and vice versa. However, during activation and - deactivation multiple active-connections can reference the same device or - settings-connection as they are waiting to be activated or to be - deactivated. +

+Objects that implement the Connection.Active interface represent an +attempt to connect to a network using the details provided by a Connection +object. The Connection.Active object tracks the life-cycle of the +connection attempt and if successful indicates whether the connected +network is the "default" or preferred network for access. NetworkManager +has the concept of connections, which can be thought of as settings, a +profile or a configuration that can be applied on a networking device. +Such settings-connections are exposed as D-Bus object and the +active-connection expresses this relationship between device and +settings-connection. At any time a settings-connection can only be +activated on one device and vice versa. However, during activation and +deactivation multiple active-connections can reference the same device or +settings-connection as they are waiting to be activated or to be +deactivated.

@@ -87,7 +88,8 @@ StateChanged (u state, u reason); -

Emitted when the state of the active connection has changed. +

+Emitted when the state of the active connection has changed.

@@ -97,11 +99,15 @@ StateChanged (u state, - + - +

u state:

(NMActiveConnectionState) The new state of the active connection.

+(NMActiveConnectionState) The new state of the active connection. +

u reason:

(NMActiveConnectionStateReason) Reason code describing the change to the new state.

+(NMActiveConnectionStateReason) Reason code describing the change to the new state. +
@@ -115,7 +121,8 @@ StateChanged (u state, 
 Connection  readable   o
-

The path of the connection. +

+The path of the connection.

@@ -124,9 +131,10 @@ Connection readable o 
 SpecificObject  readable   o
-

A specific object associated with the active connection. This property - reflects the specific object used during connection activation, and will - not change over the lifetime of the ActiveConnection once set. +

+A specific object associated with the active connection. This property +reflects the specific object used during connection activation, and will +not change over the lifetime of the ActiveConnection once set.

@@ -135,8 +143,9 @@ SpecificObject readable o 
 Id  readable   s
-

The ID of the connection, provided as a convenience so that clients do not - have to retrieve all connection details. +

+The ID of the connection, provided as a convenience so that clients do not +have to retrieve all connection details.

@@ -145,8 +154,9 @@ Id readable s 
 Uuid  readable   s
-

The UUID of the connection, provided as a convenience so that clients do - not have to retrieve all connection details. +

+The UUID of the connection, provided as a convenience so that clients do +not have to retrieve all connection details.

@@ -155,8 +165,9 @@ Uuid readable s 
 Type  readable   s
-

The type of the connection, provided as a convenience so that clients do - not have to retrieve all connection details. +

+The type of the connection, provided as a convenience so that clients do +not have to retrieve all connection details.

@@ -165,8 +176,9 @@ Type readable s 
 Devices  readable   ao
-

Array of object paths representing devices which are part of this active - connection. +

+Array of object paths representing devices which are part of this active +connection.

@@ -175,9 +187,11 @@ Devices readable ao 
 State  readable   u
-

The state of this active connection. +

+The state of this active connection.

-

Returns: NMActiveConnectionState +

+Returns: NMActiveConnectionState

@@ -186,9 +200,11 @@ State readable u 
 StateFlags  readable   u
-

The state flags of this active connection. +

+The state flags of this active connection.

-

Returns: NMActivationStateFlags +

+Returns: NMActivationStateFlags

@@ -197,8 +213,9 @@ StateFlags readable u 
 Default  readable   b
-

Whether this active connection is the default IPv4 connection, i.e. - whether it currently owns the default IPv4 route. +

+Whether this active connection is the default IPv4 connection, i.e. +whether it currently owns the default IPv4 route.

@@ -207,9 +224,10 @@ Default readable b 
 Ip4Config  readable   o
-

Object path of the Ip4Config object describing the configuration of the - connection. Only valid when the connection is in the - NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. +

+Object path of the Ip4Config object describing the configuration of the +connection. Only valid when the connection is in the +NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

@@ -218,9 +236,10 @@ Ip4Config readable o 
 Dhcp4Config  readable   o
-

Object path of the Dhcp4Config object describing the DHCP options returned - by the DHCP server (assuming the connection used DHCP). Only valid when - the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. +

+Object path of the Dhcp4Config object describing the DHCP options returned +by the DHCP server (assuming the connection used DHCP). Only valid when +the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

@@ -229,8 +248,9 @@ Dhcp4Config readable o 
 Default6  readable   b
-

Whether this active connection is the default IPv6 connection, i.e. - whether it currently owns the default IPv6 route. +

+Whether this active connection is the default IPv6 connection, i.e. +whether it currently owns the default IPv6 route.

@@ -239,9 +259,10 @@ Default6 readable b 
 Ip6Config  readable   o
-

Object path of the Ip6Config object describing the configuration of the - connection. Only valid when the connection is in the - NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. +

+Object path of the Ip6Config object describing the configuration of the +connection. Only valid when the connection is in the +NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

@@ -250,9 +271,10 @@ Ip6Config readable o 
 Dhcp6Config  readable   o
-

Object path of the Dhcp6Config object describing the DHCP options returned - by the DHCP server (assuming the connection used DHCP). Only valid when - the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. +

+Object path of the Dhcp6Config object describing the DHCP options returned +by the DHCP server (assuming the connection used DHCP). Only valid when +the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

@@ -261,7 +283,8 @@ Dhcp6Config readable o 
 Vpn  readable   b
-

Whether this active connection is also a VPN connection. +

+Whether this active connection is also a VPN connection.

@@ -270,12 +293,13 @@ Vpn readable b 
 Master  readable   o
-

The path to the master device if the connection is a slave. +

+The path to the master device if the connection is a slave.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html index 7563d0ea..142d2fcc 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html @@ -8,7 +8,7 @@ - + @@ -40,7 +40,8 @@

Description

-

Options and configuration returned by the IPv4 DHCP server. +

+Options and configuration returned by the IPv4 DHCP server.

@@ -50,12 +51,13 @@ 
 Options  readable   a{sv}
-

Configuration options returned by a DHCP server, if any. +

+Configuration options returned by a DHCP server, if any.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html index 4dbe3ffa..2038be09 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html @@ -8,7 +8,7 @@ - + @@ -40,7 +40,8 @@

Description

-

Options and configuration returned by the IPv6 DHCP server. +

+Options and configuration returned by the IPv6 DHCP server.

@@ -50,12 +51,13 @@ 
 Options  readable   a{sv}
-

Configuration options returned by a DHCP server, if any. +

+Configuration options returned by a DHCP server, if any.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html index 7a0fe15a..305f3e76 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html @@ -8,7 +8,7 @@ - + @@ -40,7 +40,10 @@

Description

-

+

+

+

+

Property Details

@@ -49,15 +52,17 @@ 
 Carrier  readable   b
-

Indicates whether the physical carrier is found. +

+Indicates whether the physical carrier is found.

-

DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. +

+DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html index 3c577596..af50c253 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html @@ -8,7 +8,7 @@ - + @@ -42,7 +42,10 @@

Description

-

+

+

+

+

Property Details

@@ -51,9 +54,11 @@ 
 HwAddress  readable   s
-

Bluetooth hardware address of the device. +

+Bluetooth hardware address of the device.

-

DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +

+DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -62,7 +67,8 @@ HwAddress readable s 
 Name  readable   s
-

Bluetooth name of the device. +

+Bluetooth name of the device.

@@ -71,14 +77,16 @@ Name readable s 
 BtCapabilities  readable   u
-

Bluetooth capabilities of the device (either DUN or NAP). +

+Bluetooth capabilities of the device (either DUN or NAP).

-

Returns: NMBluetoothCapabilities +

+Returns: NMBluetoothCapabilities

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html index d17fb6a8..c66f8f9b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html @@ -8,7 +8,7 @@ - + @@ -42,7 +42,10 @@

Description

-

+

+

+

+

Property Details

@@ -51,9 +54,10 @@ 
 HwAddress  readable   s
-

Hardware address of the device. +

+Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -62,11 +66,13 @@ n 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). +

+Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not).

-

DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. +

+DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface.

@@ -75,14 +81,15 @@ Carrier readable b 
 Slaves  readable   ao
-

DEPRECATED. Use the "Ports" property in - "org.freedesktop.NetworkManager.Device" instead which exists since - version NetworkManager 1.34.0. +

+DEPRECATED. Use the "Ports" property in +"org.freedesktop.NetworkManager.Device" instead which exists since +version NetworkManager 1.34.0.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html index df4eebb4..050a8d2d 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html @@ -8,7 +8,7 @@ - + @@ -42,7 +42,10 @@

Description

-

+

+

+

+

Property Details

@@ -51,9 +54,10 @@ 
 HwAddress  readable   s
-

Hardware address of the device. +

+Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -62,11 +66,13 @@ n 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). +

+Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not).

-

DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. +

+DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface.

@@ -75,14 +81,15 @@ Carrier readable b 
 Slaves  readable   ao
-

DEPRECATED. Use the "Ports" property in - "org.freedesktop.NetworkManager.Device" instead which exists since - version NetworkManager 1.34.0. +

+DEPRECATED. Use the "Ports" property in +"org.freedesktop.NetworkManager.Device" instead which exists since +version NetworkManager 1.34.0.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html index 48682cff..bfa69828 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html @@ -8,7 +8,7 @@ - + @@ -40,7 +40,10 @@

Description

-

+

+

+

+

Property Details

@@ -49,14 +52,15 @@ 
 HwAddress  readable   s
-

Hardware address of the device. +

+Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html index 094abcd2..654fc147 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html @@ -8,7 +8,7 @@ - + @@ -41,7 +41,10 @@

Description

-

+

+

+

+

Property Details

@@ -50,9 +53,10 @@ 
 HwAddress  readable   s
-

Hardware address of the device. +

+Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -61,12 +65,13 @@ n 
 TypeDescription  readable   s
-

A (non-localized) description of the interface type, if known. +

+A (non-localized) description of the interface type, if known.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html index 45860f06..cdf6a946 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html @@ -8,7 +8,7 @@ - + @@ -51,7 +51,10 @@

Description

-

+

+

+

+

Property Details

@@ -60,7 +63,8 @@ 
 Mode  readable   u
-

The tunneling mode. +

+The tunneling mode.

@@ -69,7 +73,8 @@ Mode readable u 
 Parent  readable   o
-

The object path of the parent device. +

+The object path of the parent device.

@@ -78,7 +83,8 @@ Parent readable o 
 Local  readable   s
-

The local endpoint of the tunnel. +

+The local endpoint of the tunnel.

@@ -87,7 +93,8 @@ Local readable s 
 Remote  readable   s
-

The remote endpoint of the tunnel. +

+The remote endpoint of the tunnel.

@@ -96,8 +103,9 @@ Remote readable s 
 Ttl  readable   y
-

The TTL assigned to tunneled packets. 0 is a special value meaning that - packets inherit the TTL value +

+The TTL assigned to tunneled packets. 0 is a special value meaning that +packets inherit the TTL value

@@ -106,8 +114,9 @@ Ttl readable y 
 Tos  readable   y
-

The type of service (IPv4) or traffic class (IPv6) assigned to tunneled - packets. +

+The type of service (IPv4) or traffic class (IPv6) assigned to tunneled +packets.

@@ -116,7 +125,8 @@ Tos readable y 
 PathMtuDiscovery  readable   b
-

Whether path MTU discovery is enabled on this tunnel. +

+Whether path MTU discovery is enabled on this tunnel.

@@ -125,7 +135,8 @@ PathMtuDiscovery readable b 
 InputKey  readable   s
-

The key used for incoming packets. +

+The key used for incoming packets.

@@ -134,7 +145,8 @@ InputKey readable s 
 OutputKey  readable   s
-

The key used for outgoing packets. +

+The key used for outgoing packets.

@@ -143,8 +155,9 @@ OutputKey readable s 
 EncapsulationLimit  readable   y
-

How many additional levels of encapsulation are permitted to be prepended - to packets. This property applies only to IPv6 tunnels. +

+How many additional levels of encapsulation are permitted to be prepended +to packets. This property applies only to IPv6 tunnels.

@@ -153,8 +166,9 @@ EncapsulationLimit readable y 
 FlowLabel  readable   u
-

The flow label to assign to tunnel packets. This property applies only to - IPv6 tunnels. +

+The flow label to assign to tunnel packets. This property applies only to +IPv6 tunnels.

@@ -163,12 +177,13 @@ FlowLabel readable u 
 Flags  readable   u
-

Tunnel flags. +

+Tunnel flags.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html index d9ce23e3..c706d1ff 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html @@ -8,7 +8,7 @@ - + @@ -41,7 +41,10 @@

Description

-

+

+

+

+

Property Details

@@ -50,9 +53,10 @@ 
 HwAddress  readable   s
-

Hardware address of the device. +

+Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -61,16 +65,18 @@ n 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). +

+Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not).

-

DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. +

+DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html index f8e9c123..8d85d33a 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Lowpan.html @@ -8,7 +8,7 @@ - + @@ -41,7 +41,10 @@

Description

-

+

+

+

+

Property Details

@@ -50,9 +53,11 @@ 
 HwAddress  readable   s
-

The active hardware address of the device. +

+The active hardware address of the device.

-

DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +

+DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -61,12 +66,13 @@ HwAddress readable s 
 Parent  readable   o
-

The object path of the parent device. +

+The object path of the parent device.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html index 1ea34f2c..795aee21 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html @@ -8,7 +8,7 @@ - + @@ -52,7 +52,10 @@

Description

-

+

+

+

+

Property Details

@@ -61,7 +64,8 @@ 
 Parent  readable   o
-

The object path of the parent device. +

+The object path of the parent device.

@@ -70,7 +74,8 @@ Parent readable o 
 Sci  readable   t
-

The Secure Channel Identifier in use. +

+The Secure Channel Identifier in use.

@@ -79,7 +84,8 @@ Sci readable t 
 IcvLength  readable   y
-

The length of ICV (Integrity Check Value). +

+The length of ICV (Integrity Check Value).

@@ -88,8 +94,9 @@ IcvLength readable y 
 CipherSuite  readable   t
-

The set of cryptographic algorithms in use - (e.g. 0x0080020001000001 for GCM-AES-128). +

+The set of cryptographic algorithms in use +(e.g. 0x0080020001000001 for GCM-AES-128).

@@ -98,7 +105,8 @@ CipherSuite readable t 
 Window  readable   u
-

The size of the replay window. +

+The size of the replay window.

@@ -107,8 +115,9 @@ Window readable u 
 EncodingSa  readable   y
-

The value of the Association Number (0..3) for the Security - Association in use. +

+The value of the Association Number (0..3) for the Security +Association in use.

@@ -117,8 +126,9 @@ EncodingSa readable y 
 Validation  readable   s
-

The validation mode for incoming packets (strict, check, - disabled). +

+The validation mode for incoming packets (strict, check, +disabled).

@@ -127,7 +137,8 @@ Validation readable s 
 Encrypt  readable   b
-

Whether encryption of transmitted frames is enabled. +

+Whether encryption of transmitted frames is enabled.

@@ -136,7 +147,8 @@ Encrypt readable b 
 Protect  readable   b
-

Whether protection of transmitted frames is enabled. +

+Whether protection of transmitted frames is enabled.

@@ -145,8 +157,9 @@ Protect readable b 
 IncludeSci  readable   b
-

Whether the SCI is always included in SecTAG for transmitted - frames. +

+Whether the SCI is always included in SecTAG for transmitted +frames.

@@ -155,8 +168,9 @@ IncludeSci readable b 
 Es  readable   b
-

Whether the ES (End station) bit is enabled in SecTAG for - transmitted frames. +

+Whether the ES (End station) bit is enabled in SecTAG for +transmitted frames.

@@ -165,8 +179,9 @@ Es readable b 
 Scb  readable   b
-

Whether the SCB (Single Copy Broadcast) bit is enabled in - SecTAG for transmitted frames. +

+Whether the SCB (Single Copy Broadcast) bit is enabled in +SecTAG for transmitted frames.

@@ -175,12 +190,13 @@ Scb readable b 
 ReplayProtect  readable   b
-

Whether replay protection is enabled. +

+Whether replay protection is enabled.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html index 3b6ab272..fcbb003c 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html @@ -8,7 +8,7 @@ - + @@ -43,7 +43,10 @@

Description

-

+

+

+

+

Property Details

@@ -52,7 +55,8 @@ 
 Parent  readable   o
-

The object path of the parent device. +

+The object path of the parent device.

@@ -61,7 +65,8 @@ Parent readable o 
 Mode  readable   s
-

The macvlan mode, one of "private", "vepa", "bridge", or "passthru". +

+The macvlan mode, one of "private", "vepa", "bridge", or "passthru".

@@ -70,7 +75,8 @@ Mode readable s 
 NoPromisc  readable   b
-

Whether the device is blocked from going into promiscuous mode. +

+Whether the device is blocked from going into promiscuous mode.

@@ -79,12 +85,13 @@ NoPromisc readable b 
 Tap  readable   b
-

Whether the device is a macvtap. +

+Whether the device is a macvtap.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html index 815f00ea..4b6cc204 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html @@ -8,7 +8,7 @@ - + @@ -44,7 +44,10 @@

Description

-

+

+

+

+

Property Details

@@ -53,12 +56,14 @@ 
 ModemCapabilities  readable   u
-

The generic family of access technologies the modem supports. Not all - capabilities are available at the same time however; some modems require a - firmware reload or other reinitialization to switch between eg CDMA/EVDO - and GSM/UMTS. +

+The generic family of access technologies the modem supports. Not all +capabilities are available at the same time however; some modems require a +firmware reload or other reinitialization to switch between eg CDMA/EVDO +and GSM/UMTS.

-

Returns: NMDeviceModemCapabilities +

+Returns: NMDeviceModemCapabilities

@@ -67,10 +72,12 @@ ModemCapabilities readable u 
 CurrentCapabilities  readable   u
-

The generic family of access technologies the modem currently supports - without a firmware reload or reinitialization. +

+The generic family of access technologies the modem currently supports +without a firmware reload or reinitialization.

-

Returns: NMDeviceModemCapabilities +

+Returns: NMDeviceModemCapabilities

@@ -79,9 +86,10 @@ CurrentCapabilities readable u 
 DeviceId  readable   s
-

An identifier used by the modem backend (ModemManager) that aims to - uniquely identify the a device. Can be used to match a connection to a - particular device. +

+An identifier used by the modem backend (ModemManager) that aims to +uniquely identify the a device. Can be used to match a connection to a +particular device.

Since 1.20

@@ -91,8 +99,9 @@ DeviceId readable s 
 OperatorCode  readable   s
-

The MCC and MNC (concatenated) of the network the modem is connected to. - Blank if disconnected or not a 3GPP modem. +

+The MCC and MNC (concatenated) of the network the modem is connected to. +Blank if disconnected or not a 3GPP modem.

Since 1.20

@@ -102,13 +111,14 @@ OperatorCode readable s 
 Apn  readable   s
-

The access point name the modem is connected to. Blank if disconnected. +

+The access point name the modem is connected to. Blank if disconnected.

Since 1.20

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html index c60086c5..2f71abd8 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html @@ -8,7 +8,7 @@ - + @@ -42,7 +42,10 @@

Description

-

+

+

+

+

Property Details

@@ -51,9 +54,11 @@ 
 HwAddress  readable   s
-

The hardware address of the device. +

+The hardware address of the device.

-

DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +

+DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -62,7 +67,8 @@ HwAddress readable s 
 Companion  readable   o
-

The object path of the companion device. +

+The object path of the companion device.

@@ -71,12 +77,13 @@ Companion readable o 
 ActiveChannel  readable   u
-

The currently active channel. +

+The currently active channel.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html index 10fc724c..46b3fbd4 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html @@ -8,7 +8,7 @@ - + @@ -40,7 +40,10 @@

Description

-

+

+

+

+

Property Details

@@ -49,15 +52,16 @@ 
 Slaves  readable   ao
-

DEPRECATED. Use the "Ports" property in - "org.freedesktop.NetworkManager.Device" instead which exists since - version NetworkManager 1.34.0. +

+DEPRECATED. Use the "Ports" property in +"org.freedesktop.NetworkManager.Device" instead which exists since +version NetworkManager 1.34.0.

Since 1.14

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html index ee00d7b2..ef46a103 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html @@ -8,7 +8,7 @@ - + @@ -33,10 +33,13 @@

Description

-

+

+

+

+

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html index 9d4ecb8e..08cf13ba 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html @@ -8,7 +8,7 @@ - + @@ -40,7 +40,10 @@

Description

-

+

+

+

+

Property Details

@@ -49,15 +52,16 @@ 
 Slaves  readable   ao
-

DEPRECATED. Use the "Ports" property in - "org.freedesktop.NetworkManager.Device" instead which exists since - version NetworkManager 1.34.0. +

+DEPRECATED. Use the "Ports" property in +"org.freedesktop.NetworkManager.Device" instead which exists since +version NetworkManager 1.34.0.

Since 1.14

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html index e1caa59f..ee50d1cc 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html @@ -8,7 +8,7 @@ - + @@ -33,10 +33,13 @@

Description

-

+

+

+

+

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html index fee2c027..14597116 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html @@ -8,7 +8,7 @@ - + @@ -42,7 +42,10 @@

Description

-

+

+

+

+

Property Details

@@ -51,10 +54,11 @@ 
 RefreshRateMs  readwrite  u
-

Refresh rate of the rest of properties of this interface. The properties - are guaranteed to be refreshed each RefreshRateMs milliseconds in case - the underlying counter has changed too. - If zero, there is no guaranteed refresh rate of the properties. +

+Refresh rate of the rest of properties of this interface. The properties +are guaranteed to be refreshed each RefreshRateMs milliseconds in case +the underlying counter has changed too. +If zero, there is no guaranteed refresh rate of the properties.

@@ -63,7 +67,8 @@ RefreshRateMs readwrite u 
 TxBytes  readable   t
-

Number of transmitted bytes +

+Number of transmitted bytes

@@ -72,12 +77,13 @@ TxBytes readable t 
 RxBytes  readable   t
-

Number of received bytes +

+Number of received bytes

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html index 19fe70de..5864fd40 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html @@ -8,7 +8,7 @@ - + @@ -43,7 +43,10 @@

Description

-

+

+

+

+

Property Details

@@ -52,9 +55,10 @@ 
 HwAddress  readable   s
-

Hardware address of the device. +

+Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -63,11 +67,13 @@ n 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). +

+Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not).

-

DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. +

+DEPRECATED: check for the "lower-up" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface.

@@ -76,9 +82,10 @@ Carrier readable b 
 Slaves  readable   ao
-

DEPRECATED. Use the "Ports" property in - "org.freedesktop.NetworkManager.Device" instead which exists since - version NetworkManager 1.34.0. +

+DEPRECATED. Use the "Ports" property in +"org.freedesktop.NetworkManager.Device" instead which exists since +version NetworkManager 1.34.0.

@@ -87,12 +94,13 @@ Slaves readable ao 
 Config  readable   s
-

The JSON configuration currently applied on the device. +

+The JSON configuration currently applied on the device.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html index 33ecfb60..8c05cf5c 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html @@ -8,7 +8,7 @@ - + @@ -46,7 +46,10 @@

Description

-

+

+

+

+

Property Details

@@ -55,7 +58,8 @@ 
 Owner  readable   x
-

The uid of the tunnel owner, or -1 if it has no owner. +

+The uid of the tunnel owner, or -1 if it has no owner.

@@ -64,7 +68,8 @@ Owner readable x 
 Group  readable   x
-

The gid of the tunnel group, or -1 if it has no owner. +

+The gid of the tunnel group, or -1 if it has no owner.

@@ -73,7 +78,8 @@ Group readable x 
 Mode  readable   s
-

The tunnel mode, either "tun" or "tap". +

+The tunnel mode, either "tun" or "tap".

@@ -82,8 +88,9 @@ Mode readable s 
 NoPi  readable   b
-

The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to - the tunnel packets. +

+The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to +the tunnel packets.

@@ -92,8 +99,9 @@ NoPi readable b 
 VnetHdr  readable   b
-

The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a - virtio network header. +

+The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a +virtio network header.

@@ -102,8 +110,9 @@ VnetHdr readable b 
 MultiQueue  readable   b
-

The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap - device multiple times, for multiple send/receive queues. +

+The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap +device multiple times, for multiple send/receive queues.

@@ -112,14 +121,15 @@ MultiQueue readable b 
 HwAddress  readable   s
-

Hardware address of the device. +

+Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html index a28112a1..46b788f2 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html @@ -8,7 +8,7 @@ - + @@ -40,7 +40,10 @@

Description

-

+

+

+

+

Property Details

@@ -49,12 +52,13 @@ 
 Peer  readable   o
-

The object path of the device's peer. +

+The object path of the device's peer.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html index fc86b6bf..a55b8250 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html @@ -8,7 +8,7 @@ - + @@ -43,7 +43,10 @@

Description

-

+

+

+

+

Property Details

@@ -52,9 +55,10 @@ 
 HwAddress  readable   s
-

Hardware address of the device. +

+Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -63,11 +67,13 @@ n 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). +

+Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not).

-

DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. +

+DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface.

@@ -76,7 +82,8 @@ Carrier readable b 
 Parent  readable   o
-

Object path of the parent device of this VLAN device. +

+Object path of the parent device of this VLAN device.

@@ -85,12 +92,13 @@ Parent readable o 
 VlanId  readable   u
-

The VLAN ID of this VLAN interface. +

+The VLAN ID of this VLAN interface.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vrf.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vrf.html index 76467075..88e848a0 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vrf.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vrf.html @@ -8,7 +8,7 @@ - + @@ -40,7 +40,10 @@

Description

-

+

+

+

+

Property Details

@@ -49,12 +52,13 @@ 
 Table  readable   u
-

The routing table of the VRF. +

+The routing table of the VRF.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html index 970228f2..9349aa4c 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html @@ -8,7 +8,7 @@ - + @@ -56,7 +56,10 @@

Description

-

+

+

+

+

Property Details

@@ -65,8 +68,9 @@ 
 Parent  readable   o
-

The object path of the parent device (if the VXLAN is not purely internal - to this host). +

+The object path of the parent device (if the VXLAN is not purely internal +to this host).

@@ -75,9 +79,10 @@ Parent readable o 
 HwAddress  readable   s
-

Hardware address of the device. +

+Hardware address of the device. n - DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -86,7 +91,8 @@ n 
 Id  readable   u
-

The VXLAN Network Identifier (VNI). +

+The VXLAN Network Identifier (VNI).

@@ -95,8 +101,9 @@ Id readable u 
 Group  readable   s
-

The IP (v4 or v6) multicast group used to communicate with other physical - hosts on this VXLAN. +

+The IP (v4 or v6) multicast group used to communicate with other physical +hosts on this VXLAN.

@@ -105,8 +112,9 @@ Group readable s 
 Local  readable   s
-

The local IPv4 or IPv6 address to use when sending VXLAN packets to other - physical hosts. +

+The local IPv4 or IPv6 address to use when sending VXLAN packets to other +physical hosts.

@@ -115,8 +123,9 @@ Local readable s 
 Tos  readable   y
-

The value to use in the IP ToS field for VXLAN packets sent to other - physical hosts. +

+The value to use in the IP ToS field for VXLAN packets sent to other +physical hosts.

@@ -125,8 +134,9 @@ Tos readable y 
 Ttl  readable   y
-

The value to use in the IP TTL field for VXLAN packets sent to other - physical hosts. +

+The value to use in the IP TTL field for VXLAN packets sent to other +physical hosts.

@@ -135,7 +145,8 @@ Ttl readable y 
 Learning  readable   b
-

True if the VXLAN dynamically learns remote IP addresses. +

+True if the VXLAN dynamically learns remote IP addresses.

@@ -144,7 +155,8 @@ Learning readable b 
 Ageing  readable   u
-

The interval in seconds at which the kernel purges stale cached addresses. +

+The interval in seconds at which the kernel purges stale cached addresses.

@@ -153,8 +165,9 @@ Ageing readable u 
 Limit  readable   u
-

The maximum number of entries that can be added to the VXLAN's forwarding - table. +

+The maximum number of entries that can be added to the VXLAN's forwarding +table.

@@ -163,7 +176,8 @@ Limit readable u 
 DstPort  readable   q
-

Destination port for outgoing VXLAN packets. +

+Destination port for outgoing VXLAN packets.

@@ -172,7 +186,8 @@ DstPort readable q 
 SrcPortMin  readable   q
-

The lowest source port number to use for outgoing VXLAN packets. +

+The lowest source port number to use for outgoing VXLAN packets.

@@ -181,7 +196,8 @@ SrcPortMin readable q 
 SrcPortMax  readable   q
-

The highest source port number to use for outgoing VXLAN packets. +

+The highest source port number to use for outgoing VXLAN packets.

@@ -190,7 +206,8 @@ SrcPortMax readable q 
 Proxy  readable   b
-

True if the VXLAN is implementing DOVE ARP proxying for remote clients. +

+True if the VXLAN is implementing DOVE ARP proxying for remote clients.

@@ -199,8 +216,9 @@ Proxy readable b 
 Rsc  readable   b
-

True if the VXLAN is implementing DOVE route short-circuiting of known - remote IP addresses. +

+True if the VXLAN is implementing DOVE route short-circuiting of known +remote IP addresses.

@@ -209,7 +227,8 @@ Rsc readable b 
 L2miss  readable   b
-

True if the VXLAN will emit netlink notifications of L2 switch misses. +

+True if the VXLAN will emit netlink notifications of L2 switch misses.

@@ -218,12 +237,13 @@ L2miss readable b 
 L3miss  readable   b
-

True if the VXLAN will emit netlink notifications of L3 switch misses. +

+True if the VXLAN will emit netlink notifications of L3 switch misses.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html index 25f2d66a..2ef395cf 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WifiP2P.html @@ -8,7 +8,7 @@ - + @@ -56,7 +56,10 @@

Description

-

+

+

+

+

Since 1.16

@@ -66,11 +69,14 @@ 
 StartFind (IN  a{sv} options);
-

Start a find operation for Wi-Fi P2P peers. +

+Start a find operation for Wi-Fi P2P peers. +

+

+The options argument accepts the following keys:

-

The options argument accepts the following keys: +

-

@@ -93,7 +99,9 @@ StartFind (IN a{sv} options); - +

IN a{sv} options:

Options of find.

+Options of find. +

Since 1.16

@@ -104,7 +112,8 @@ StartFind (IN a{sv} options); 
 StopFind ();
-

Stop an ongoing find operation again. +

+Stop an ongoing find operation again.

Since 1.16

@@ -116,7 +125,8 @@ StopFind (); 
 PeerAdded (o peer);
-

Emitted when a new Wi-Fi P2P peer is found by the device. +

+Emitted when a new Wi-Fi P2P peer is found by the device.

@@ -125,7 +135,9 @@ PeerAdded (o peer); - +

o peer:

The object path of the newly found access point.

+The object path of the newly found access point. +

Since 1.16

@@ -136,7 +148,8 @@ PeerAdded (o peer); 
 PeerRemoved (o peer);
-

Emitted when a Wi-Fi P2P peer disappears from view of the device. +

+Emitted when a Wi-Fi P2P peer disappears from view of the device.

@@ -145,7 +158,9 @@ PeerRemoved (o peer); - +

o peer:

The object path of the Wi-Fi P2P peer that has disappeared.

+The object path of the Wi-Fi P2P peer that has disappeared. +

Since 1.16

@@ -158,9 +173,11 @@ PeerRemoved (o peer); 
 HwAddress  readable   s
-

The active hardware address of the device. +

+The active hardware address of the device.

-

DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +

+DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

Since 1.16

@@ -170,13 +187,14 @@ HwAddress readable s 
 Peers  readable   ao
-

List of object paths of peers visible to this Wi-Fi P2P device. +

+List of object paths of peers visible to this Wi-Fi P2P device.

Since 1.16

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html index 6e56e2af..60ad16dc 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WireGuard.html @@ -8,7 +8,7 @@ - + @@ -42,7 +42,10 @@

Description

-

+

+

+

+

Property Details

@@ -51,7 +54,8 @@ 
 PublicKey  readable   ay
-

32-byte public WireGuard key. +

+32-byte public WireGuard key.

@@ -60,7 +64,8 @@ PublicKey readable ay 
 ListenPort  readable   q
-

Local UDP listening port. +

+Local UDP listening port.

@@ -69,13 +74,14 @@ ListenPort readable q 
 FwMark  readable   u
-

Optional 32-bit mark used to set routing policy for outgoing encrypted packets. - See: ip-rule(8) +

+Optional 32-bit mark used to set routing policy for outgoing encrypted packets. +See: ip-rule(8)

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html index 9a4cf88d..e62fe697 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html @@ -8,7 +8,7 @@ - + @@ -44,7 +44,10 @@

Description

-

+

+

+

+

Property Details

@@ -53,9 +56,11 @@ 
 HwAddress  readable   s
-

Active hardware address of the device. +

+Active hardware address of the device.

-

DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +

+DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -64,7 +69,8 @@ HwAddress readable s 
 PermHwAddress  readable   s
-

Permanent hardware address of the device. +

+Permanent hardware address of the device.

@@ -73,7 +79,8 @@ PermHwAddress readable s 
 Speed  readable   u
-

Design speed of the device, in megabits/second (Mb/s). +

+Design speed of the device, in megabits/second (Mb/s).

@@ -82,7 +89,8 @@ Speed readable u 
 S390Subchannels  readable   as
-

Array of S/390 subchannels for S/390 or z/Architecture devices. +

+Array of S/390 subchannels for S/390 or z/Architecture devices.

@@ -91,16 +99,18 @@ S390Subchannels readable as 
 Carrier  readable   b
-

Indicates whether the physical carrier is found (e.g. whether a cable is - plugged in or not). +

+Indicates whether the physical carrier is found (e.g. whether a cable is +plugged in or not).

-

DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" - property on the "org.freedesktop.NetworkManager.Device" interface. +

+DEPRECATED: check for the "carrier" flag in the "InterfaceFlags" +property on the "org.freedesktop.NetworkManager.Device" interface.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html index 7c6ab847..39d0305d 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html @@ -8,7 +8,7 @@ - + @@ -63,7 +63,10 @@

Description

-

+

+

+

+

Method Details

@@ -72,10 +75,11 @@ 
 GetAccessPoints (OUT ao access_points);
-

DEPRECATED. Get the list of access points visible to this device. Note - that this list does not include access points which hide their SSID. To - retrieve a list of all access points (including hidden ones) use the - GetAllAccessPoints() method. +

+DEPRECATED. Get the list of access points visible to this device. Note +that this list does not include access points which hide their SSID. To +retrieve a list of all access points (including hidden ones) use the +GetAllAccessPoints() method.

@@ -84,7 +88,9 @@ GetAccessPoints (OUT ao access_points); - +

OUT ao access_points:

List of access point object paths.

+List of access point object paths. +
@@ -94,8 +100,9 @@ GetAccessPoints (OUT ao access_points); 
 GetAllAccessPoints (OUT ao access_points);
-

Get the list of all access points visible to this device, including hidden - ones for which the SSID is not yet known. +

+Get the list of all access points visible to this device, including hidden +ones for which the SSID is not yet known.

@@ -104,7 +111,9 @@ GetAllAccessPoints (OUT ao access_points); - +

OUT ao access_points:

List of access point object paths.

+List of access point object paths. +
@@ -114,7 +123,8 @@ GetAllAccessPoints (OUT ao access_points); 
 RequestScan (IN  a{sv} options);
-

Request the device to scan. To know when the scan is finished, use the "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" to listen to changes to the "LastScan" property. +

+Request the device to scan. To know when the scan is finished, use the "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" to listen to changes to the "LastScan" property.

@@ -123,7 +133,9 @@ RequestScan (IN a{sv} options); - +

IN a{sv} options:

Options of scan. Currently, 'ssids' option with value of "aay" type is supported.

+Options of scan. Currently, 'ssids' option with value of "aay" type is supported. +
@@ -135,7 +147,8 @@ RequestScan (IN a{sv} options); 
 AccessPointAdded (o access_point);
-

Emitted when a new access point is found by the device. +

+Emitted when a new access point is found by the device.

@@ -144,7 +157,9 @@ AccessPointAdded (o access_point); - +

o access_point:

The object path of the newly found access point.

+The object path of the newly found access point. +
@@ -154,7 +169,8 @@ AccessPointAdded (o access_point); 
 AccessPointRemoved (o access_point);
-

Emitted when an access point disappears from view of the device. +

+Emitted when an access point disappears from view of the device.

@@ -163,7 +179,9 @@ AccessPointRemoved (o access_point); - +

o access_point:

The object path of the access point that has disappeared.

+The object path of the access point that has disappeared. +
@@ -175,9 +193,11 @@ AccessPointRemoved (o access_point); 
 HwAddress  readable   s
-

The active hardware address of the device. +

+The active hardware address of the device.

-

DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +

+DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

@@ -186,7 +206,8 @@ HwAddress readable s 
 PermHwAddress  readable   s
-

The permanent hardware address of the device. +

+The permanent hardware address of the device.

@@ -195,9 +216,11 @@ PermHwAddress readable s 
 Mode  readable   u
-

The operating mode of the wireless device. +

+The operating mode of the wireless device.

-

Returns: NM80211Mode +

+Returns: NM80211Mode

@@ -206,8 +229,9 @@ Mode readable u 
 Bitrate  readable   u
-

The bit rate currently used by the wireless device, in kilobits/second - (Kb/s). +

+The bit rate currently used by the wireless device, in kilobits/second +(Kb/s).

@@ -216,7 +240,8 @@ Bitrate readable u 
 AccessPoints  readable   ao
-

List of object paths of access point visible to this wireless device. +

+List of object paths of access point visible to this wireless device.

@@ -225,7 +250,8 @@ AccessPoints readable ao 
 ActiveAccessPoint  readable   o
-

Object path of the access point currently used by the wireless device. +

+Object path of the access point currently used by the wireless device.

@@ -234,9 +260,11 @@ ActiveAccessPoint readable o 
 WirelessCapabilities  readable   u
-

The capabilities of the wireless device. +

+The capabilities of the wireless device.

-

Returns: NMDeviceWifiCapabilities +

+Returns: NMDeviceWifiCapabilities

@@ -245,14 +273,15 @@ WirelessCapabilities readable u 
 LastScan  readable   x
-

The timestamp (in CLOCK_BOOTTIME milliseconds) for the last finished network scan. - A value of -1 means the device never scanned for access points. +

+The timestamp (in CLOCK_BOOTTIME milliseconds) for the last finished network scan. +A value of -1 means the device never scanned for access points.

Since 1.12

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html index 081007a3..4415fe36 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wpan.html @@ -8,7 +8,7 @@ - + @@ -40,7 +40,10 @@

Description

-

+

+

+

+

Property Details

@@ -49,14 +52,16 @@ 
 HwAddress  readable   s
-

The active hardware address of the device. +

+The active hardware address of the device.

-

DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0. +

+DEPRECATED. Use the "HwAddress" property in "org.freedesktop.NetworkManager.Device" instead which exists since version NetworkManager 1.24.0.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html index 3ef880a9..b1e492cb 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html @@ -8,7 +8,7 @@ - + @@ -93,7 +93,10 @@

Description

-

+

+

+

+

Method Details

@@ -104,26 +107,27 @@ Reapply (IN a{sa{sv}} connection, IN t version_id, IN u flags); -

Attempts to update the configuration of a device without deactivating it. - NetworkManager has the concept of connections, which are profiles that - contain the configuration for a networking device. Those connections are - exposed via D-Bus as individual objects that can be created, modified and - deleted. When activating such a settings-connection on a device, the - settings-connection is cloned to become an applied-connection and used to - configure the device (see GetAppliedConnection). Subsequent modification - of the settings-connection don't propagate automatically to the device's - applied-connection (with exception of the firewall-zone and the metered - property). For the changes to take effect, you can either re-activate the - settings-connection, or call Reapply. The Reapply call allows you to - directly update the applied-connection and reconfigure the device. Reapply - can also be useful if the currently applied-connection is equal to the - connection that is about to be reapplied. This allows to reconfigure the - device and revert external changes like removing or adding an IP address - (which NetworkManager doesn't revert automatically because it is assumed - that the user made these changes intentionally outside of NetworkManager). - Reapply can make the applied-connection different from the - settings-connection, just like updating the settings-connection can make - them different. +

+Attempts to update the configuration of a device without deactivating it. +NetworkManager has the concept of connections, which are profiles that +contain the configuration for a networking device. Those connections are +exposed via D-Bus as individual objects that can be created, modified and +deleted. When activating such a settings-connection on a device, the +settings-connection is cloned to become an applied-connection and used to +configure the device (see GetAppliedConnection). Subsequent modification +of the settings-connection don't propagate automatically to the device's +applied-connection (with exception of the firewall-zone and the metered +property). For the changes to take effect, you can either re-activate the +settings-connection, or call Reapply. The Reapply call allows you to +directly update the applied-connection and reconfigure the device. Reapply +can also be useful if the currently applied-connection is equal to the +connection that is about to be reapplied. This allows to reconfigure the +device and revert external changes like removing or adding an IP address +(which NetworkManager doesn't revert automatically because it is assumed +that the user made these changes intentionally outside of NetworkManager). +Reapply can make the applied-connection different from the +settings-connection, just like updating the settings-connection can make +them different.

@@ -133,15 +137,21 @@ Reapply (IN a{sa{sv}} connection, - + - + - +

IN a{sa{sv}} connection:

The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarily differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses.

+The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarily differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses. +

IN t version_id:

If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply.

+If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply. +

IN u flags:

Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0.

+Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0. +
@@ -154,13 +164,14 @@ GetAppliedConnection (IN u flags, OUT a{sa{sv}} connection, OUT t version_id); -

Get the currently applied connection on the device. This is a snapshot of - the last activated connection on the device, that is the configuration - that is currently applied on the device. Usually this is the same as - GetSettings of the referenced settings connection. However, it can differ - if the settings connection was subsequently modified or the applied - connection was modified by Reapply. The applied connection is set when - activating a device or when calling Reapply. +

+Get the currently applied connection on the device. This is a snapshot of +the last activated connection on the device, that is the configuration +that is currently applied on the device. Usually this is the same as +GetSettings of the referenced settings connection. However, it can differ +if the settings connection was subsequently modified or the applied +connection was modified by Reapply. The applied connection is set when +activating a device or when calling Reapply.

@@ -170,15 +181,21 @@ GetAppliedConnection (IN u flags, - + - + - +

IN u flags:

Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0.

+Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0. +

OUT a{sa{sv}} connection:

The effective connection settings that the connection has currently applied.

+The effective connection settings that the connection has currently applied. +

OUT t version_id:

The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail.

+The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail. +
@@ -189,8 +206,9 @@ GetAppliedConnection (IN u flags, 
 Disconnect ();
-

Disconnects a device and prevents the device from automatically activating - further connections without user intervention. +

+Disconnects a device and prevents the device from automatically activating +further connections without user intervention.

@@ -199,9 +217,10 @@ Disconnect (); 
 Delete ();
-

Deletes a software device from NetworkManager and removes the interface - from the system. The method returns an error when called for a hardware - device. +

+Deletes a software device from NetworkManager and removes the interface +from the system. The method returns an error when called for a hardware +device.

@@ -214,7 +233,10 @@ StateChanged (u new_state, u old_state, u reason); -

+

+

+

+

@@ -223,15 +245,21 @@ StateChanged (u new_state, - + - + - +

u new_state:

(NMDeviceState) The new state of the device.

+(NMDeviceState) The new state of the device. +

u old_state:

(NMDeviceState) The previous state of the device.

+(NMDeviceState) The previous state of the device. +

u reason:

(NMDeviceStateReason) A reason for the state transition.

+(NMDeviceStateReason) A reason for the state transition. +
@@ -244,20 +272,22 @@ StateChanged (u new_state, 
 Udi  readable   s
-

Operating-system specific transient device hardware identifier. This is an - opaque string representing the underlying hardware for the device, and - shouldn't be used to keep track of individual devices. For some device - types (Bluetooth, Modems) it is an identifier used by the hardware service - (ie bluez or ModemManager) to refer to that device, and client programs - use it get additional information from those services which NM does not - provide. The Udi is not guaranteed to be consistent across reboots or - hotplugs of the hardware. If you're looking for a way to uniquely track - each device in your application, use the object path. If you're looking - for a way to track a specific piece of hardware across reboot or hotplug, - use a MAC address or USB serial number. +

+Operating-system specific transient device hardware identifier. This is an +opaque string representing the underlying hardware for the device, and +shouldn't be used to keep track of individual devices. For some device +types (Bluetooth, Modems) it is an identifier used by the hardware service +(ie bluez or ModemManager) to refer to that device, and client programs +use it get additional information from those services which NM does not +provide. The Udi is not guaranteed to be consistent across reboots or +hotplugs of the hardware. If you're looking for a way to uniquely track +each device in your application, use the object path. If you're looking +for a way to track a specific piece of hardware across reboot or hotplug, +use a MAC address or USB serial number.

-

Note that non-UTF-8 characters are backslash escaped. Use g_strcompress() - to obtain the true (non-UTF-8) string. +

+Note that non-UTF-8 characters are backslash escaped. Use g_strcompress() +to obtain the true (non-UTF-8) string.

@@ -266,10 +296,12 @@ Udi readable s 
 Path  readable   s
-

The path of the device as exposed by the udev property ID_PATH. +

+The path of the device as exposed by the udev property ID_PATH.

-

Note that non-UTF-8 characters are backslash escaped. Use g_strcompress() - to obtain the true (non-UTF-8) string. +

+Note that non-UTF-8 characters are backslash escaped. Use g_strcompress() +to obtain the true (non-UTF-8) string.

@@ -278,10 +310,11 @@ Path readable s 
 Interface  readable   s
-

The name of the device's control (and often data) interface. - Note that non UTF-8 characters are backslash escaped, so the - resulting name may be longer then 15 characters. Use g_strcompress() - to revert the escaping. +

+The name of the device's control (and often data) interface. +Note that non UTF-8 characters are backslash escaped, so the +resulting name may be longer then 15 characters. Use g_strcompress() +to revert the escaping.

@@ -290,13 +323,14 @@ Interface readable s 
 IpInterface  readable   s
-

The name of the device's data interface when available. This property may - not refer to the actual data interface until the device has successfully - established a data connection, indicated by the device's State becoming - ACTIVATED. - Note that non UTF-8 characters are backslash escaped, so the - resulting name may be longer then 15 characters. Use g_strcompress() - to revert the escaping. +

+The name of the device's data interface when available. This property may +not refer to the actual data interface until the device has successfully +established a data connection, indicated by the device's State becoming +ACTIVATED. +Note that non UTF-8 characters are backslash escaped, so the +resulting name may be longer then 15 characters. Use g_strcompress() +to revert the escaping.

@@ -305,9 +339,10 @@ IpInterface readable s 
 Driver  readable   s
-

The driver handling the device. - Non-UTF-8 sequences are backslash escaped. Use g_strcompress() - to revert. +

+The driver handling the device. +Non-UTF-8 sequences are backslash escaped. Use g_strcompress() +to revert.

@@ -316,9 +351,10 @@ Driver readable s 
 DriverVersion  readable   s
-

The version of the driver handling the device. - Non-UTF-8 sequences are backslash escaped. Use g_strcompress() - to revert. +

+The version of the driver handling the device. +Non-UTF-8 sequences are backslash escaped. Use g_strcompress() +to revert.

@@ -327,9 +363,10 @@ DriverVersion readable s 
 FirmwareVersion  readable   s
-

The firmware version for the device. - Non-UTF-8 sequences are backslash escaped. Use g_strcompress() - to revert. +

+The firmware version for the device. +Non-UTF-8 sequences are backslash escaped. Use g_strcompress() +to revert.

@@ -338,9 +375,11 @@ FirmwareVersion readable s 
 Capabilities  readable   u
-

Flags describing the capabilities of the device. +

+Flags describing the capabilities of the device.

-

Returns: NMDeviceCapabilities +

+Returns: NMDeviceCapabilities

@@ -349,8 +388,9 @@ Capabilities readable u 
 Ip4Address  readable   u
-

DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object - instead. This property always returns 0.0.0.0 (numeric 0) as address. +

+DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object +instead. This property always returns 0.0.0.0 (numeric 0) as address.

@@ -359,9 +399,11 @@ Ip4Address readable u 
 State  readable   u
-

The current state of the device. +

+The current state of the device.

-

Returns: NMDeviceState +

+Returns: NMDeviceState

@@ -370,9 +412,11 @@ State readable u 
 StateReason  readable   (uu)
-

The current state and reason for changing to that state. +

+The current state and reason for changing to that state.

-

Returns: A tuple of NMDeviceState and NMDeviceStateReason. +

+Returns: A tuple of NMDeviceState and NMDeviceStateReason.

@@ -381,10 +425,11 @@ StateReason readable (uu) 
 ActiveConnection  readable   o
-

Object path of an ActiveConnection object that "owns" this device during - activation. The ActiveConnection object tracks the life-cycle of a - connection to a specific network and implements the - org.freedesktop.NetworkManager.Connection.Active D-Bus interface. +

+Object path of an ActiveConnection object that "owns" this device during +activation. The ActiveConnection object tracks the life-cycle of a +connection to a specific network and implements the +org.freedesktop.NetworkManager.Connection.Active D-Bus interface.

@@ -393,9 +438,10 @@ ActiveConnection readable o 
 Ip4Config  readable   o
-

Object path of the Ip4Config object describing the configuration of the - device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED - state. +

+Object path of the Ip4Config object describing the configuration of the +device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED +state.

@@ -404,9 +450,10 @@ Ip4Config readable o 
 Dhcp4Config  readable   o
-

Object path of the Dhcp4Config object describing the DHCP options returned - by the DHCP server. Only valid when the device is in the - NM_DEVICE_STATE_ACTIVATED state. +

+Object path of the Dhcp4Config object describing the DHCP options returned +by the DHCP server. Only valid when the device is in the +NM_DEVICE_STATE_ACTIVATED state.

@@ -415,9 +462,10 @@ Dhcp4Config readable o 
 Ip6Config  readable   o
-

Object path of the Ip6Config object describing the configuration of the - device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED - state. +

+Object path of the Ip6Config object describing the configuration of the +device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED +state.

@@ -426,9 +474,10 @@ Ip6Config readable o 
 Dhcp6Config  readable   o
-

Object path of the Dhcp6Config object describing the DHCP options returned - by the DHCP server. Only valid when the device is in the - NM_DEVICE_STATE_ACTIVATED state. +

+Object path of the Dhcp6Config object describing the DHCP options returned +by the DHCP server. Only valid when the device is in the +NM_DEVICE_STATE_ACTIVATED state.

@@ -437,10 +486,11 @@ Dhcp6Config readable o 
 Managed  readwrite  b
-

Whether or not this device is managed by NetworkManager. Setting this - property has a similar effect to configuring the device as unmanaged via - the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to - this value are not persistent and lost after NetworkManager restart. +

+Whether or not this device is managed by NetworkManager. Setting this +property has a similar effect to configuring the device as unmanaged via +the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to +this value are not persistent and lost after NetworkManager restart.

@@ -449,11 +499,12 @@ Managed readwrite b 
 Autoconnect  readwrite  b
-

If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual - intervention is required before the device will automatically connect to a - known network, such as activating a connection using the device, or - setting this property to TRUE. This property cannot be set to TRUE for - default-unmanaged devices, since they never autoconnect. +

+If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual +intervention is required before the device will automatically connect to a +known network, such as activating a connection using the device, or +setting this property to TRUE. This property cannot be set to TRUE for +default-unmanaged devices, since they never autoconnect.

@@ -462,8 +513,9 @@ Autoconnect readwrite b 
 FirmwareMissing  readable   b
-

If TRUE, indicates the device is likely missing firmware necessary for its - operation. +

+If TRUE, indicates the device is likely missing firmware necessary for its +operation.

@@ -472,8 +524,9 @@ FirmwareMissing readable b 
 NmPluginMissing  readable   b
-

If TRUE, indicates the NetworkManager plugin for the device is likely - missing or misconfigured. +

+If TRUE, indicates the NetworkManager plugin for the device is likely +missing or misconfigured.

@@ -482,9 +535,11 @@ NmPluginMissing readable b 
 DeviceType  readable   u
-

The general type of the network device; ie Ethernet, Wi-Fi, etc. +

+The general type of the network device; ie Ethernet, Wi-Fi, etc.

-

Returns: NMDeviceType +

+Returns: NMDeviceType

@@ -493,8 +548,9 @@ DeviceType readable u 
 AvailableConnections  readable   ao
-

An array of object paths of every configured connection that is currently - 'available' through this device. +

+An array of object paths of every configured connection that is currently +'available' through this device.

@@ -503,10 +559,11 @@ AvailableConnections readable ao 
 PhysicalPortId  readable   s
-

If non-empty, an (opaque) indicator of the physical network port - associated with the device. This can be used to recognize when two - seemingly-separate hardware devices are actually just different virtual - interfaces to the same physical port. +

+If non-empty, an (opaque) indicator of the physical network port +associated with the device. This can be used to recognize when two +seemingly-separate hardware devices are actually just different virtual +interfaces to the same physical port.

@@ -515,7 +572,8 @@ PhysicalPortId readable s 
 Mtu  readable   u
-

The device MTU (maximum transmission unit). +

+The device MTU (maximum transmission unit).

@@ -524,10 +582,12 @@ Mtu readable u 
 Metered  readable   u
-

Whether the amount of traffic flowing through the device is subject to - limitations, for example set by service providers. +

+Whether the amount of traffic flowing through the device is subject to +limitations, for example set by service providers.

-

Returns: NMMetered +

+Returns: NMMetered

@@ -536,8 +596,9 @@ Metered readable u 
 LldpNeighbors  readable   aa{sv}
-

Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV - names to variant boxed values. +

+Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV +names to variant boxed values.

@@ -546,9 +607,10 @@ LldpNeighbors readable aa{sv} 
 Real  readable   b
-

True if the device exists, or False for placeholder devices that do not - yet exist but could be automatically created by NetworkManager if one of - their AvailableConnections was activated. +

+True if the device exists, or False for placeholder devices that do not +yet exist but could be automatically created by NetworkManager if one of +their AvailableConnections was activated.

@@ -557,9 +619,11 @@ Real readable b 
 Ip4Connectivity  readable   u
-

The result of the last IPv4 connectivity check. +

+The result of the last IPv4 connectivity check.

-

Returns: NMConnectivityState +

+Returns: NMConnectivityState

Since 1.16

@@ -569,9 +633,11 @@ Ip4Connectivity readable u 
 Ip6Connectivity  readable   u
-

The result of the last IPv6 connectivity check. +

+The result of the last IPv6 connectivity check.

-

Returns: NMConnectivityState +

+Returns: NMConnectivityState

Since 1.16

@@ -581,9 +647,10 @@ Ip6Connectivity readable u 
 InterfaceFlags  readable   u
-

The flags of the network interface. See - NMDeviceInterfaceFlags for - the currently defined flags. +

+The flags of the network interface. See +NMDeviceInterfaceFlags for +the currently defined flags.

Since 1.22

@@ -593,9 +660,11 @@ InterfaceFlags readable u 
 HwAddress  readable   s
-

The hardware address of the device. +

+The hardware address of the device.

-

This replaces the other 'HwAddress' properties on the device-specific D-Bus interfaces. +

+This replaces the other 'HwAddress' properties on the device-specific D-Bus interfaces.

Since 1.24

@@ -605,17 +674,19 @@ HwAddress readable s 
 Ports  readable   ao
-

The port devices of the controller device. +

+The port devices of the controller device.

-

Array of object paths representing devices which are currently set as - port of this device. This replaces the 'Slaves' properties on the - device-specific D-Bus interfaces. +

+Array of object paths representing devices which are currently set as +port of this device. This replaces the 'Slaves' properties on the +device-specific D-Bus interfaces.

Since 1.34

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html index 4741a7e5..143da2a4 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html @@ -8,7 +8,7 @@ - + @@ -42,7 +42,8 @@

Description

-

The interface contains DNS-related information. +

+The interface contains DNS-related information.

@@ -52,7 +53,8 @@ 
 Mode  readable   s
-

The current DNS processing mode. +

+The current DNS processing mode.

@@ -61,7 +63,8 @@ Mode readable s 
 RcManager  readable   s
-

The current resolv.conf management mode. +

+The current resolv.conf management mode.

@@ -70,18 +73,19 @@ RcManager readable s 
 Configuration  readable   aa{sv}
-

The current DNS configuration represented as an array of - dictionaries. Each dictionary has the "nameservers", - "priority" keys and, optionally, "interface" and "vpn". - "nameservers" is the list of DNS servers, "priority" their - relative priority, "interface" the interface on which these - servers are contacted, "vpn" a boolean telling whether the - configuration was obtained from a VPN connection. +

+The current DNS configuration represented as an array of +dictionaries. Each dictionary has the "nameservers", +"priority" keys and, optionally, "interface" and "vpn". +"nameservers" is the list of DNS servers, "priority" their +relative priority, "interface" the interface on which these +servers are contacted, "vpn" a boolean telling whether the +configuration was obtained from a VPN connection.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html index 6906af35..ef2a7e63 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html @@ -8,7 +8,7 @@ - + @@ -52,7 +52,10 @@

Description

-

+

+

+

+

Property Details

@@ -61,9 +64,10 @@ 
 Addresses  readable   aau
-

Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each - array are in network byte order. Essentially: [(addr, prefix, gateway), - (addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway +

+Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each +array are in network byte order. Essentially: [(addr, prefix, gateway), +(addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway

@@ -72,9 +76,10 @@ Addresses readable aau 
 AddressData  readable   aa{sv}
-

Array of IP address data objects. All addresses will include "address" (an - IP address string), and "prefix" (a uint). Some addresses may include - additional attributes. +

+Array of IP address data objects. All addresses will include "address" (an +IP address string), and "prefix" (a uint). Some addresses may include +additional attributes.

@@ -83,7 +88,8 @@ AddressData readable aa{sv} 
 Gateway  readable   s
-

The gateway in use. +

+The gateway in use.

@@ -92,11 +98,12 @@ Gateway readable s 
 Routes  readable   aau
-

Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple - are in network byte order. 'route' and 'next hop' are IPv4 addresses, - while prefix and metric are simple unsigned integers. Essentially: - [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), - ...] Deprecated: use RouteData +

+Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple +are in network byte order. 'route' and 'next hop' are IPv4 addresses, +while prefix and metric are simple unsigned integers. Essentially: +[(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), +...] Deprecated: use RouteData

@@ -105,9 +112,10 @@ Routes readable aau 
 RouteData  readable   aa{sv}
-

Array of IP route data objects. All routes will include "dest" (an IP - address string) and "prefix" (a uint). Some routes may include "next-hop" - (an IP address string), "metric" (a uint), and additional attributes. +

+Array of IP route data objects. All routes will include "dest" (an IP +address string) and "prefix" (a uint). Some routes may include "next-hop" +(an IP address string), "metric" (a uint), and additional attributes.

@@ -116,7 +124,8 @@ RouteData readable aa{sv} 
 Nameservers  readable   au
-

The nameservers in use. Deprecated: use NameserverData +

+The nameservers in use. Deprecated: use NameserverData

@@ -125,8 +134,9 @@ Nameservers readable au 
 NameserverData  readable   aa{sv}
-

The nameservers in use. Currently, only the value "address" - is recognized (with an IP address string). +

+The nameservers in use. Currently, only the value "address" +is recognized (with an IP address string).

Since 1.14

@@ -136,7 +146,8 @@ NameserverData readable aa{sv} 
 Domains  readable   as
-

A list of domains this address belongs to. +

+A list of domains this address belongs to.

@@ -145,7 +156,8 @@ Domains readable as 
 Searches  readable   as
-

A list of dns searches. +

+A list of dns searches.

@@ -154,8 +166,9 @@ Searches readable as 
 DnsOptions  readable   as
-

A list of DNS options that modify the behavior of the DNS resolver. See - resolv.conf(5) manual page for the list of supported options. +

+A list of DNS options that modify the behavior of the DNS resolver. See +resolv.conf(5) manual page for the list of supported options.

@@ -164,7 +177,8 @@ DnsOptions readable as 
 DnsPriority  readable   i
-

The relative priority of DNS servers. +

+The relative priority of DNS servers.

@@ -173,8 +187,9 @@ DnsPriority readable i 
 WinsServers  readable   au
-

The Windows Internet Name Service servers associated with the connection. - Each address is in network byte order. Deprecated: use WinsServerData +

+The Windows Internet Name Service servers associated with the connection. +Each address is in network byte order. Deprecated: use WinsServerData

@@ -183,13 +198,14 @@ WinsServers readable au 
 WinsServerData  readable   as
-

The Windows Internet Name Service servers associated with the connection. +

+The Windows Internet Name Service servers associated with the connection.

Since 1.14

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html index 3336e0c0..7b5e167e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html @@ -8,7 +8,7 @@ - + @@ -49,7 +49,10 @@

Description

-

+

+

+

+

Property Details

@@ -58,8 +61,9 @@ 
 Addresses  readable   a(ayuay)
-

Array of tuples of IPv6 address/prefix/gateway. Deprecated: use - AddressData and Gateway. +

+Array of tuples of IPv6 address/prefix/gateway. Deprecated: use +AddressData and Gateway.

@@ -68,9 +72,10 @@ Addresses readable a(ayuay) 
 AddressData  readable   aa{sv}
-

Array of IP address data objects. All addresses will include "address" (an - IP address string), and "prefix" (a uint). Some addresses may include - additional attributes. +

+Array of IP address data objects. All addresses will include "address" (an +IP address string), and "prefix" (a uint). Some addresses may include +additional attributes.

@@ -79,7 +84,8 @@ AddressData readable aa{sv} 
 Gateway  readable   s
-

The gateway in use. +

+The gateway in use.

@@ -88,7 +94,8 @@ Gateway readable s 
 Routes  readable   a(ayuayu)
-

Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData +

+Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData

@@ -97,9 +104,10 @@ Routes readable a(ayuayu) 
 RouteData  readable   aa{sv}
-

Array of IP route data objects. All routes will include "dest" (an IP - address string) and "prefix" (a uint). Some routes may include "next-hop" - (an IP address string), "metric" (a uint), and additional attributes. +

+Array of IP route data objects. All routes will include "dest" (an IP +address string) and "prefix" (a uint). Some routes may include "next-hop" +(an IP address string), "metric" (a uint), and additional attributes.

@@ -108,7 +116,8 @@ RouteData readable aa{sv} 
 Nameservers  readable   aay
-

The nameservers in use. +

+The nameservers in use.

@@ -117,7 +126,8 @@ Nameservers readable aay 
 Domains  readable   as
-

A list of domains this address belongs to. +

+A list of domains this address belongs to.

@@ -126,7 +136,8 @@ Domains readable as 
 Searches  readable   as
-

A list of dns searches. +

+A list of dns searches.

@@ -135,8 +146,9 @@ Searches readable as 
 DnsOptions  readable   as
-

A list of DNS options that modify the behavior of the DNS resolver. See - resolv.conf(5) manual page for the list of supported options. +

+A list of DNS options that modify the behavior of the DNS resolver. See +resolv.conf(5) manual page for the list of supported options.

@@ -145,12 +157,13 @@ DnsOptions readable as 
 DnsPriority  readable   i
-

The relative priority of DNS servers. +

+The relative priority of DNS servers.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html index 1a357e2c..7d107f22 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html @@ -8,7 +8,7 @@ - + @@ -44,7 +44,10 @@

Description

-

+

+

+

+

Method Details

@@ -54,7 +57,10 @@ NeedSecrets (OUT s username, OUT s password); -

+

+

+

+

@@ -63,11 +69,21 @@ NeedSecrets (OUT s username, - + - +

OUT s username:

 +

+

+

+

+

OUT s password:

 +

+

+

+

+
@@ -78,7 +94,10 @@ NeedSecrets (OUT s username, 
 SetIp4Config (IN  a{sv} config);
-

+

+

+

+

@@ -86,7 +105,12 @@ SetIp4Config (IN a{sv} config); - +

IN a{sv} config:

 +

+

+

+

+
@@ -96,7 +120,10 @@ SetIp4Config (IN a{sv} config); 
 SetIp6Config (IN  a{sv} config);
-

+

+

+

+

@@ -104,7 +131,12 @@ SetIp6Config (IN a{sv} config); - +

IN a{sv} config:

 +

+

+

+

+
@@ -114,7 +146,10 @@ SetIp6Config (IN a{sv} config); 
 SetState (IN  u state);
-

+

+

+

+

@@ -122,7 +157,12 @@ SetState (IN u state); - +

IN u state:

 +

+

+

+

+
@@ -132,7 +172,10 @@ SetState (IN u state); 
 SetIfindex (IN  i ifindex);
-

+

+

+

+

@@ -140,13 +183,18 @@ SetIfindex (IN i ifindex); - +

IN i ifindex:

 +

+

+

+

+
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html index b9331beb..ae728497 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html @@ -8,7 +8,7 @@ - + @@ -50,15 +50,16 @@

Description

-

Private D-Bus interface used by secret agents that store and provide - secrets to NetworkManager. If an agent provides secrets to NetworkManager - as part of connection creation, and the some of those secrets are "agent - owned" the agent should store those secrets itself and should not expect - its SaveSecrets() method to be called. SaveSecrets() will be called eg if - some program other than the agent itself (like a connection editor) - changes the secrets out of band. The agent should implement this D-Bus - interface on an object with the path - /org/freedesktop/NetworkManager/SecretAgent. +

+Private D-Bus interface used by secret agents that store and provide +secrets to NetworkManager. If an agent provides secrets to NetworkManager +as part of connection creation, and the some of those secrets are "agent +owned" the agent should store those secrets itself and should not expect +its SaveSecrets() method to be called. SaveSecrets() will be called eg if +some program other than the agent itself (like a connection editor) +changes the secrets out of band. The agent should implement this D-Bus +interface on an object with the path +/org/freedesktop/NetworkManager/SecretAgent.

@@ -73,13 +74,14 @@ GetSecrets (IN a{sa{sv}} connection, IN u flags, OUT a{sa{sv}} secrets); -

Retrieve and return stored secrets, if any, or request new secrets from - the agent's user. If user interaction is allowed and the user enters new - secrets, the agent is expected to save the new secrets to persistent - storage (if the secret's flags include AGENT_OWNED) as NetworkManager will - not send these secrets back to the same agent via a SaveSecrets() call. If - the user canceled any interaction, the agent should return the - UserCanceled error (see below). +

+Retrieve and return stored secrets, if any, or request new secrets from +the agent's user. If user interaction is allowed and the user enters new +secrets, the agent is expected to save the new secrets to persistent +storage (if the secret's flags include AGENT_OWNED) as NetworkManager will +not send these secrets back to the same agent via a SaveSecrets() call. If +the user canceled any interaction, the agent should return the +UserCanceled error (see below).

@@ -89,27 +91,39 @@ GetSecrets (IN a{sa{sv}} connection, - + - + - + - + - + - +

IN a{sa{sv}} connection:

Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction.

+Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction. +

IN o connection_path:

Object path of the connection for which secrets are being requested.

+Object path of the connection for which secrets are being requested. +

IN s setting_name:

Setting name for which secrets are being requested.

+Setting name for which secrets are being requested. +

IN as hints:

Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:".

+Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:". +

IN u flags:

(NMSecretAgentGetSecretsFlags) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.

+(NMSecretAgentGetSecretsFlags) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user. +

OUT a{sa{sv}} secrets:

Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets.

+Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets. +
@@ -121,9 +135,10 @@ GetSecrets (IN a{sa{sv}} connection, CancelGetSecrets (IN o connection_path, IN s setting_name); -

Cancel a pending GetSecrets request for secrets of the given connection. - Any GetSecrets request with the same 'connection_path' and 'setting_name' - that are given in a CancelGetSecrets request should be canceled. +

+Cancel a pending GetSecrets request for secrets of the given connection. +Any GetSecrets request with the same 'connection_path' and 'setting_name' +that are given in a CancelGetSecrets request should be canceled.

@@ -133,11 +148,15 @@ CancelGetSecrets (IN o connection_path, - + - +

IN o connection_path:

Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled.

+Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled. +

IN s setting_name:

Setting name for which secrets for this connection were originally being requested.

+Setting name for which secrets for this connection were originally being requested. +
@@ -149,7 +168,8 @@ CancelGetSecrets (IN o connection_path, SaveSecrets (IN a{sa{sv}} connection, IN o connection_path); -

Save given secrets to backing storage. +

+Save given secrets to backing storage.

@@ -159,11 +179,15 @@ SaveSecrets (IN a{sa{sv}} connection, - + - +

IN a{sa{sv}} connection:

Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already.

+Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already. +

IN o connection_path:

Object path of the connection for which the agent should save secrets to backing storage.

+Object path of the connection for which the agent should save secrets to backing storage. +
@@ -175,7 +199,8 @@ SaveSecrets (IN a{sa{sv}} connection, DeleteSecrets (IN a{sa{sv}} connection, IN o connection_path); -

Delete secrets from backing storage. +

+Delete secrets from backing storage.

@@ -185,11 +210,15 @@ DeleteSecrets (IN a{sa{sv}} connection, - + - +

IN a{sa{sv}} connection:

Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage.

+Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage. +

IN o connection_path:

Object path of the connection for which the agent should delete secrets from backing storage.

+Object path of the connection for which the agent should delete secrets from backing storage. +
@@ -197,6 +226,6 @@ DeleteSecrets (IN a{sa{sv}} connection,
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html index 0c4467cb..d0b2322f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html @@ -8,7 +8,7 @@ - + @@ -67,7 +67,8 @@

Description

-

Represents a single network connection configuration. +

+Represents a single network connection configuration.

@@ -77,11 +78,12 @@ 
 Update (IN  a{sa{sv}} properties);
-

Update the connection with new settings and properties (replacing all - previous settings and properties) and save the connection to disk. Secrets - may be part of the update request, and will be either stored in persistent - storage or sent to a Secret Agent for storage, depending on the flags - associated with each secret. +

+Update the connection with new settings and properties (replacing all +previous settings and properties) and save the connection to disk. Secrets +may be part of the update request, and will be either stored in persistent +storage or sent to a Secret Agent for storage, depending on the flags +associated with each secret.

@@ -90,7 +92,9 @@ Update (IN a{sa{sv}} properties); - +

IN a{sa{sv}} properties:

New connection settings, properties, and (optionally) secrets.

+New connection settings, properties, and (optionally) secrets. +
@@ -100,14 +104,15 @@ Update (IN a{sa{sv}} properties); 
 UpdateUnsaved (IN  a{sa{sv}} properties);
-

Update the connection with new settings and properties (replacing all - previous settings and properties) but do not immediately save the - connection to disk. Secrets may be part of the update request and may sent - to a Secret Agent for storage, depending on the flags associated with each - secret. Use the 'Save' method to save these changes to disk. Note that - unsaved changes will be lost if the connection is reloaded from disk - (either automatically on file change or due to an explicit - ReloadConnections call). +

+Update the connection with new settings and properties (replacing all +previous settings and properties) but do not immediately save the +connection to disk. Secrets may be part of the update request and may sent +to a Secret Agent for storage, depending on the flags associated with each +secret. Use the 'Save' method to save these changes to disk. Note that +unsaved changes will be lost if the connection is reloaded from disk +(either automatically on file change or due to an explicit +ReloadConnections call).

@@ -116,7 +121,9 @@ UpdateUnsaved (IN a{sa{sv}} properties); - +

IN a{sa{sv}} properties:

New connection settings, properties, and (optionally) secrets.

+New connection settings, properties, and (optionally) secrets. +
@@ -126,7 +133,8 @@ UpdateUnsaved (IN a{sa{sv}} properties); 
 Delete ();
-

Delete the connection. +

+Delete the connection.

@@ -135,10 +143,11 @@ Delete (); 
 GetSettings (OUT a{sa{sv}} settings);
-

Get the settings maps describing this network configuration. This will - never include any secrets required for connection to the network, as those - are often protected. Secrets must be requested separately using the - GetSecrets() call. +

+Get the settings maps describing this network configuration. This will +never include any secrets required for connection to the network, as those +are often protected. Secrets must be requested separately using the +GetSecrets() call.

@@ -147,7 +156,9 @@ GetSettings (OUT a{sa{sv}} settings); - +

OUT a{sa{sv}} settings:

The nested settings maps describing this object.

+The nested settings maps describing this object. +
@@ -158,10 +169,11 @@ GetSettings (OUT a{sa{sv}} settings); GetSecrets (IN s setting_name, OUT a{sa{sv}} secrets); -

Get the secrets belonging to this network configuration. Only secrets from - persistent storage or a Secret Agent running in the requestor's session - will be returned. The user will never be prompted for secrets as a result - of this request. +

+Get the secrets belonging to this network configuration. Only secrets from +persistent storage or a Secret Agent running in the requestor's session +will be returned. The user will never be prompted for secrets as a result +of this request.

@@ -171,11 +183,15 @@ GetSecrets (IN s setting_name, - + - +

IN s setting_name:

Name of the setting to return secrets for. If empty, all secrets will be returned.

+Name of the setting to return secrets for. If empty, all secrets will be returned. +

OUT a{sa{sv}} secrets:

Nested settings maps containing secrets.

+Nested settings maps containing secrets. +
@@ -186,7 +202,8 @@ GetSecrets (IN s setting_name, 
 ClearSecrets ();
-

Clear the secrets belonging to this network connection profile. +

+Clear the secrets belonging to this network connection profile.

@@ -195,8 +212,9 @@ ClearSecrets (); 
 Save ();
-

Saves a "dirty" connection (that had previously been updated with - UpdateUnsaved) to persistent storage. +

+Saves a "dirty" connection (that had previously been updated with +UpdateUnsaved) to persistent storage.

@@ -208,19 +226,23 @@ Update2 (IN a{sa{sv}} settings, IN a{sv} args, OUT a{sv} result); -

Update the connection with new settings and properties (replacing all - previous settings and properties). +

+Update the connection with new settings and properties (replacing all +previous settings and properties).

-

Update2 is an alternative to - Update, - UpdateUnsaved - and Save - extensible with extra flags and args arguments. +

+Update2 is an alternative to +Update, +UpdateUnsaved +and Save +extensible with extra flags and args arguments.

-

The flags argument accepts the combination of following values, - logically or-ed together: +

+The flags argument accepts the combination of following values, +logically or-ed together: +

+

-

@@ -234,18 +256,18 @@ Update2 (IN a{sa{sv}} settings, +profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory +only, if the connection is already in memory only.

+the profile from disk to in-memory.

+the profile from disk to in-memory.

@@ -258,15 +280,17 @@ Update2 (IN a{sa{sv}} settings, +to take effect on currently active devices.

0x2 (in-memory):

The change is only made in memory (without touching an eventual - profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory - only, if the connection is already in memory only.

0x4 (in-memory-detached):

Like "in-memory", but behaves slightly different when migrating - the profile from disk to in-memory.

0x8 (in-memory-only):

Like "in-memory", but behaves slightly different when migrating - the profile from disk to in-memory.

0x10 (volatile):

0x40 (no-reapply):

Prevents "connection.zone" and "connection.metered" properties - to take effect on currently active devices.

-

The args argument accepts the following keys: +

+The args argument accepts the following keys: +

+

-

@@ -276,16 +300,17 @@ Update2 (IN a{sa{sv}} settings,

plugin:

The settings plugin the connection will be migrated to - such as "keyfile" or "ifcfg-rh".

+such as "keyfile" or "ifcfg-rh".

Since 1.38

-

Secrets may be part of the update request, and will be either stored in persistent - storage or sent to a Secret Agent for storage, depending on the flags - associated with each secret. +

+Secrets may be part of the update request, and will be either stored in persistent +storage or sent to a Secret Agent for storage, depending on the flags +associated with each secret.

@@ -295,19 +320,27 @@ Update2 (IN a{sa{sv}} settings, - + - + - + - +

IN a{sa{sv}} settings:

New connection settings, properties, and (optionally) secrets. Provide an empty array to use the current settings.

+New connection settings, properties, and (optionally) secrets. Provide an empty array to use the current settings. +

IN u flags:

Optional flags. Unknown flags cause the call to fail.

+Optional flags. Unknown flags cause the call to fail. +

IN a{sv} args:

Optional arguments dictionary, for extentibility. Specifying unknown keys causes the call to fail.

+Optional arguments dictionary, for extentibility. Specifying unknown keys causes the call to fail. +

OUT a{sv} result:

Currently no results are returned.

+Currently no results are returned. +
@@ -321,10 +354,11 @@ Update2 (IN a{sa{sv}} settings, 
 Updated ();
-

Emitted when any settings or permissions change. When handling this - signal, clients should re-read the connection using the GetSettings method - to get the changes and to ensure the client still has permission to access - the connection. +

+Emitted when any settings or permissions change. When handling this +signal, clients should re-read the connection using the GetSettings method +to get the changes and to ensure the client still has permission to access +the connection.

@@ -333,10 +367,11 @@ Updated (); 
 Removed ();
-

Emitted when this connection is no longer available. This happens when the - connection is deleted or if it is no longer accessible by any of the - system's logged-in users. After receipt of this signal, the object no - longer exists. Also see the Settings.ConnectionRemoved signal. +

+Emitted when this connection is no longer available. This happens when the +connection is deleted or if it is no longer accessible by any of the +system's logged-in users. After receipt of this signal, the object no +longer exists. Also see the Settings.ConnectionRemoved signal.

@@ -347,10 +382,11 @@ Removed (); 
 Unsaved  readable   b
-

If set, indicates that the in-memory state of the connection does not - match the on-disk state. This flag will be set when UpdateUnsaved() is - called or when any connection details change, and cleared when the - connection is saved to disk via Save() or from internal operations. +

+If set, indicates that the in-memory state of the connection does not +match the on-disk state. This flag will be set when UpdateUnsaved() is +called or when any connection details change, and cleared when the +connection is saved to disk via Save() or from internal operations.

@@ -359,9 +395,11 @@ Unsaved readable b 
 Flags  readable   u
-

Additional flags of the connection profile. +

+Additional flags of the connection profile.

-

Returns: NMSettingsConnectionFlags +

+Returns: NMSettingsConnectionFlags

Since 1.12

@@ -371,13 +409,14 @@ Flags readable u 
 Filename  readable   s
-

File that stores the connection in case the connection is file-backed. +

+File that stores the connection in case the connection is file-backed.

Since 1.12

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html index 1d4adbea..7efdc770 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html @@ -8,7 +8,7 @@ - + @@ -72,8 +72,9 @@

Description

-

The Settings interface allows clients to view and administrate the - connections stored and used by NetworkManager. +

+The Settings interface allows clients to view and administrate the +connections stored and used by NetworkManager.

@@ -83,7 +84,8 @@ 
 ListConnections (OUT ao connections);
-

List the saved network connections known to NetworkManager. +

+List the saved network connections known to NetworkManager.

@@ -92,7 +94,9 @@ ListConnections (OUT ao connections); - +

OUT ao connections:

List of connections.

+List of connections. +
@@ -103,7 +107,8 @@ ListConnections (OUT ao connections); GetConnectionByUuid (IN s uuid, OUT o connection); -

Retrieve the object path of a connection, given that connection's UUID. +

+Retrieve the object path of a connection, given that connection's UUID.

@@ -113,11 +118,15 @@ GetConnectionByUuid (IN s uuid, - + - +

IN s uuid:

The UUID to find the connection object path for.

+The UUID to find the connection object path for. +

OUT o connection:

The connection's object path.

+The connection's object path. +
@@ -129,10 +138,11 @@ GetConnectionByUuid (IN s uuid, AddConnection (IN a{sa{sv}} connection, OUT o path); -

Add new connection and save it to disk. This operation does not start the - network connection unless (1) device is idle and able to connect to the - network described by the new connection, and (2) the connection is allowed - to be started automatically. +

+Add new connection and save it to disk. This operation does not start the +network connection unless (1) device is idle and able to connect to the +network described by the new connection, and (2) the connection is allowed +to be started automatically.

@@ -142,11 +152,15 @@ AddConnection (IN a{sa{sv}} connection, - + - +

IN a{sa{sv}} connection:

Connection settings and properties.

+Connection settings and properties. +

OUT o path:

Object path of the new connection that was just added.

+Object path of the new connection that was just added. +
@@ -158,11 +172,12 @@ AddConnection (IN a{sa{sv}} connection, AddConnectionUnsaved (IN a{sa{sv}} connection, OUT o path); -

Add new connection but do not save it to disk immediately. This operation - does not start the network connection unless (1) device is idle and able - to connect to the network described by the new connection, and (2) the - connection is allowed to be started automatically. Use the 'Save' method - on the connection to save these changes to disk. +

+Add new connection but do not save it to disk immediately. This operation +does not start the network connection unless (1) device is idle and able +to connect to the network described by the new connection, and (2) the +connection is allowed to be started automatically. Use the 'Save' method +on the connection to save these changes to disk.

@@ -172,11 +187,15 @@ AddConnectionUnsaved (IN a{sa{sv}} connection, - + - +

IN a{sa{sv}} connection:

Connection settings and properties.

+Connection settings and properties. +

OUT o path:

Object path of the new connection that was just added.

+Object path of the new connection that was just added. +
@@ -191,18 +210,22 @@ AddConnection2 (IN a{sa{sv}} settings, OUT o path, OUT a{sv} result); -

Add a new connection profile. +

+Add a new connection profile.

-

AddConnection2 is an alternative to - AddConnection and - AddConnectionUnsaved. - The new variant can do everything that the older variants could, and more. - Its behavior is extensible via extra flags and args arguments. +

+AddConnection2 is an alternative to +AddConnection and +AddConnectionUnsaved. +The new variant can do everything that the older variants could, and more. +Its behavior is extensible via extra flags and args arguments. +

+

+The flags argument accepts the combination of following values, +logically or-ed together:

-

The flags argument accepts the combination of following values, - logically or-ed together: +

-

@@ -216,8 +239,8 @@ AddConnection2 (IN a{sa{sv}} settings, +profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory +only, if the connection is already in memory only.

@@ -227,9 +250,11 @@ AddConnection2 (IN a{sa{sv}} settings,

0x2 (in-memory):

The change is only made in memory (without touching an eventual - profile on disk). If neither 0x1 nor 0x2 is set, the change is made in memory - only, if the connection is already in memory only.

0x20 (block-autoconnect):

-

The args argument accepts the following keys: +

+The args argument accepts the following keys: +

+

-

@@ -239,17 +264,18 @@ AddConnection2 (IN a{sa{sv}} settings,

plugin:

The settings plugin the newly added connection will - use, such as "keyfile" or "ifcfg-rh".

+use, such as "keyfile" or "ifcfg-rh".

Since 1.38

-

Either the flags 0x1 (to-disk) or 0x2 (in-memory) must be specified. - The effect is whether to behave like - AddConnection or - AddConnectionUnsaved. +

+Either the flags 0x1 (to-disk) or 0x2 (in-memory) must be specified. +The effect is whether to behave like +AddConnection or +AddConnectionUnsaved.

@@ -259,23 +285,33 @@ AddConnection2 (IN a{sa{sv}} settings, - + - + - + - + - +

IN a{sa{sv}} settings:

New connection settings, properties, and (optionally) secrets.

+New connection settings, properties, and (optionally) secrets. +

IN u flags:

Flags. Unknown flags cause the call to fail.

+Flags. Unknown flags cause the call to fail. +

IN a{sv} args:

Optional arguments dictionary, for extentibility. Specifying unknown keys causes the call to fail.

+Optional arguments dictionary, for extentibility. Specifying unknown keys causes the call to fail. +

OUT o path:

Object path of the new connection that was just added.

+Object path of the new connection that was just added. +

OUT a{sv} result:

Output argument, currently no additional results are returned.

+Output argument, currently no additional results are returned. +
@@ -289,15 +325,17 @@ LoadConnections (IN as filenames, OUT b status, OUT as failures); -

Loads or reloads the indicated connections from disk. You should call this - after making changes directly to an on-disk connection file to make sure - that NetworkManager sees the changes. - As with AddConnection(), this operation does not necessarily - start the network connection. +

+Loads or reloads the indicated connections from disk. You should call this +after making changes directly to an on-disk connection file to make sure +that NetworkManager sees the changes. +As with AddConnection(), this operation does not necessarily +start the network connection.

-

Note that before 1.20, NetworkManager had a bug and this status value was wrong. - It is better to assume success if the method does not return with a D-Bus error. - On top of that, you can look at failures to know whether any of the requested files failed. +

+Note that before 1.20, NetworkManager had a bug and this status value was wrong. +It is better to assume success if the method does not return with a D-Bus error. +On top of that, you can look at failures to know whether any of the requested files failed.

@@ -307,15 +345,21 @@ LoadConnections (IN as filenames, - + - + - +

IN as filenames:

Array of paths to on-disk connection profiles in directories monitored by NetworkManager.

+Array of paths to on-disk connection profiles in directories monitored by NetworkManager. +

OUT b status:

Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied).

+Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied). +

OUT as failures:

Paths of connection files that could not be loaded.

+Paths of connection files that could not be loaded. +
@@ -326,8 +370,9 @@ LoadConnections (IN as filenames, 
 ReloadConnections (OUT b status);
-

Tells NetworkManager to reload all connection files from disk, including - noticing any added or deleted connection files. +

+Tells NetworkManager to reload all connection files from disk, including +noticing any added or deleted connection files.

@@ -336,7 +381,9 @@ ReloadConnections (OUT b status); - +

OUT b status:

This always returns TRUE.

+This always returns TRUE. +
@@ -346,7 +393,8 @@ ReloadConnections (OUT b status); 
 SaveHostname (IN  s hostname);
-

Save the hostname to persistent configuration. +

+Save the hostname to persistent configuration.

@@ -355,7 +403,9 @@ SaveHostname (IN s hostname); - +

IN s hostname:

The hostname to save to persistent configuration. If blank, the persistent hostname is cleared.

+The hostname to save to persistent configuration. If blank, the persistent hostname is cleared. +
@@ -367,14 +417,15 @@ SaveHostname (IN s hostname); 
 NewConnection (o connection);
-

Emitted when a new connection has been added after NetworkManager has - started up and initialized. This signal is not emitted for connections - read while starting up, because NetworkManager's D-Bus service is only - available after all connections have been read, and to prevent spamming - listeners with too many signals at one time. To retrieve the initial - connection list, call the ListConnections() method once, and then listen - for individual Settings.NewConnection and Settings.Connection.Deleted - signals for further updates. +

+Emitted when a new connection has been added after NetworkManager has +started up and initialized. This signal is not emitted for connections +read while starting up, because NetworkManager's D-Bus service is only +available after all connections have been read, and to prevent spamming +listeners with too many signals at one time. To retrieve the initial +connection list, call the ListConnections() method once, and then listen +for individual Settings.NewConnection and Settings.Connection.Deleted +signals for further updates.

@@ -383,7 +434,9 @@ NewConnection (o connection); - +

o connection:

Object path of the new connection.

+Object path of the new connection. +
@@ -393,11 +446,12 @@ NewConnection (o connection); 
 ConnectionRemoved (o connection);
-

Emitted when a connection is no longer available. This happens when the - connection is deleted or if it is no longer accessible by any of the - system's logged-in users. After receipt of this signal, the connection no - longer exists and cannot be used. Also see the Settings.Connection.Removed - signal. +

+Emitted when a connection is no longer available. This happens when the +connection is deleted or if it is no longer accessible by any of the +system's logged-in users. After receipt of this signal, the connection no +longer exists and cannot be used. Also see the Settings.Connection.Removed +signal.

@@ -406,7 +460,9 @@ ConnectionRemoved (o connection); - +

o connection:

Object path of the removed connection.

+Object path of the removed connection. +
@@ -418,7 +474,8 @@ ConnectionRemoved (o connection); 
 Connections  readable   ao
-

List of object paths of available network connection profiles. +

+List of object paths of available network connection profiles.

@@ -427,7 +484,8 @@ Connections readable ao 
 Hostname  readable   s
-

The machine hostname stored in persistent configuration. +

+The machine hostname stored in persistent configuration.

@@ -436,12 +494,13 @@ Hostname readable s 
 CanModify  readable   b
-

If true, adding and modifying connections is supported. +

+If true, adding and modifying connections is supported.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html index 13b806f6..6a8d73bf 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html @@ -8,7 +8,7 @@ - + @@ -49,7 +49,8 @@

Description

-

Represents an active connection to a Virtual Private Network. +

+Represents an active connection to a Virtual Private Network.

@@ -60,7 +61,8 @@ VpnStateChanged (u state, u reason); -

Emitted when the state of the VPN connection has changed. +

+Emitted when the state of the VPN connection has changed.

@@ -70,11 +72,15 @@ VpnStateChanged (u state, - + - +

u state:

(NMVpnConnectionState) The new state of the VPN connection.

+(NMVpnConnectionState) The new state of the VPN connection. +

u reason:

(NMActiveConnectionStateReason) Reason code describing the change to the new state.

+(NMActiveConnectionStateReason) Reason code describing the change to the new state. +
@@ -87,9 +93,11 @@ VpnStateChanged (u state, 
 VpnState  readable   u
-

The VPN-specific state of the connection. +

+The VPN-specific state of the connection.

-

Returns: NMVpnConnectionState +

+Returns: NMVpnConnectionState

@@ -98,12 +106,13 @@ VpnState readable u 
 Banner  readable   s
-

The banner string of the VPN connection. +

+The banner string of the VPN connection.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html index 8d245c2b..e8ddb928 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html @@ -8,7 +8,7 @@ - + @@ -70,8 +70,9 @@

Description

-

This interface is provided by plugins providing VPN services to the - NetworkManager daemon. +

+This interface is provided by plugins providing VPN services to the +NetworkManager daemon.

@@ -81,8 +82,9 @@ 
 Connect (IN  a{sa{sv}} connection);
-

Tells the plugin to connect. Interactive secrets requests (eg, emitting - the SecretsRequired signal) are not allowed. +

+Tells the plugin to connect. Interactive secrets requests (eg, emitting +the SecretsRequired signal) are not allowed.

@@ -91,7 +93,9 @@ Connect (IN a{sa{sv}} connection); - +

IN a{sa{sv}} connection:

Describes the connection to be established.

+Describes the connection to be established. +
@@ -102,9 +106,10 @@ Connect (IN a{sa{sv}} connection); ConnectInteractive (IN a{sa{sv}} connection, IN a{sv} details); -

Tells the plugin to connect, allowing interactive secrets requests (eg the - plugin is allowed to emit the SecretsRequired signal if the VPN service - indicates that it needs additional secrets during the connect process). +

+Tells the plugin to connect, allowing interactive secrets requests (eg the +plugin is allowed to emit the SecretsRequired signal if the VPN service +indicates that it needs additional secrets during the connect process).

@@ -114,11 +119,15 @@ ConnectInteractive (IN a{sa{sv}} connection, - + - +

IN a{sa{sv}} connection:

Describes the connection to be established.

+Describes the connection to be established. +

IN a{sv} details:

Additional details about the Connect process.

+Additional details about the Connect process. +
@@ -130,8 +139,9 @@ ConnectInteractive (IN a{sa{sv}} connection, NeedSecrets (IN a{sa{sv}} settings, OUT s setting_name); -

Asks the plugin whether the provided connection will require secrets to - connect successfully. +

+Asks the plugin whether the provided connection will require secrets to +connect successfully.

@@ -141,11 +151,15 @@ NeedSecrets (IN a{sa{sv}} settings, - + - +

IN a{sa{sv}} settings:

Describes the connection that may need secrets.

+Describes the connection that may need secrets. +

OUT s setting_name:

The setting name within the provided connection that requires secrets, if any.

+The setting name within the provided connection that requires secrets, if any. +
@@ -156,7 +170,8 @@ NeedSecrets (IN a{sa{sv}} settings, 
 Disconnect ();
-

Disconnect the plugin. +

+Disconnect the plugin.

@@ -165,7 +180,8 @@ Disconnect (); 
 SetConfig (IN  a{sv} config);
-

Set generic connection details on the connection. +

+Set generic connection details on the connection.

@@ -174,7 +190,9 @@ SetConfig (IN a{sv} config); - +

IN a{sv} config:

Generic configuration details for the connection.

+Generic configuration details for the connection. +
@@ -184,7 +202,8 @@ SetConfig (IN a{sv} config); 
 SetIp4Config (IN  a{sv} config);
-

Set IPv4 details on the connection. +

+Set IPv4 details on the connection.

@@ -193,7 +212,9 @@ SetIp4Config (IN a{sv} config); - +

IN a{sv} config:

Ip4Config details for the connection. You must call SetConfig() before calling this.

+Ip4Config details for the connection. You must call SetConfig() before calling this. +
@@ -203,7 +224,8 @@ SetIp4Config (IN a{sv} config); 
 SetIp6Config (IN  a{sv} config);
-

Set IPv6 details on the connection. +

+Set IPv6 details on the connection.

@@ -212,7 +234,9 @@ SetIp6Config (IN a{sv} config); - +

IN a{sv} config:

Ip6Config details for the connection. You must call SetConfig() before calling this.

+Ip6Config details for the connection. You must call SetConfig() before calling this. +
@@ -222,7 +246,8 @@ SetIp6Config (IN a{sv} config); 
 SetFailure (IN  s reason);
-

Indicate a failure to the plugin. +

+Indicate a failure to the plugin.

@@ -231,7 +256,9 @@ SetFailure (IN s reason); - +

IN s reason:

The reason for the failure.

+The reason for the failure. +
@@ -241,8 +268,9 @@ SetFailure (IN s reason); 
 NewSecrets (IN  a{sa{sv}} connection);
-

Called in response to a SecretsRequired signal to deliver updated secrets - or other information to the plugin. +

+Called in response to a SecretsRequired signal to deliver updated secrets +or other information to the plugin.

@@ -251,7 +279,9 @@ NewSecrets (IN a{sa{sv}} connection); - +

IN a{sa{sv}} connection:

Describes the connection including the new secrets.

+Describes the connection including the new secrets. +
@@ -263,7 +293,8 @@ NewSecrets (IN a{sa{sv}} connection); 
 StateChanged (u state);
-

Emitted when the plugin state changes. +

+Emitted when the plugin state changes.

@@ -272,7 +303,9 @@ StateChanged (u state); - +

u state:

(NMVpnServiceState) The new state of the plugin.

+(NMVpnServiceState) The new state of the plugin. +
@@ -283,9 +316,10 @@ StateChanged (u state); SecretsRequired (s message, as secrets); -

Emitted during an ongoing ConnectInteractive() request when the plugin has - determined that new secrets are required. NetworkManager will then call - the NewSecrets() method with a connection hash including the new secrets. +

+Emitted during an ongoing ConnectInteractive() request when the plugin has +determined that new secrets are required. NetworkManager will then call +the NewSecrets() method with a connection hash including the new secrets.

@@ -295,11 +329,15 @@ SecretsRequired (s message, - + - +

s message:

Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN.

+Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN. +

as secrets:

Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end.

+Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end. +
@@ -310,7 +348,8 @@ SecretsRequired (s message, 
 Config (a{sv} config);
-

The plugin obtained generic configuration information. +

+The plugin obtained generic configuration information.

@@ -319,7 +358,9 @@ Config (a{sv} config); - +

a{sv} config:

The configuration information.

+The configuration information. +
@@ -329,7 +370,8 @@ Config (a{sv} config); 
 Ip4Config (a{sv} ip4config);
-

The plugin obtained an IPv4 configuration. +

+The plugin obtained an IPv4 configuration.

@@ -338,7 +380,9 @@ Ip4Config (a{sv} ip4config); - +

a{sv} ip4config:

The IPv4 configuration.

+The IPv4 configuration. +
@@ -348,7 +392,8 @@ Ip4Config (a{sv} ip4config); 
 Ip6Config (a{sv} ip6config);
-

The plugin obtained an IPv6 configuration. +

+The plugin obtained an IPv6 configuration.

@@ -357,7 +402,9 @@ Ip6Config (a{sv} ip6config); - +

a{sv} ip6config:

The IPv6 configuration.

+The IPv6 configuration. +
@@ -367,7 +414,8 @@ Ip6Config (a{sv} ip6config); 
 LoginBanner (s banner);
-

Emitted when the plugin receives a login banner from the VPN service. +

+Emitted when the plugin receives a login banner from the VPN service.

@@ -376,7 +424,9 @@ LoginBanner (s banner); - +

s banner:

The login banner string.

+The login banner string. +
@@ -386,7 +436,8 @@ LoginBanner (s banner); 
 Failure (u reason);
-

Emitted when a failure in the VPN plugin occurs. +

+Emitted when a failure in the VPN plugin occurs.

@@ -395,7 +446,9 @@ Failure (u reason); - +

u reason:

(NMVpnPluginFailure) Reason code for the failure.

+(NMVpnPluginFailure) Reason code for the failure. +
@@ -407,14 +460,16 @@ Failure (u reason); 
 State  readable   u
-

The state of the plugin. +

+The state of the plugin.

-

Returns: NMVpnServiceState +

+Returns: NMVpnServiceState

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html index 84e1beb6..80f00881 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.WifiP2PPeer.html @@ -8,7 +8,7 @@ - + @@ -49,7 +49,10 @@

Description

-

+

+

+

+

Since 1.16

@@ -59,7 +62,8 @@ 
 Name  readable   s
-

Device name. +

+Device name.

Since 1.16

@@ -69,9 +73,11 @@ Name readable s 
 Flags  readable   u
-

Flags describing the capabilities of the access point. +

+Flags describing the capabilities of the access point.

-

Returns: NM80211ApFlags +

+Returns: NM80211ApFlags

Since 1.16

@@ -81,7 +87,8 @@ Flags readable u 
 Manufacturer  readable   s
-

The manufacturer of the Wi-Fi P2P peer. +

+The manufacturer of the Wi-Fi P2P peer.

Since 1.16

@@ -91,7 +98,8 @@ Manufacturer readable s 
 Model  readable   s
-

The model of the Wi-Fi P2P peer. +

+The model of the Wi-Fi P2P peer.

Since 1.16

@@ -101,7 +109,8 @@ Model readable s 
 ModelNumber  readable   s
-

The model number of the Wi-Fi P2P peer. +

+The model number of the Wi-Fi P2P peer.

Since 1.16

@@ -111,7 +120,8 @@ ModelNumber readable s 
 Serial  readable   s
-

The serial number of the Wi-Fi P2P peer. +

+The serial number of the Wi-Fi P2P peer.

Since 1.16

@@ -121,7 +131,8 @@ Serial readable s 
 WfdIEs  readable   ay
-

The Wi-Fi Display Information Elements of the Wi-Fi P2P peer. +

+The Wi-Fi Display Information Elements of the Wi-Fi P2P peer.

Since 1.16

@@ -131,7 +142,8 @@ WfdIEs readable ay 
 HwAddress  readable   s
-

The hardware address (BSSID) of the access point. +

+The hardware address (BSSID) of the access point.

Since 1.16

@@ -141,7 +153,8 @@ HwAddress readable s 
 Strength  readable   y
-

The current signal quality of the access point, in percent. +

+The current signal quality of the access point, in percent.

Since 1.16

@@ -151,15 +164,16 @@ Strength readable y 
 LastSeen  readable   i
-

The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access - point was found in scan results. A value of -1 means the access point has - never been found in scan results. +

+The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access +point was found in scan results. A value of -1 means the access point has +never been found in scan results.

Since 1.16

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html index f19837a3..628636fd 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html @@ -8,7 +8,7 @@ - + @@ -119,7 +119,10 @@

Description

-

+

+

+

+

Method Details

@@ -128,26 +131,28 @@ 
 Reload (IN  u flags);
-

Reload NetworkManager's configuration and perform certain updates, like flushing a cache or - rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it - allows for more fine-grained control over what to reload (see flags). It also allows - non-root access via PolicyKit and contrary to signals it is synchronous. +

+Reload NetworkManager's configuration and perform certain updates, like flushing a cache or +rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it +allows for more fine-grained control over what to reload (see flags). It also allows +non-root access via PolicyKit and contrary to signals it is synchronous.

-

No flags (0x00) means to reload everything that is supported which is identical to - sending a SIGHUP. - (0x01) means to reload the NetworkManager.conf configuration from disk. Note that this - does not include connections, which can be reloaded via Setting's ReloadConnections. - (0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf - anew. - (0x04) means to restart the DNS plugin. This is for example useful when using - dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d. - If you edit those files, you can restart the DNS plugin. This action shortly interrupts - name resolution. - Note that flags may affect each other. For example, restarting the DNS plugin (0x04) - implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes - to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting - the DNS plugin (0x04) or update resolv.conf (0x02), unless the DNS related configuration - changes in NetworkManager.conf. +

+No flags (0x00) means to reload everything that is supported which is identical to +sending a SIGHUP. +(0x01) means to reload the NetworkManager.conf configuration from disk. Note that this +does not include connections, which can be reloaded via Setting's ReloadConnections. +(0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf +anew. +(0x04) means to restart the DNS plugin. This is for example useful when using +dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d. +If you edit those files, you can restart the DNS plugin. This action shortly interrupts +name resolution. +Note that flags may affect each other. For example, restarting the DNS plugin (0x04) +implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes +to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting +the DNS plugin (0x04) or update resolv.conf (0x02), unless the DNS related configuration +changes in NetworkManager.conf.

@@ -156,7 +161,9 @@ Reload (IN u flags); - +

IN u flags:

Optional flags to specify which parts shall be reloaded.

+Optional flags to specify which parts shall be reloaded. +
@@ -166,7 +173,8 @@ Reload (IN u flags); 
 GetDevices (OUT ao devices);
-

Get the list of realized network devices. +

+Get the list of realized network devices.

@@ -175,7 +183,9 @@ GetDevices (OUT ao devices); - +

OUT ao devices:

List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).

+List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()). +
@@ -185,7 +195,8 @@ GetDevices (OUT ao devices); 
 GetAllDevices (OUT ao devices);
-

Get the list of all network devices. +

+Get the list of all network devices.

@@ -194,7 +205,9 @@ GetAllDevices (OUT ao devices); - +

OUT ao devices:

List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated).

+List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated). +
@@ -205,9 +218,10 @@ GetAllDevices (OUT ao devices); GetDeviceByIpIface (IN s iface, OUT o device); -

Return the object path of the network device referenced by its IP - interface name. Note that some devices (usually modems) only have an IP - interface name when they are connected. +

+Return the object path of the network device referenced by its IP +interface name. Note that some devices (usually modems) only have an IP +interface name when they are connected.

@@ -217,11 +231,15 @@ GetDeviceByIpIface (IN s iface, - + - +

IN s iface:

Interface name of the device to find.

+Interface name of the device to find. +

OUT o device:

Object path of the network device.

+Object path of the network device. +
@@ -235,7 +253,8 @@ ActivateConnection (IN o connection, IN o specific_object, OUT o active_connection); -

Activate a connection using the supplied device. +

+Activate a connection using the supplied device.

@@ -245,19 +264,27 @@ ActivateConnection (IN o connection, - + - + - + - +

IN o connection:

The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.

+The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path. +

IN o device:

The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.

+The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use. +

IN o specific_object:

The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.

+The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device. +

OUT o active_connection:

The path of the active connection object representing this active connection.

+The path of the active connection object representing this active connection. +
@@ -272,12 +299,14 @@ AddAndActivateConnection (IN a{sa{sv}} connection, OUT o path, OUT o active_connection); -

Adds a new connection using the given details (if any) as a template - (automatically filling in missing settings with the capabilities of the - given device and specific object), then activate the new connection. - Cannot be used for VPN connections at this time. +

+Adds a new connection using the given details (if any) as a template +(automatically filling in missing settings with the capabilities of the +given device and specific object), then activate the new connection. +Cannot be used for VPN connections at this time.

-

See also AddAndActivateConnection2. +

+See also AddAndActivateConnection2.

@@ -287,23 +316,33 @@ AddAndActivateConnection (IN a{sa{sv}} connection, - + - + - + - + - +

IN a{sa{sv}} connection:

Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.

+Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object. +

IN o device:

The object path of device to be activated using the given connection.

+The object path of device to be activated using the given connection. +

IN o specific_object:

The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.

+The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection. +

OUT o path:

Object path of the new connection that was just added.

+Object path of the new connection that was just added. +

OUT o active_connection:

The path of the active connection object representing this active connection.

+The path of the active connection object representing this active connection. +
@@ -320,16 +359,19 @@ AddAndActivateConnection2 (IN a{sa{sv}} connection, OUT o active_connection, OUT a{sv} result); -

Adds a new connection using the given details (if any) as a template - (automatically filling in missing settings with the capabilities of the - given device and specific object), then activate the new connection. - Cannot be used for VPN connections at this time. +

+Adds a new connection using the given details (if any) as a template +(automatically filling in missing settings with the capabilities of the +given device and specific object), then activate the new connection. +Cannot be used for VPN connections at this time.

-

This method extends AddAndActivateConnection to allow passing further - parameters. At this time the following options are supported: +

+This method extends AddAndActivateConnection to allow passing further +parameters. At this time the following options are supported:

-

* persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected. - * bind-activation: Bind the activation lifetime. Set to "dbus-name" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally. +

+* persist: A string value of either "disk" (default), "memory" or "volatile". If "memory" is passed, the connection will not be saved to disk. If "volatile" is passed, the connection will not be saved to disk and will be destroyed when disconnected. +* bind-activation: Bind the activation lifetime. Set to "dbus-name" to automatically disconnect when the requesting process disappears from the bus. The default of "none" means the connection is kept activated normally.

@@ -339,31 +381,45 @@ AddAndActivateConnection2 (IN a{sa{sv}} connection, - + - + - + - + - + - + - +

IN a{sa{sv}} connection:

Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.

+Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object. +

IN o device:

The object path of device to be activated using the given connection.

+The object path of device to be activated using the given connection. +

IN o specific_object:

The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.

+The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For Wi-Fi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection. +

IN a{sv} options:

Further options for the method call.

+Further options for the method call. +

OUT o path:

Object path of the new connection that was just added.

+Object path of the new connection that was just added. +

OUT o active_connection:

The path of the active connection object representing this active connection.

+The path of the active connection object representing this active connection. +

OUT a{sv} result:

A dictionary of additional output arguments for future extension. Currently, not additional output arguments are supported.

+A dictionary of additional output arguments for future extension. Currently, not additional output arguments are supported. +
@@ -374,7 +430,8 @@ AddAndActivateConnection2 (IN a{sa{sv}} connection, 
 DeactivateConnection (IN  o active_connection);
-

Deactivate an active connection. +

+Deactivate an active connection.

@@ -383,7 +440,9 @@ DeactivateConnection (IN o active_connection); - +

IN o active_connection:

The currently active connection to deactivate.

+The currently active connection to deactivate. +
@@ -393,10 +452,11 @@ DeactivateConnection (IN o active_connection); 
 Sleep (IN  b sleep);
-

Control the NetworkManager daemon's sleep state. When asleep, all - interfaces that it manages are deactivated. When awake, devices are - available to be activated. This command should not be called directly by - users or clients; it is intended for system suspend/resume tracking. +

+Control the NetworkManager daemon's sleep state. When asleep, all +interfaces that it manages are deactivated. When awake, devices are +available to be activated. This command should not be called directly by +users or clients; it is intended for system suspend/resume tracking.

@@ -405,7 +465,9 @@ Sleep (IN b sleep); - +

IN b sleep:

Indicates whether the NetworkManager daemon should sleep or wake.

+Indicates whether the NetworkManager daemon should sleep or wake. +
@@ -415,11 +477,12 @@ Sleep (IN b sleep); 
 Enable (IN  b enable);
-

Control whether overall networking is enabled or disabled. When disabled, - all interfaces that NM manages are deactivated. When enabled, all managed - interfaces are re-enabled and available to be activated. This command - should be used by clients that provide to users the ability to - enable/disable all networking. +

+Control whether overall networking is enabled or disabled. When disabled, +all interfaces that NM manages are deactivated. When enabled, all managed +interfaces are re-enabled and available to be activated. This command +should be used by clients that provide to users the ability to +enable/disable all networking.

@@ -428,7 +491,9 @@ Enable (IN b enable); - +

IN b enable:

If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices.

+If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices. +
@@ -438,9 +503,10 @@ Enable (IN b enable); 
 GetPermissions (OUT a{ss} permissions);
-

Returns the permissions a caller has for various authenticated operations - that NetworkManager provides, like Enable/Disable networking, changing - Wi-Fi, WWAN, and WiMAX state, etc. +

+Returns the permissions a caller has for various authenticated operations +that NetworkManager provides, like Enable/Disable networking, changing +Wi-Fi, WWAN, and WiMAX state, etc.

@@ -449,7 +515,9 @@ GetPermissions (OUT a{ss} permissions); - +

OUT a{ss} permissions:

Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations.

+Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations. +
@@ -460,7 +528,8 @@ GetPermissions (OUT a{ss} permissions); SetLogging (IN s level, IN s domains); -

Set logging verbosity and which operations are logged. +

+Set logging verbosity and which operations are logged.

@@ -470,11 +539,15 @@ SetLogging (IN s level, - + - +

IN s level:

One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain.

+One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain. +

IN s domains:

A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged.

+A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged. +
@@ -486,7 +559,8 @@ SetLogging (IN s level, GetLogging (OUT s level, OUT s domains); -

Get current logging verbosity level and operations domains. +

+Get current logging verbosity level and operations domains.

@@ -496,11 +570,15 @@ GetLogging (OUT s level, - + - +

OUT s level:

One of [ERR, WARN, INFO, DEBUG, TRACE].

+One of [ERR, WARN, INFO, DEBUG, TRACE]. +

OUT s domains:

For available domains see SetLogging() call.

+For available domains see SetLogging() call. +
@@ -511,7 +589,8 @@ GetLogging (OUT s level, 
 CheckConnectivity (OUT u connectivity);
-

Re-check the network connectivity state. +

+Re-check the network connectivity state.

@@ -520,7 +599,9 @@ CheckConnectivity (OUT u connectivity); - +

OUT u connectivity:

(NMConnectivityState) The current connectivity state.

+(NMConnectivityState) The current connectivity state. +
@@ -530,8 +611,9 @@ CheckConnectivity (OUT u connectivity); 
 state (OUT u state);
-

The overall networking state as determined by the NetworkManager daemon, - based on the state of network devices under its management. +

+The overall networking state as determined by the NetworkManager daemon, +based on the state of network devices under its management.

@@ -540,7 +622,9 @@ state (OUT u state); - +

OUT u state:

NMState

+NMState +
@@ -553,9 +637,10 @@ CheckpointCreate (IN ao devices, IN u flags, OUT o checkpoint); -

Create a checkpoint of the current networking configuration - for given interfaces. If rollback_timeout is not zero, a - rollback is automatically performed after the given timeout. +

+Create a checkpoint of the current networking configuration +for given interfaces. If rollback_timeout is not zero, a +rollback is automatically performed after the given timeout.

@@ -565,19 +650,27 @@ CheckpointCreate (IN ao devices, - + - + - + - +

IN ao devices:

A list of device paths for which a checkpoint should be created. An empty list means all devices.

+A list of device paths for which a checkpoint should be created. An empty list means all devices. +

IN u rollback_timeout:

The time in seconds until NetworkManager will automatically rollback to the checkpoint. Set to zero for infinite.

+The time in seconds until NetworkManager will automatically rollback to the checkpoint. Set to zero for infinite. +

IN u flags:

(NMCheckpointCreateFlags) Flags for the creation.

+(NMCheckpointCreateFlags) Flags for the creation. +

OUT o checkpoint:

On success, the path of the new checkpoint.

+On success, the path of the new checkpoint. +
@@ -588,7 +681,8 @@ CheckpointCreate (IN ao devices, 
 CheckpointDestroy (IN  o checkpoint);
-

Destroy a previously created checkpoint. +

+Destroy a previously created checkpoint.

@@ -597,7 +691,9 @@ CheckpointDestroy (IN o checkpoint); - +

IN o checkpoint:

The checkpoint to be destroyed. Set to empty to cancel all pending checkpoints.

+The checkpoint to be destroyed. Set to empty to cancel all pending checkpoints. +
@@ -608,7 +704,8 @@ CheckpointDestroy (IN o checkpoint); CheckpointRollback (IN o checkpoint, OUT a{su} result); -

Rollback a checkpoint before the timeout is reached. +

+Rollback a checkpoint before the timeout is reached.

@@ -618,11 +715,15 @@ CheckpointRollback (IN o checkpoint, - + - +

IN o checkpoint:

The checkpoint to be rolled back.

+The checkpoint to be rolled back. +

OUT a{su} result:

On return, a dictionary of devices and results. Devices are represented by their original D-Bus path; each result is a RollbackResult.

+On return, a dictionary of devices and results. Devices are represented by their original D-Bus path; each result is a RollbackResult. +
@@ -634,15 +735,17 @@ CheckpointRollback (IN o checkpoint, CheckpointAdjustRollbackTimeout (IN o checkpoint, IN u add_timeout); -

Reset the timeout for rollback for the checkpoint. +

+Reset the timeout for rollback for the checkpoint.

-

Note that the added seconds start counting from now, - not "Created" timestamp or the previous expiration - time. Note that the "Created" property of the checkpoint - will stay unchanged by this call. However, the "RollbackTimeout" - will be recalculated to give the approximate new expiration time. - The new "RollbackTimeout" property will be approximate up to - one second precision, which is the accuracy of the property. +

+Note that the added seconds start counting from now, +not "Created" timestamp or the previous expiration +time. Note that the "Created" property of the checkpoint +will stay unchanged by this call. However, the "RollbackTimeout" +will be recalculated to give the approximate new expiration time. +The new "RollbackTimeout" property will be approximate up to +one second precision, which is the accuracy of the property.

@@ -652,11 +755,15 @@ CheckpointAdjustRollbackTimeout (IN o checkpoint, - + - +

IN o checkpoint:

The checkpoint to be rolled back.

+The checkpoint to be rolled back. +

IN u add_timeout:

Number of seconds from now in which the timeout will expire. Set to 0 to disable the timeout.

+Number of seconds from now in which the timeout will expire. Set to 0 to disable the timeout. +
@@ -670,8 +777,9 @@ CheckpointAdjustRollbackTimeout (IN o checkpoint, 
 CheckPermissions ();
-

Emitted when system authorization details change, indicating that clients - may wish to recheck permissions with GetPermissions. +

+Emitted when system authorization details change, indicating that clients +may wish to recheck permissions with GetPermissions.

@@ -680,7 +788,8 @@ CheckPermissions (); 
 StateChanged (u state);
-

NetworkManager's state changed. +

+NetworkManager's state changed.

@@ -689,7 +798,9 @@ StateChanged (u state); - +

u state:

(NMState) The new state of NetworkManager.

+(NMState) The new state of NetworkManager. +
@@ -699,7 +810,8 @@ StateChanged (u state); 
 DeviceAdded (o device_path);
-

A device was added to the system +

+A device was added to the system

@@ -708,7 +820,9 @@ DeviceAdded (o device_path); - +

o device_path:

The object path of the newly added device.

+The object path of the newly added device. +
@@ -718,7 +832,8 @@ DeviceAdded (o device_path); 
 DeviceRemoved (o device_path);
-

A device was removed from the system, and is no longer available. +

+A device was removed from the system, and is no longer available.

@@ -727,7 +842,9 @@ DeviceRemoved (o device_path); - +

o device_path:

The object path of the device that was just removed.

+The object path of the device that was just removed. +
@@ -739,9 +856,10 @@ DeviceRemoved (o device_path); 
 Devices  readable   ao
-

The list of realized network devices. Realized devices are those which - have backing resources (eg from the kernel or a management daemon like - ModemManager, teamd, etc). +

+The list of realized network devices. Realized devices are those which +have backing resources (eg from the kernel or a management daemon like +ModemManager, teamd, etc).

@@ -750,9 +868,10 @@ Devices readable ao 
 AllDevices  readable   ao
-

The list of both realized and un-realized network devices. Un-realized - devices are software devices which do not yet have backing resources, but - for which backing resources can be created if the device is activated. +

+The list of both realized and un-realized network devices. Un-realized +devices are software devices which do not yet have backing resources, but +for which backing resources can be created if the device is activated.

@@ -761,7 +880,8 @@ AllDevices readable ao 
 Checkpoints  readable   ao
-

The list of active checkpoints. +

+The list of active checkpoints.

@@ -770,8 +890,9 @@ Checkpoints readable ao 
 NetworkingEnabled  readable   b
-

Indicates if overall networking is currently enabled or not. See the - Enable() method. +

+Indicates if overall networking is currently enabled or not. See the +Enable() method.

@@ -780,7 +901,8 @@ NetworkingEnabled readable b 
 WirelessEnabled  readwrite  b
-

Indicates if wireless is currently enabled or not. +

+Indicates if wireless is currently enabled or not.

@@ -789,8 +911,9 @@ WirelessEnabled readwrite b 
 WirelessHardwareEnabled  readable   b
-

Indicates if the wireless hardware is currently enabled, i.e. the state of - the RF kill switch. +

+Indicates if the wireless hardware is currently enabled, i.e. the state of +the RF kill switch.

@@ -799,7 +922,8 @@ WirelessHardwareEnabled readable b 
 WwanEnabled  readwrite  b
-

Indicates if mobile broadband devices are currently enabled or not. +

+Indicates if mobile broadband devices are currently enabled or not.

@@ -808,8 +932,9 @@ WwanEnabled readwrite b 
 WwanHardwareEnabled  readable   b
-

Indicates if the mobile broadband hardware is currently enabled, i.e. the - state of the RF kill switch. +

+Indicates if the mobile broadband hardware is currently enabled, i.e. the +state of the RF kill switch.

@@ -818,8 +943,9 @@ WwanHardwareEnabled readable b 
 WimaxEnabled  readwrite  b
-

DEPRECATED. Doesn't have any meaning and is around only for - compatibility reasons. +

+DEPRECATED. Doesn't have any meaning and is around only for +compatibility reasons.

@@ -828,8 +954,9 @@ WimaxEnabled readwrite b 
 WimaxHardwareEnabled  readable   b
-

DEPRECATED. Doesn't have any meaning and is around only for - compatibility reasons. +

+DEPRECATED. Doesn't have any meaning and is around only for +compatibility reasons.

@@ -838,8 +965,9 @@ WimaxHardwareEnabled readable b 
 RadioFlags  readable   u
-

Flags related to radio devices. See NMRadioFlags for the list of flags - supported. +

+Flags related to radio devices. See NMRadioFlags for the list of flags +supported.

Since 1.38

@@ -849,7 +977,8 @@ RadioFlags readable u 
 ActiveConnections  readable   ao
-

List of active connection object paths. +

+List of active connection object paths.

@@ -858,11 +987,12 @@ ActiveConnections readable ao 
 PrimaryConnection  readable   o
-

The object path of the "primary" active connection being used to access - the network. In particular, if there is no VPN active, or the VPN does not - have the default route, then this indicates the connection that has the - default route. If there is a VPN active with the default route, then this - indicates the connection that contains the route to the VPN endpoint. +

+The object path of the "primary" active connection being used to access +the network. In particular, if there is no VPN active, or the VPN does not +have the default route, then this indicates the connection that has the +default route. If there is a VPN active with the default route, then this +indicates the connection that contains the route to the VPN endpoint.

@@ -871,9 +1001,10 @@ PrimaryConnection readable o 
 PrimaryConnectionType  readable   s
-

The connection type of the "primary" active connection being used to - access the network. This is the same as the Type property on the object - indicated by PrimaryConnection. +

+The connection type of the "primary" active connection being used to +access the network. This is the same as the Type property on the object +indicated by PrimaryConnection.

@@ -882,10 +1013,12 @@ PrimaryConnectionType readable s 
 Metered  readable   u
-

Indicates whether the connectivity is metered. This is equivalent to the - metered property of the device associated with the primary connection. +

+Indicates whether the connectivity is metered. This is equivalent to the +metered property of the device associated with the primary connection.

-

Returns: NMMetered +

+Returns: NMMetered

@@ -894,9 +1027,10 @@ Metered readable u 
 ActivatingConnection  readable   o
-

The object path of an active connection that is currently being activated - and which is expected to become the new PrimaryConnection when it finishes - activating. +

+The object path of an active connection that is currently being activated +and which is expected to become the new PrimaryConnection when it finishes +activating.

@@ -905,9 +1039,10 @@ ActivatingConnection readable o 
 Startup  readable   b
-

Indicates whether NM is still starting up; this becomes FALSE when NM has - finished attempting to activate every connection that it might be able to - activate at startup. +

+Indicates whether NM is still starting up; this becomes FALSE when NM has +finished attempting to activate every connection that it might be able to +activate at startup.

@@ -916,7 +1051,8 @@ Startup readable b 
 Version  readable   s
-

NetworkManager version. +

+NetworkManager version.

@@ -925,9 +1061,10 @@ Version readable s 
 Capabilities  readable   au
-

The current set of capabilities. See NMCapability for currently - defined capability numbers. The array is guaranteed to - be sorted in ascending order without duplicates. +

+The current set of capabilities. See NMCapability for currently +defined capability numbers. The array is guaranteed to +be sorted in ascending order without duplicates.

@@ -936,18 +1073,22 @@ Capabilities readable au 
 State  readable   u
-

The overall state of the NetworkManager daemon. +

+The overall state of the NetworkManager daemon.

-

This takes state of all active connections and the connectivity state into account - to produce a single indicator of the network accessibility status. +

+This takes state of all active connections and the connectivity state into account +to produce a single indicator of the network accessibility status.

-

The graphical shells may use this property to provide network connection status - indication and applications may use this to check if Internet connection is - accessible. Shell that is able to cope with captive portals should use the - "Connectivity" property to decide whether to present a captive portal authentication - dialog. +

+The graphical shells may use this property to provide network connection status +indication and applications may use this to check if Internet connection is +accessible. Shell that is able to cope with captive portals should use the +"Connectivity" property to decide whether to present a captive portal authentication +dialog.

-

Returns: NMState +

+Returns: NMState

@@ -956,21 +1097,25 @@ State readable u 
 Connectivity  readable   u
-

The result of the last connectivity check. The connectivity check is triggered - automatically when a default connection becomes available, periodically and by - calling a CheckConnectivity() method. +

+The result of the last connectivity check. The connectivity check is triggered +automatically when a default connection becomes available, periodically and by +calling a CheckConnectivity() method.

-

This property is in general useful for the graphical shell to determine whether - the Internet access is being hijacked by an authentication gateway (a "captive - portal"). In such case it would typically present a web browser window to give - the user a chance to authenticate and call CheckConnectivity() when the user - submits a form or dismisses the window. +

+This property is in general useful for the graphical shell to determine whether +the Internet access is being hijacked by an authentication gateway (a "captive +portal"). In such case it would typically present a web browser window to give +the user a chance to authenticate and call CheckConnectivity() when the user +submits a form or dismisses the window.

-

To determine the whether the user is able to access the Internet without dealing - with captive portals (e.g. to provide a network connection indicator or disable - controls that require Internet access), the "State" property is more suitable. +

+To determine the whether the user is able to access the Internet without dealing +with captive portals (e.g. to provide a network connection indicator or disable +controls that require Internet access), the "State" property is more suitable.

-

Returns: NMConnectivityState +

+Returns: NMConnectivityState

@@ -979,13 +1124,15 @@ Connectivity readable u 
 ConnectivityCheckAvailable  readable   b
-

Indicates whether connectivity checking service has been - configured. This may return true even if the service is not - currently enabled. +

+Indicates whether connectivity checking service has been +configured. This may return true even if the service is not +currently enabled.

-

This is primarily intended for use in a privacy control panel, - as a way to determine whether to show an option to - enable/disable the feature. +

+This is primarily intended for use in a privacy control panel, +as a way to determine whether to show an option to +enable/disable the feature.

@@ -994,9 +1141,10 @@ ConnectivityCheckAvailable readable b 
 ConnectivityCheckEnabled  readwrite  b
-

Indicates whether connectivity checking is enabled. This - property can also be written to disable connectivity - checking (as a privacy control panel might want to do). +

+Indicates whether connectivity checking is enabled. This +property can also be written to disable connectivity +checking (as a privacy control panel might want to do).

@@ -1005,7 +1153,8 @@ ConnectivityCheckEnabled readwrite b 
 ConnectivityCheckUri  readable   s
-

The URI that NetworkManager will hit to check if there is internet connectivity. +

+The URI that NetworkManager will hit to check if there is internet connectivity.

@@ -1014,19 +1163,20 @@ ConnectivityCheckUri readable s 
 GlobalDnsConfiguration  readwrite  a{sv}
-

Dictionary of global DNS settings where the key is one of "searches", - "options" and "domains". The values for the "searches" and "options" keys - are string arrays describing the list of search domains and resolver - options, respectively. The value of the "domains" key is a second-level - dictionary, where each key is a domain name, and each key's value is a - third-level dictionary with the keys "servers" and "options". "servers" is - a string array of DNS servers, "options" is a string array of - domain-specific options. +

+Dictionary of global DNS settings where the key is one of "searches", +"options" and "domains". The values for the "searches" and "options" keys +are string arrays describing the list of search domains and resolver +options, respectively. The value of the "domains" key is a second-level +dictionary, where each key is a domain name, and each key's value is a +third-level dictionary with the keys "servers" and "options". "servers" is +a string array of DNS servers, "options" is a string array of +domain-specific options.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 538c2ac6..81e05e56 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@

- for NetworkManager 1.38.2 + for NetworkManager 1.38.4 The latest version of this documentation can be found on-line at https://networkmanager.dev/docs/api/latest/. @@ -461,6 +461,6 @@

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index ad5a5705..6bc77760 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -8,7 +8,7 @@ - + @@ -1658,6 +1658,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/license.html b/docs/api/html/license.html index 45ca298c..e1b68486 100644 --- a/docs/api/html/license.html +++ b/docs/api/html/license.html @@ -7,7 +7,7 @@ - + @@ -55,6 +55,6 @@

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/manpages.html b/docs/api/html/manpages.html index 9250556f..4ce24258 100644 --- a/docs/api/html/manpages.html +++ b/docs/api/html/manpages.html @@ -8,7 +8,7 @@ - + @@ -74,6 +74,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nm-cloud-setup.html b/docs/api/html/nm-cloud-setup.html index 4691599d..360519fa 100644 --- a/docs/api/html/nm-cloud-setup.html +++ b/docs/api/html/nm-cloud-setup.html @@ -8,7 +8,7 @@ - + @@ -335,6 +335,6 @@ ln -s /etc/systemd/system/timers.target.wants/nm-cloud-setup.timer /usr/lib/syst
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html index e6c54f9c..4c90a748 100644 --- a/docs/api/html/nm-dbus-types.html +++ b/docs/api/html/nm-dbus-types.html @@ -8,7 +8,7 @@ - + @@ -3070,7 +3070,7 @@

enum NMMetered

-

The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the NMDevice at a given moment.

+

The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the NMDevice at a given moment.

For the connection profile only NM_METERED_UNKNOWN, NM_METERED_NO and NM_METERED_YES are allowed.

The device's metered state at runtime is determined by the profile which is currently active. If the profile explicitly specifies NM_METERED_NO or NM_METERED_YES, then the device's metered state is as such. If the connection profile leaves it undecided at NM_METERED_UNKNOWN (the default), then NetworkManager tries to guess the metered state, for example based on the device type or on DHCP options (like Android devices exposing a "ANDROID_METERED" DHCP vendor option). This then leads to either NM_METERED_GUESS_NO or NM_METERED_GUESS_YES.

Most applications probably should treat the runtime state NM_METERED_GUESS_YES like NM_METERED_YES, and all other states as not metered.

@@ -5321,6 +5321,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nm-initrd-generator.html b/docs/api/html/nm-initrd-generator.html index 214cfd67..8962d9c1 100644 --- a/docs/api/html/nm-initrd-generator.html +++ b/docs/api/html/nm-initrd-generator.html @@ -8,7 +8,7 @@ - + @@ -170,6 +170,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nm-online.html b/docs/api/html/nm-online.html index 148c1821..53c2cc52 100644 --- a/docs/api/html/nm-online.html +++ b/docs/api/html/nm-online.html @@ -8,7 +8,7 @@ - + @@ -135,6 +135,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nm-openvswitch.html b/docs/api/html/nm-openvswitch.html index 0d2d156a..740989ad 100644 --- a/docs/api/html/nm-openvswitch.html +++ b/docs/api/html/nm-openvswitch.html @@ -8,7 +8,7 @@ - + @@ -172,6 +172,6 @@ Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html index 31306709..d8c9631a 100644 --- a/docs/api/html/nm-settings-dbus.html +++ b/docs/api/html/nm-settings-dbus.html @@ -8,7 +8,7 @@ - + @@ -4278,6 +4278,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html index 698aa4e1..390509ad 100644 --- a/docs/api/html/nm-settings-ifcfg-rh.html +++ b/docs/api/html/nm-settings-ifcfg-rh.html @@ -8,7 +8,7 @@ - + @@ -2789,6 +2789,6 @@ Allowed values: "yes", "no"
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html index e8bf490f..69bb333c 100644 --- a/docs/api/html/nm-settings-keyfile.html +++ b/docs/api/html/nm-settings-keyfile.html @@ -8,7 +8,7 @@ - + @@ -567,6 +567,6 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html index 3cd7e721..e54b049c 100644 --- a/docs/api/html/nm-settings-nmcli.html +++ b/docs/api/html/nm-settings-nmcli.html @@ -8,7 +8,7 @@ - + @@ -5286,6 +5286,6 @@ The actual string to print.
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nm-vpn-dbus-types.html b/docs/api/html/nm-vpn-dbus-types.html index 7673b32e..31c1d323 100644 --- a/docs/api/html/nm-vpn-dbus-types.html +++ b/docs/api/html/nm-vpn-dbus-types.html @@ -8,7 +8,7 @@ - + @@ -555,6 +555,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html index 075c0d3c..2bc6cbc2 100644 --- a/docs/api/html/nmcli-examples.html +++ b/docs/api/html/nmcli-examples.html @@ -8,7 +8,7 @@ - + @@ -649,6 +649,6 @@ Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html index ab08d70d..5ca8f1f4 100644 --- a/docs/api/html/nmcli.html +++ b/docs/api/html/nmcli.html @@ -8,7 +8,7 @@ - + @@ -1832,6 +1832,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/nmtui.html b/docs/api/html/nmtui.html index edf90abf..ee9ab9f0 100644 --- a/docs/api/html/nmtui.html +++ b/docs/api/html/nmtui.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-access-points.html b/docs/api/html/ref-dbus-access-points.html index 38314ff1..4ad00ffb 100644 --- a/docs/api/html/ref-dbus-access-points.html +++ b/docs/api/html/ref-dbus-access-points.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-active-connections.html b/docs/api/html/ref-dbus-active-connections.html index 3c784f47..5bb979a8 100644 --- a/docs/api/html/ref-dbus-active-connections.html +++ b/docs/api/html/ref-dbus-active-connections.html @@ -8,7 +8,7 @@ - + @@ -32,6 +32,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-agent-manager.html b/docs/api/html/ref-dbus-agent-manager.html index e0118f11..1c5c6f6d 100644 --- a/docs/api/html/ref-dbus-agent-manager.html +++ b/docs/api/html/ref-dbus-agent-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-checkpoint.html b/docs/api/html/ref-dbus-checkpoint.html index 59bc9d83..5242311c 100644 --- a/docs/api/html/ref-dbus-checkpoint.html +++ b/docs/api/html/ref-dbus-checkpoint.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-devices.html b/docs/api/html/ref-dbus-devices.html index 58b079c2..7d732909 100644 --- a/docs/api/html/ref-dbus-devices.html +++ b/docs/api/html/ref-dbus-devices.html @@ -8,7 +8,7 @@ - + @@ -119,6 +119,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-dhcp4-configs.html b/docs/api/html/ref-dbus-dhcp4-configs.html index 3a66b47e..ca0f9a8d 100644 --- a/docs/api/html/ref-dbus-dhcp4-configs.html +++ b/docs/api/html/ref-dbus-dhcp4-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-dhcp6-configs.html b/docs/api/html/ref-dbus-dhcp6-configs.html index 3a874eb9..dd747c61 100644 --- a/docs/api/html/ref-dbus-dhcp6-configs.html +++ b/docs/api/html/ref-dbus-dhcp6-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-dns-manager.html b/docs/api/html/ref-dbus-dns-manager.html index 67bfefb8..d33bc1dc 100644 --- a/docs/api/html/ref-dbus-dns-manager.html +++ b/docs/api/html/ref-dbus-dns-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-ip4-configs.html b/docs/api/html/ref-dbus-ip4-configs.html index 832e29fc..a45f8ff3 100644 --- a/docs/api/html/ref-dbus-ip4-configs.html +++ b/docs/api/html/ref-dbus-ip4-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-ip6-configs.html b/docs/api/html/ref-dbus-ip6-configs.html index 9b538510..e9c50240 100644 --- a/docs/api/html/ref-dbus-ip6-configs.html +++ b/docs/api/html/ref-dbus-ip6-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-manager.html b/docs/api/html/ref-dbus-manager.html index 70ab0b89..4b2230fd 100644 --- a/docs/api/html/ref-dbus-manager.html +++ b/docs/api/html/ref-dbus-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-settings-manager.html b/docs/api/html/ref-dbus-settings-manager.html index 5640413a..e4b8fb89 100644 --- a/docs/api/html/ref-dbus-settings-manager.html +++ b/docs/api/html/ref-dbus-settings-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-settings.html b/docs/api/html/ref-dbus-settings.html index 56d7fb20..2da4ae49 100644 --- a/docs/api/html/ref-dbus-settings.html +++ b/docs/api/html/ref-dbus-settings.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-wifi-p2p-peers.html b/docs/api/html/ref-dbus-wifi-p2p-peers.html index ecd96159..bca9f9b8 100644 --- a/docs/api/html/ref-dbus-wifi-p2p-peers.html +++ b/docs/api/html/ref-dbus-wifi-p2p-peers.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index b2bacf2e..5e7e464d 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -8,7 +8,7 @@ - + @@ -196,6 +196,6 @@

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/secret-agents.html b/docs/api/html/secret-agents.html index 63aacf05..fa1d052f 100644 --- a/docs/api/html/secret-agents.html +++ b/docs/api/html/secret-agents.html @@ -8,7 +8,7 @@ - + @@ -33,6 +33,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html index 1d59a930..66c07cef 100644 --- a/docs/api/html/secrets-flags.html +++ b/docs/api/html/secrets-flags.html @@ -8,7 +8,7 @@ - + @@ -58,6 +58,6 @@

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-6lowpan.html b/docs/api/html/settings-6lowpan.html index 7daf602d..fd163b30 100644 --- a/docs/api/html/settings-6lowpan.html +++ b/docs/api/html/settings-6lowpan.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-802-11-olpc-mesh.html b/docs/api/html/settings-802-11-olpc-mesh.html index 1dd33145..b5370389 100644 --- a/docs/api/html/settings-802-11-olpc-mesh.html +++ b/docs/api/html/settings-802-11-olpc-mesh.html @@ -8,7 +8,7 @@ - + @@ -78,6 +78,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-802-11-wireless-security.html b/docs/api/html/settings-802-11-wireless-security.html index 033d365e..d2926389 100644 --- a/docs/api/html/settings-802-11-wireless-security.html +++ b/docs/api/html/settings-802-11-wireless-security.html @@ -8,7 +8,7 @@ - + @@ -180,6 +180,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-802-11-wireless.html b/docs/api/html/settings-802-11-wireless.html index ecdbfab9..68d7e07c 100644 --- a/docs/api/html/settings-802-11-wireless.html +++ b/docs/api/html/settings-802-11-wireless.html @@ -8,7 +8,7 @@ - + @@ -180,6 +180,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-802-1x.html b/docs/api/html/settings-802-1x.html index a1f6f6cf..91015533 100644 --- a/docs/api/html/settings-802-1x.html +++ b/docs/api/html/settings-802-1x.html @@ -8,7 +8,7 @@ - + @@ -342,6 +342,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-802-3-ethernet.html b/docs/api/html/settings-802-3-ethernet.html index 3b38ba11..b743783e 100644 --- a/docs/api/html/settings-802-3-ethernet.html +++ b/docs/api/html/settings-802-3-ethernet.html @@ -8,7 +8,7 @@ - + @@ -156,6 +156,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-adsl.html b/docs/api/html/settings-adsl.html index baa6ce9c..10cdb8d2 100644 --- a/docs/api/html/settings-adsl.html +++ b/docs/api/html/settings-adsl.html @@ -8,7 +8,7 @@ - + @@ -102,6 +102,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-bluetooth.html b/docs/api/html/settings-bluetooth.html index 76216b18..91bdf443 100644 --- a/docs/api/html/settings-bluetooth.html +++ b/docs/api/html/settings-bluetooth.html @@ -8,7 +8,7 @@ - + @@ -72,6 +72,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-bond-port.html b/docs/api/html/settings-bond-port.html index 4516d8c5..6496b891 100644 --- a/docs/api/html/settings-bond-port.html +++ b/docs/api/html/settings-bond-port.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-bond.html b/docs/api/html/settings-bond.html index 77da2c93..30fc8781 100644 --- a/docs/api/html/settings-bond.html +++ b/docs/api/html/settings-bond.html @@ -8,7 +8,7 @@ - + @@ -72,6 +72,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-bridge-port.html b/docs/api/html/settings-bridge-port.html index 5c2aa4f7..7b72a526 100644 --- a/docs/api/html/settings-bridge-port.html +++ b/docs/api/html/settings-bridge-port.html @@ -8,7 +8,7 @@ - + @@ -84,6 +84,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-bridge.html b/docs/api/html/settings-bridge.html index b19b3f0f..244f728a 100644 --- a/docs/api/html/settings-bridge.html +++ b/docs/api/html/settings-bridge.html @@ -8,7 +8,7 @@ - + @@ -228,6 +228,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-cdma.html b/docs/api/html/settings-cdma.html index fb29acc4..054dee32 100644 --- a/docs/api/html/settings-cdma.html +++ b/docs/api/html/settings-cdma.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-connection.html b/docs/api/html/settings-connection.html index e9ffb05b..f8e3c6c3 100644 --- a/docs/api/html/settings-connection.html +++ b/docs/api/html/settings-connection.html @@ -8,7 +8,7 @@ - + @@ -216,6 +216,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-dcb.html b/docs/api/html/settings-dcb.html index 784cff03..b4df6ea6 100644 --- a/docs/api/html/settings-dcb.html +++ b/docs/api/html/settings-dcb.html @@ -8,7 +8,7 @@ - + @@ -150,6 +150,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-dummy.html b/docs/api/html/settings-dummy.html index d5c7d25c..027121fe 100644 --- a/docs/api/html/settings-dummy.html +++ b/docs/api/html/settings-dummy.html @@ -8,7 +8,7 @@ - + @@ -59,6 +59,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ethtool.html b/docs/api/html/settings-ethtool.html index 011f8cb5..42717eb2 100644 --- a/docs/api/html/settings-ethtool.html +++ b/docs/api/html/settings-ethtool.html @@ -8,7 +8,7 @@ - + @@ -59,6 +59,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-generic.html b/docs/api/html/settings-generic.html index 2e03accd..c6a5a552 100644 --- a/docs/api/html/settings-generic.html +++ b/docs/api/html/settings-generic.html @@ -8,7 +8,7 @@ - + @@ -59,6 +59,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-gsm.html b/docs/api/html/settings-gsm.html index a0c4cca8..682118ee 100644 --- a/docs/api/html/settings-gsm.html +++ b/docs/api/html/settings-gsm.html @@ -8,7 +8,7 @@ - + @@ -144,6 +144,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-hostname.html b/docs/api/html/settings-hostname.html index f93dd8f9..52e0d5fe 100644 --- a/docs/api/html/settings-hostname.html +++ b/docs/api/html/settings-hostname.html @@ -8,7 +8,7 @@ - + @@ -84,6 +84,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-infiniband.html b/docs/api/html/settings-infiniband.html index b14cc1c7..2d7ffa9a 100644 --- a/docs/api/html/settings-infiniband.html +++ b/docs/api/html/settings-infiniband.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ip-tunnel.html b/docs/api/html/settings-ip-tunnel.html index 4a154d49..859675bc 100644 --- a/docs/api/html/settings-ip-tunnel.html +++ b/docs/api/html/settings-ip-tunnel.html @@ -8,7 +8,7 @@ - + @@ -138,6 +138,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html index 20cd3236..f4a9c416 100644 --- a/docs/api/html/settings-ipv4.html +++ b/docs/api/html/settings-ipv4.html @@ -8,7 +8,7 @@ - + @@ -222,6 +222,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ipv6.html b/docs/api/html/settings-ipv6.html index af20a399..e0965661 100644 --- a/docs/api/html/settings-ipv6.html +++ b/docs/api/html/settings-ipv6.html @@ -8,7 +8,7 @@ - + @@ -234,6 +234,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-macsec.html b/docs/api/html/settings-macsec.html index de743ee4..27228aa6 100644 --- a/docs/api/html/settings-macsec.html +++ b/docs/api/html/settings-macsec.html @@ -8,7 +8,7 @@ - + @@ -114,6 +114,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-macvlan.html b/docs/api/html/settings-macvlan.html index b09ca148..554d61d5 100644 --- a/docs/api/html/settings-macvlan.html +++ b/docs/api/html/settings-macvlan.html @@ -8,7 +8,7 @@ - + @@ -84,6 +84,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-match.html b/docs/api/html/settings-match.html index 172d0694..20a077fc 100644 --- a/docs/api/html/settings-match.html +++ b/docs/api/html/settings-match.html @@ -8,7 +8,7 @@ - + @@ -84,6 +84,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ovs-bridge.html b/docs/api/html/settings-ovs-bridge.html index 011e49bc..9754e4bf 100644 --- a/docs/api/html/settings-ovs-bridge.html +++ b/docs/api/html/settings-ovs-bridge.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ovs-dpdk.html b/docs/api/html/settings-ovs-dpdk.html index 40b560ae..74445249 100644 --- a/docs/api/html/settings-ovs-dpdk.html +++ b/docs/api/html/settings-ovs-dpdk.html @@ -8,7 +8,7 @@ - + @@ -72,6 +72,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ovs-external-ids.html b/docs/api/html/settings-ovs-external-ids.html index 1a196728..d3f0657f 100644 --- a/docs/api/html/settings-ovs-external-ids.html +++ b/docs/api/html/settings-ovs-external-ids.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ovs-interface.html b/docs/api/html/settings-ovs-interface.html index 931527db..41f2c8a3 100644 --- a/docs/api/html/settings-ovs-interface.html +++ b/docs/api/html/settings-ovs-interface.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ovs-patch.html b/docs/api/html/settings-ovs-patch.html index c916043d..2b755089 100644 --- a/docs/api/html/settings-ovs-patch.html +++ b/docs/api/html/settings-ovs-patch.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ovs-port.html b/docs/api/html/settings-ovs-port.html index 2aa91ff7..6ca34831 100644 --- a/docs/api/html/settings-ovs-port.html +++ b/docs/api/html/settings-ovs-port.html @@ -8,7 +8,7 @@ - + @@ -96,6 +96,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-ppp.html b/docs/api/html/settings-ppp.html index 493cf752..fea6add6 100644 --- a/docs/api/html/settings-ppp.html +++ b/docs/api/html/settings-ppp.html @@ -8,7 +8,7 @@ - + @@ -168,6 +168,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-pppoe.html b/docs/api/html/settings-pppoe.html index 277dde3d..f91ed115 100644 --- a/docs/api/html/settings-pppoe.html +++ b/docs/api/html/settings-pppoe.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-proxy.html b/docs/api/html/settings-proxy.html index 1b22192b..3f5a6248 100644 --- a/docs/api/html/settings-proxy.html +++ b/docs/api/html/settings-proxy.html @@ -8,7 +8,7 @@ - + @@ -84,6 +84,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-serial.html b/docs/api/html/settings-serial.html index ff473d40..20ddfb5b 100644 --- a/docs/api/html/settings-serial.html +++ b/docs/api/html/settings-serial.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-sriov.html b/docs/api/html/settings-sriov.html index 9f7fded6..a9daf616 100644 --- a/docs/api/html/settings-sriov.html +++ b/docs/api/html/settings-sriov.html @@ -8,7 +8,7 @@ - + @@ -78,6 +78,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-tc.html b/docs/api/html/settings-tc.html index ebcf0f23..9f4d53ee 100644 --- a/docs/api/html/settings-tc.html +++ b/docs/api/html/settings-tc.html @@ -8,7 +8,7 @@ - + @@ -72,6 +72,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-team-port.html b/docs/api/html/settings-team-port.html index 7fe18f0a..dbbe038d 100644 --- a/docs/api/html/settings-team-port.html +++ b/docs/api/html/settings-team-port.html @@ -8,7 +8,7 @@ - + @@ -102,6 +102,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-team.html b/docs/api/html/settings-team.html index 99cd91ee..412c7380 100644 --- a/docs/api/html/settings-team.html +++ b/docs/api/html/settings-team.html @@ -8,7 +8,7 @@ - + @@ -162,6 +162,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-tun.html b/docs/api/html/settings-tun.html index 46e23d62..f860607c 100644 --- a/docs/api/html/settings-tun.html +++ b/docs/api/html/settings-tun.html @@ -8,7 +8,7 @@ - + @@ -96,6 +96,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-user.html b/docs/api/html/settings-user.html index 33e64f03..1c8e4626 100644 --- a/docs/api/html/settings-user.html +++ b/docs/api/html/settings-user.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-veth.html b/docs/api/html/settings-veth.html index d53121c9..ea702cc6 100644 --- a/docs/api/html/settings-veth.html +++ b/docs/api/html/settings-veth.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-vlan.html b/docs/api/html/settings-vlan.html index be1e1d1f..ef3df77d 100644 --- a/docs/api/html/settings-vlan.html +++ b/docs/api/html/settings-vlan.html @@ -8,7 +8,7 @@ - + @@ -96,6 +96,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-vpn.html b/docs/api/html/settings-vpn.html index afd1ac72..9f8d5473 100644 --- a/docs/api/html/settings-vpn.html +++ b/docs/api/html/settings-vpn.html @@ -8,7 +8,7 @@ - + @@ -96,6 +96,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-vrf.html b/docs/api/html/settings-vrf.html index 6c49c512..12ba3b34 100644 --- a/docs/api/html/settings-vrf.html +++ b/docs/api/html/settings-vrf.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-vxlan.html b/docs/api/html/settings-vxlan.html index a0ec0963..b497855d 100644 --- a/docs/api/html/settings-vxlan.html +++ b/docs/api/html/settings-vxlan.html @@ -8,7 +8,7 @@ - + @@ -156,6 +156,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-wifi-p2p.html b/docs/api/html/settings-wifi-p2p.html index 9fe0a90b..8328b1d8 100644 --- a/docs/api/html/settings-wifi-p2p.html +++ b/docs/api/html/settings-wifi-p2p.html @@ -8,7 +8,7 @@ - + @@ -78,6 +78,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-wimax.html b/docs/api/html/settings-wimax.html index d733d7fd..919bfe4e 100644 --- a/docs/api/html/settings-wimax.html +++ b/docs/api/html/settings-wimax.html @@ -8,7 +8,7 @@ - + @@ -72,6 +72,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-wireguard.html b/docs/api/html/settings-wireguard.html index 01157792..850c85ab 100644 --- a/docs/api/html/settings-wireguard.html +++ b/docs/api/html/settings-wireguard.html @@ -8,7 +8,7 @@ - + @@ -114,6 +114,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/settings-wpan.html b/docs/api/html/settings-wpan.html index b0e3b24b..474d1155 100644 --- a/docs/api/html/settings-wpan.html +++ b/docs/api/html/settings-wpan.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index fcaf67d5..8de008d9 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -8,7 +8,7 @@ - + @@ -190,6 +190,6 @@

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/html/style.css b/docs/api/html/style.css index c163abaa..2eeda1f0 100644 --- a/docs/api/html/style.css +++ b/docs/api/html/style.css @@ -461,22 +461,22 @@ span.linenos { color: inherit; background-color: transparent; padding-left: 5px; td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .hll { background-color: #ffffcc } -.c { color: #408080; font-style: italic } /* Comment */ +.c { color: #3D7B7B; font-style: italic } /* Comment */ .err { border: 1px solid #FF0000 } /* Error */ .k { color: #008000; font-weight: bold } /* Keyword */ .o { color: #666666 } /* Operator */ -.ch { color: #408080; font-style: italic } /* Comment.Hashbang */ -.cm { color: #408080; font-style: italic } /* Comment.Multiline */ -.cp { color: #BC7A00 } /* Comment.Preproc */ -.cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ -.c1 { color: #408080; font-style: italic } /* Comment.Single */ -.cs { color: #408080; font-style: italic } /* Comment.Special */ +.ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */ +.cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */ +.cp { color: #9C6500 } /* Comment.Preproc */ +.cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */ +.c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */ +.cs { color: #3D7B7B; font-style: italic } /* Comment.Special */ .gd { color: #A00000 } /* Generic.Deleted */ .ge { font-style: italic } /* Generic.Emph */ -.gr { color: #FF0000 } /* Generic.Error */ +.gr { color: #E40000 } /* Generic.Error */ .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.gi { color: #00A000 } /* Generic.Inserted */ -.go { color: #888888 } /* Generic.Output */ +.gi { color: #008400 } /* Generic.Inserted */ +.go { color: #717171 } /* Generic.Output */ .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ .gs { font-weight: bold } /* Generic.Strong */ .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ @@ -489,15 +489,15 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .kt { color: #B00040 } /* Keyword.Type */ .m { color: #666666 } /* Literal.Number */ .s { color: #BA2121 } /* Literal.String */ -.na { color: #7D9029 } /* Name.Attribute */ +.na { color: #687822 } /* Name.Attribute */ .nb { color: #008000 } /* Name.Builtin */ .nc { color: #0000FF; font-weight: bold } /* Name.Class */ .no { color: #880000 } /* Name.Constant */ .nd { color: #AA22FF } /* Name.Decorator */ -.ni { color: #999999; font-weight: bold } /* Name.Entity */ -.ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.ni { color: #717171; font-weight: bold } /* Name.Entity */ +.ne { color: #CB3F38; font-weight: bold } /* Name.Exception */ .nf { color: #0000FF } /* Name.Function */ -.nl { color: #A0A000 } /* Name.Label */ +.nl { color: #767600 } /* Name.Label */ .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ .nt { color: #008000; font-weight: bold } /* Name.Tag */ .nv { color: #19177C } /* Name.Variable */ @@ -514,11 +514,11 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .dl { color: #BA2121 } /* Literal.String.Delimiter */ .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ .s2 { color: #BA2121 } /* Literal.String.Double */ -.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */ .sh { color: #BA2121 } /* Literal.String.Heredoc */ -.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */ .sx { color: #008000 } /* Literal.String.Other */ -.sr { color: #BB6688 } /* Literal.String.Regex */ +.sr { color: #A45A77 } /* Literal.String.Regex */ .s1 { color: #BA2121 } /* Literal.String.Single */ .ss { color: #19177C } /* Literal.String.Symbol */ .bp { color: #008000 } /* Name.Builtin.Pseudo */ diff --git a/docs/api/html/vpn-plugins.html b/docs/api/html/vpn-plugins.html index 49dd5c89..9989a5bf 100644 --- a/docs/api/html/vpn-plugins.html +++ b/docs/api/html/vpn-plugins.html @@ -8,7 +8,7 @@ - + @@ -37,6 +37,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/api/version.xml b/docs/api/version.xml index c85090d6..c097b6a0 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.38.2 +1.38.4 diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in index d0ac867a..4ea9562c 100644 --- a/docs/libnm/Makefile.in +++ b/docs/libnm/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -181,6 +181,8 @@ CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -202,8 +204,10 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ELOGIND_INHIBIT_CFLAGS = @ELOGIND_INHIBIT_CFLAGS@ ELOGIND_INHIBIT_LIBS = @ELOGIND_INHIBIT_LIBS@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -590,6 +594,7 @@ DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ + $(DOC_MODULE).actions \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ $(DOC_MODULE).interfaces \ @@ -686,7 +691,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html index e587fdf9..e12e1c6f 100644 --- a/docs/libnm/html/NMAccessPoint.html +++ b/docs/libnm/html/NMAccessPoint.html @@ -8,7 +8,7 @@ - + @@ -300,7 +300,7 @@ nm_access_point_get_ssid (

Returns

the GBytes containing the SSID, or NULL if the SSID is unknown.

-

[transfer none]

+

[transfer none]

@@ -494,7 +494,7 @@ with this function.

connections

-

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection] @@ -504,13 +504,13 @@ filter.

Returns

an array of -NMConnections that could be activated with the given ap +NMConnections that could be activated with the given ap . The array should be freed with g_ptr_array_unref() when it is no longer required.

WARNING: the transfer annotation for this function may not work correctly with bindings. See https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/305. You can filter the list yourself with nm_access_point_connection_valid().

-

[transfer full][element-type NMConnection]

+

[transfer full][element-type NMConnection]

@@ -625,6 +625,6 @@ against

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html index 4bbd1472..b385dc60 100644 --- a/docs/libnm/html/NMActiveConnection.html +++ b/docs/libnm/html/NMActiveConnection.html @@ -8,7 +8,7 @@ - + @@ -278,7 +278,7 @@ nm_active_connection_get_connection (

Returns

the NMRemoteConnection which this NMActiveConnection is an active instance of.

-

[transfer none]

+

[transfer none]

@@ -529,7 +529,7 @@ nm_active_connection_get_master (

Returns

the master NMDevice of the NMActiveConnection.

-

[transfer none]

+

[transfer none]

@@ -584,7 +584,7 @@ nm_active_connection_get_ip4_config (

Returns

the IPv4 NMIPConfig, or NULL if the connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

-

[transfer none]

+

[transfer none]

@@ -614,7 +614,7 @@ nm_active_connection_get_dhcp4_config (NMDhcpConfig, or NULL if the connection does not use DHCP, or is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

-

[transfer none]

+

[transfer none]

@@ -669,7 +669,7 @@ nm_active_connection_get_ip6_config (

Returns

the IPv6 NMIPConfig, or NULL if the connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

-

[transfer none]

+

[transfer none]

@@ -699,7 +699,7 @@ nm_active_connection_get_dhcp6_config (NMDhcpConfig, or NULL if the connection does not use DHCPv6, or is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

-

[transfer none]

+

[transfer none]

@@ -829,6 +829,6 @@ nm_active_connection_get_vpn ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMCheckpoint.html b/docs/libnm/html/NMCheckpoint.html index c9283c0b..87f2a9c8 100644 --- a/docs/libnm/html/NMCheckpoint.html +++ b/docs/libnm/html/NMCheckpoint.html @@ -8,7 +8,7 @@ - + @@ -199,6 +199,6 @@ nm_checkpoint_get_rollback_timeout (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html index ab04ccfb..f74bf1f3 100644 --- a/docs/libnm/html/NMClient.html +++ b/docs/libnm/html/NMClient.html @@ -8,7 +8,7 @@ - + @@ -1104,7 +1104,7 @@ nm_dns_entry_get_interface (

Returns

the interface name.

-

[transfer none]

+

[transfer none]

Since: 1.6

@@ -1132,7 +1132,7 @@ nm_dns_entry_get_nameservers (

Returns

the list of name servers.

-

[transfer none]

+

[transfer none]

Since: 1.6

@@ -1160,7 +1160,7 @@ nm_dns_entry_get_domains (

Returns

the list of DNS domains.

-

[transfer none]

+

[transfer none]

Since: 1.6

@@ -1421,7 +1421,7 @@ automatically initialized during async/sync init.

Returns

the D-Bus connection of the client, or NULL if none is set.

-

[transfer none]

+

[transfer none]

Since: 1.22

@@ -1456,7 +1456,7 @@ the

Returns

the GMainContext of the client.

-

[transfer none]

+

[transfer none]

Since: 1.22

@@ -1506,7 +1506,7 @@ references on this object to not keep it alive longer.

you may not need to worry about these "leaks". Also, if you anyway plan to continue iterating the GMainContext afterwards, then you don't need to care when exactly NMClient is gone completely.

-

[transfer none]

+

[transfer none]

Since: 1.22

@@ -1533,7 +1533,7 @@ nm_client_get_dbus_name_owner (

Returns

the current name owner of the D-Bus service of NetworkManager.

-

[transfer none]

+

[transfer none]

Since: 1.22

@@ -1675,7 +1675,7 @@ nm_client_get_object_by_path (NMObject instance that is cached under dbus_path , or NULL if no such object exists.

-

[transfer none]

+

[transfer none]

Since: 1.24

@@ -1768,7 +1768,7 @@ The numeric values correspond to length .

-

[transfer none][array length=length]

+

[transfer none][array length=length]

Since: 1.24

@@ -2237,7 +2237,7 @@ connectivity.

Returns

the connectivity URI in use.

-

[transfer none]

+

[transfer none]

Since: 1.20

@@ -2749,7 +2749,7 @@ methods such as GPtrArray containing all the NMDevices. The returned array is owned by the NMClient object and should not be modified.

-

[transfer none][element-type NMDevice]

+

[transfer none][element-type NMDevice]

@@ -2785,7 +2785,7 @@ use device-specific methods such as GPtrArray containing all the NMDevices. The returned array is owned by the NMClient object and should not be modified.

-

[transfer none][element-type NMDevice]

+

[transfer none][element-type NMDevice]

Since: 1.2

@@ -2822,7 +2822,7 @@ nm_client_get_device_by_path (

Returns

the NMDevice for the given object_path or NULL if none is found.

-

[transfer none]

+

[transfer none]

@@ -2858,7 +2858,7 @@ nm_client_get_device_by_iface (

Returns

the NMDevice for the given iface or NULL if none is found.

-

[transfer none]

+

[transfer none]

@@ -2885,9 +2885,9 @@ nm_client_get_active_connections (

Returns

a GPtrArray -containing all the active NMActiveConnections. +containing all the active NMActiveConnections. The returned array is owned by the client and should not be modified.

-

[transfer none][element-type NMActiveConnection]

+

[transfer none][element-type NMActiveConnection]

@@ -2923,7 +2923,7 @@ non-NetworkManager-recognized device, this will return

Returns

the appropriate NMActiveConnection, if any.

-

[transfer none]

+

[transfer none]

@@ -2933,7 +2933,7 @@ any.

nm_client_get_activating_connection (NMClient *client);

Gets the NMActiveConnection corresponding to a currently-activating connection that is expected to become the new -“primary-connection” upon successful activation.

+“primary-connection” upon successful activation.

Parameters

@@ -2953,7 +2953,7 @@ currently-activating connection that is expected to become the new

Returns

the appropriate NMActiveConnection, if any.

-

[transfer none]

+

[transfer none]

@@ -2983,7 +2983,7 @@ in connection picks the best available connection for the device and activates it.

Note that the callback is invoked when NetworkManager has started activating the new connection, not when it finishes. You can use the returned -NMActiveConnection object (in particular, “state”) to +NMActiveConnection object (in particular, “state”) to track the activation to its completion.

Parameters

@@ -3081,7 +3081,7 @@ nm_client_activate_connection_finish (NMActiveConnection on success, NULL on failure, in which case error will be set.

-

[transfer full]

+

[transfer full]

@@ -3103,7 +3103,7 @@ activated as with NMActiveConnection object (in particular, “state”) to +NMActiveConnection object (in particular, “state”) to track the activation to its completion.

Parameters

@@ -3209,7 +3209,7 @@ nm_client_add_and_activate_connection_finish

the new NMActiveConnection on success, NULL on failure, in which case error will be set.

-

[transfer full]

+

[transfer full]

@@ -3232,7 +3232,7 @@ activated as with NMActiveConnection object (in particular, “state”) to +NMActiveConnection object (in particular, “state”) to track the activation to its completion.

This is identical to nm_client_add_and_activate_connection_async() but takes a further options @@ -3354,7 +3354,7 @@ nm_client_add_and_activate_connection2_finish

- +

the output result of type "a{sv}" returned by D-Bus' AddAndActivate2 call. Currently, no output is implemented yet.

[allow-none][transfer full][out][allow-none][transfer full][out]
@@ -3364,7 +3364,7 @@ output is implemented yet.

the new NMActiveConnection on success, NULL on failure, in which case error will be set.

-

[transfer full]

+

[transfer full]

@@ -3534,7 +3534,7 @@ containing all connections provided by the remote settings service. The returned array is owned by the NMClient object and should not be modified.

The connections are as received from D-Bus and might not validate according to nm_connection_verify().

-

[transfer none][element-type NMRemoteConnection]

+

[transfer none][element-type NMRemoteConnection]

@@ -3573,7 +3573,7 @@ nm_client_get_connection_by_id (

The connection is as received from D-Bus and might not validate according to nm_connection_verify().

-

[transfer none]

+

[transfer none]

@@ -3612,7 +3612,7 @@ nm_client_get_connection_by_path (

The connection is as received from D-Bus and might not validate according to nm_connection_verify().

-

[transfer none]

+

[transfer none]

@@ -3651,7 +3651,7 @@ nm_client_get_connection_by_uuid (

The connection is as received from D-Bus and might not validate according to nm_connection_verify().

-

[transfer none]

+

[transfer none]

@@ -3766,7 +3766,7 @@ nm_client_add_connection_finish (the new NMRemoteConnection on success, NULL on failure, in which case error will be set.

-

[transfer full]

+

[transfer full]

@@ -3877,7 +3877,7 @@ nm_client_add_connection2_finish (AddConnection2(). If you care about the output result, then the "ignore_out_result" parameter of nm_client_add_connection2() must not be set to TRUE.

-[allow-none][transfer full][out] +[allow-none][transfer full][out]

error

@@ -3891,7 +3891,7 @@ parameter of

Returns

on success, a pointer to the added NMRemoteConnection.

-

[transfer full]

+

[transfer full]

Since: 1.20

@@ -3943,7 +3943,7 @@ filenames that failed to load.

failures

on return, a NULL-terminated array of filenames that failed to load.

-[out][transfer full] +[out][transfer full]

cancellable

@@ -4054,7 +4054,7 @@ nm_client_load_connections_finish (

failures

on return, a NULL-terminated array of filenames that failed to load.

-[out][transfer full][array zero-terminated=1] +[out][transfer full][array zero-terminated=1]

result

@@ -4290,7 +4290,7 @@ nm_client_get_dns_configuration (NMDnsEntry elements or NULL in case the value is not available. The returned array is owned by the NMClient object and should not be modified.

-

[transfer none][element-type NMDnsEntry]

+

[transfer none][element-type NMDnsEntry]

Since: 1.6

@@ -4320,7 +4320,7 @@ nm_client_get_checkpoints (GPtrArray containing all the NMCheckpoint. The returned array is owned by the NMClient object and should not be modified.

-

[transfer none][element-type NMCheckpoint]

+

[transfer none][element-type NMCheckpoint]

Since: 1.12

@@ -4432,7 +4432,7 @@ nm_client_checkpoint_create_finish (the new NMCheckpoint on success, NULL on failure, in which case error will be set.

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -4619,7 +4619,7 @@ nm_client_checkpoint_rollback_finish (NMRollbackResult.

-

[transfer full][element-type utf8 guint32]

+

[transfer full][element-type utf8 guint32]

Since: 1.12

@@ -4951,7 +4951,7 @@ nm_client_dbus_call_finish (

Returns

the result GVariant or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.24

@@ -5560,6 +5560,6 @@ operation succeeded, but the object that was allegedly created (eg,
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html index 7112ef08..28c120c1 100644 --- a/docs/libnm/html/NMConnection.html +++ b/docs/libnm/html/NMConnection.html @@ -8,7 +8,7 @@ - + @@ -664,7 +664,7 @@ the setting object's reference count.

setting

the NMSetting to add to the connection object.

-[transfer full] +[transfer full] @@ -735,7 +735,7 @@ to the

Returns

the NMSetting, or NULL if no setting of that type was previously added to the NMConnection.

-

[transfer none]

+

[transfer none]

@@ -772,7 +772,7 @@ the

Returns

the NMSetting, or NULL if no setting with that name was previously added to the NMConnection.

-

[transfer none]

+

[transfer none]

@@ -810,7 +810,7 @@ marshalling over D-Bus or otherwise serializing.

Returns

a new floating GVariant describing the connection, its settings, and each setting's properties.

-

[transfer none]

+

[transfer none]

@@ -1182,7 +1182,7 @@ return points to an allocated NMSetting which may be required; the caller owns the array and must free the array itself with g_ptr_array_free(), but not free its elements.

-[out][element-type utf8][allow-none][transfer container] +[out][element-type utf8][allow-none][transfer container] @@ -1318,7 +1318,7 @@ failed (tried to update secrets for a setting that doesn't exist, etc)

nm_connection_set_path (NMConnection *connection, const char *path);

Sets the D-Bus path of the connection. This property is not serialized, and -is only for the reference of the caller. Sets the “path” +is only for the reference of the caller. Sets the “path” property.

Parameters

@@ -1409,7 +1409,7 @@ nm_connection_is_type (const char *type);

A convenience function to check if the given connection is a particular -type (ie wired, Wi-Fi, ppp, etc). Checks the “type” +type (ie wired, Wi-Fi, ppp, etc). Checks the “type” property of the connection and matches that against type .

@@ -1517,7 +1517,7 @@ nm_connection_get_settings (connection . If the connection has no settings, NULL is returned.

-

[array length=out_length][transfer container]

+

[array length=out_length][transfer container]

Since: 1.10

@@ -1684,7 +1684,7 @@ Eg, "VLAN (eth1.1)".

's device, or NULL if connection is not a virtual connection type.

-

[transfer full]

+

[transfer full]

@@ -1711,7 +1711,7 @@ nm_connection_get_setting_802_1x (

Returns

an NMSetting8021x if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -1738,7 +1738,7 @@ nm_connection_get_setting_bluetooth (

Returns

an NMSettingBluetooth if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -1765,7 +1765,7 @@ nm_connection_get_setting_bond (

Returns

an NMSettingBond if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -1792,7 +1792,7 @@ nm_connection_get_setting_team (

Returns

an NMSettingTeam if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -1819,7 +1819,7 @@ nm_connection_get_setting_team_port (

Returns

an NMSettingTeamPort if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -1846,7 +1846,7 @@ nm_connection_get_setting_bridge (

Returns

an NMSettingBridge if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -1873,7 +1873,7 @@ nm_connection_get_setting_bridge_port (

Returns

an NMSettingBridgePort if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -1900,7 +1900,7 @@ nm_connection_get_setting_cdma (

Returns

an NMSettingCdma if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -1927,7 +1927,7 @@ nm_connection_get_setting_connection (

Returns

an NMSettingConnection if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -1954,7 +1954,7 @@ nm_connection_get_setting_dcb (

Returns

an NMSettingDcb if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -1981,7 +1981,7 @@ nm_connection_get_setting_dummy (

Returns

an NMSettingDummy if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.8

@@ -2009,7 +2009,7 @@ nm_connection_get_setting_generic (

Returns

an NMSettingGeneric if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2036,7 +2036,7 @@ nm_connection_get_setting_gsm (

Returns

an NMSettingGsm if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2063,7 +2063,7 @@ nm_connection_get_setting_infiniband (

Returns

an NMSettingInfiniband if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2090,7 +2090,7 @@ nm_connection_get_setting_ip_tunnel (

Returns

an NMSettingIPTunnel if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -2122,7 +2122,7 @@ majority of IPv4-setting-related methods are on that type, not

Returns

an NMSettingIP4Config if the connection contains one, otherwise NULL.

-

[type NMSettingIP4Config][transfer none]

+

[type NMSettingIP4Config][transfer none]

@@ -2153,7 +2153,7 @@ majority of IPv6-setting-related methods are on that type, not

Returns

an NMSettingIP6Config if the connection contains one, otherwise NULL.

-

[type NMSettingIP6Config][transfer none]

+

[type NMSettingIP6Config][transfer none]

@@ -2180,7 +2180,7 @@ nm_connection_get_setting_macsec (

Returns

an NMSettingMacsec if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.6

@@ -2208,7 +2208,7 @@ nm_connection_get_setting_macvlan (

Returns

an NMSettingMacvlan if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -2236,7 +2236,7 @@ nm_connection_get_setting_olpc_mesh (

Returns

an NMSettingOlpcMesh if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2263,7 +2263,7 @@ nm_connection_get_setting_ovs_bridge (

Returns

an NMSettingOvsBridge if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.10

@@ -2292,7 +2292,7 @@ nm_connection_get_setting_ovs_interface

Returns

an NMSettingOvsInterface if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.10

@@ -2320,7 +2320,7 @@ nm_connection_get_setting_ovs_patch (

Returns

an NMSettingOvsPatch if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.10

@@ -2348,7 +2348,7 @@ nm_connection_get_setting_ovs_port (

Returns

an NMSettingOvsPort if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.10

@@ -2376,7 +2376,7 @@ nm_connection_get_setting_ppp (

Returns

an NMSettingPpp if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2403,7 +2403,7 @@ nm_connection_get_setting_pppoe (

Returns

an NMSettingPppoe if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2430,7 +2430,7 @@ nm_connection_get_setting_proxy (

Returns

an NMSettingProxy if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.6

@@ -2458,7 +2458,7 @@ nm_connection_get_setting_serial (

Returns

an NMSettingSerial if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2485,7 +2485,7 @@ nm_connection_get_setting_tc_config (

Returns

an NMSettingTCConfig if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.12

@@ -2513,7 +2513,7 @@ nm_connection_get_setting_tun (

Returns

an NMSettingTun if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -2541,7 +2541,7 @@ nm_connection_get_setting_vpn (

Returns

an NMSettingVpn if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2568,7 +2568,7 @@ nm_connection_get_setting_wimax (

Returns

an NMSettingWimax if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2595,7 +2595,7 @@ nm_connection_get_setting_adsl (

Returns

an NMSettingAdsl if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2622,7 +2622,7 @@ nm_connection_get_setting_wired (

Returns

an NMSettingWired if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2649,7 +2649,7 @@ nm_connection_get_setting_wireless (

Returns

an NMSettingWireless if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2677,7 +2677,7 @@ nm_connection_get_setting_wireless_security

Returns

an NMSettingWirelessSecurity if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2704,7 +2704,7 @@ nm_connection_get_setting_vlan (

Returns

an NMSettingVlan if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

@@ -2731,7 +2731,7 @@ nm_connection_get_setting_vxlan (

Returns

an NMSettingVxlan if the connection contains one, otherwise NULL.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -2912,6 +2912,6 @@ are marked as never saved. Since: 1.32.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index 655b559c..c12e7f5c 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -8,7 +8,7 @@ - + @@ -1225,7 +1225,7 @@ works with VPN connections.

Returns

the IPv4 NMIPConfig, or NULL if the device is not activated.

-

[transfer none]

+

[transfer none]

@@ -1255,7 +1255,7 @@ works with VPN connections.

Returns

the IPv4 NMDhcpConfig, or NULL if the device is not activated or not using DHCP.

-

[transfer none]

+

[transfer none]

@@ -1284,7 +1284,7 @@ works with VPN connections.

Returns

the IPv6 NMIPConfig or NULL if the device is not activated.

-

[transfer none]

+

[transfer none]

@@ -1314,7 +1314,7 @@ works with VPN connections.

Returns

the IPv6 NMDhcpConfig, or NULL if the device is not activated or not using DHCPv6.

-

[transfer none]

+

[transfer none]

@@ -1431,7 +1431,7 @@ nm_device_get_active_connection (

Returns

the NMActiveConnection or NULL if the device is not part of an active connection.

-

[transfer none]

+

[transfer none]

@@ -1439,7 +1439,7 @@ not part of an active connection.

nm_device_get_available_connections ()

const GPtrArray *
 nm_device_get_available_connections (NMDevice *device);
-

Gets the NMRemoteConnections currently known to the daemon that could +

Gets the NMRemoteConnections currently known to the daemon that could be activated on device .

@@ -1460,7 +1460,7 @@ be activated on device

Returns

the GPtrArray -containing NMRemoteConnections. This is the internal copy used by +containing NMRemoteConnections. This is the internal copy used by the connection, and must not be modified.

[element-type NMRemoteConnection]

@@ -1546,7 +1546,7 @@ nm_device_is_real (

Returns

TRUE if the device exists, or FALSE if it is a placeholder device that could be automatically created by NetworkManager if one of its -“available-connections” was activated.

+“available-connections” was activated.

Since: 1.2

@@ -1718,7 +1718,7 @@ nm_device_get_lldp_neighbors (NMLldpNeighbors. This is the internal copy used by the device and must not be modified. The library never modifies the returned array and thus it is safe for callers to reference and keep using it.

-

[element-type NMLldpNeighbor][transfer none]

+

[element-type NMLldpNeighbor][transfer none]

Since: 1.2

@@ -1784,7 +1784,7 @@ devices in devices

Returns

the device names.

-

[transfer full][array zero-terminated=1]

+

[transfer full][array zero-terminated=1]

@@ -2022,7 +2022,7 @@ the applied connection.

or NULL on error.

The connection is as received from D-Bus and might not validate according to nm_connection_verify().

-

[transfer full]

+

[transfer full]

Since: 1.2

@@ -2126,7 +2126,7 @@ connection.

of error.

The connection is as received from D-Bus and might not validate according to nm_connection_verify().

-

[transfer full]

+

[transfer full]

Since: 1.2

@@ -2425,7 +2425,7 @@ incompatible with the device. To get the full list of connections see

connections

-

an array of NMConnections to filter.

+

an array of NMConnections to filter.

[element-type NMConnection] @@ -2434,13 +2434,13 @@ incompatible with the device. To get the full list of connections see

Returns

an array of -NMConnections that could be activated with the given device +NMConnections that could be activated with the given device . The array should be freed with g_ptr_array_unref() when it is no longer required.

WARNING: the transfer annotation for this function may not work correctly with bindings. See https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/305. You can filter the list yourself with nm_device_connection_valid().

-

[transfer full][element-type NMConnection]

+

[transfer full][element-type NMConnection]

@@ -2643,7 +2643,7 @@ nm_lldp_neighbor_get_attr_names (

Returns

a NULL-terminated array of attribute names.

-

[transfer full]

+

[transfer full]

Since: 1.2

@@ -2683,7 +2683,7 @@ nm_lldp_neighbor_get_attr_value (the value or NULL if the attribute with name was not found.

-

[transfer none]

+

[transfer none]

Since: 1.18

@@ -2702,7 +2702,7 @@ actually modify the (empty) instance.

Returns

the new NMLldpNeighbor object.

-

[transfer full]

+

[transfer full]

Since: 1.2

@@ -2739,7 +2739,7 @@ nm_lldp_neighbor_get_attr_string_value

out_value

on return, the attribute value.

-[out][allow-none][transfer none] +[out][allow-none][transfer none] @@ -3112,6 +3112,6 @@ all the VLANs.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDevice6Lowpan.html b/docs/libnm/html/NMDevice6Lowpan.html index d5d37721..e111db8f 100644 --- a/docs/libnm/html/NMDevice6Lowpan.html +++ b/docs/libnm/html/NMDevice6Lowpan.html @@ -8,7 +8,7 @@ - + @@ -104,7 +104,7 @@ nm_device_6lowpan_get_parent (

Returns

the device's parent device.

-

[transfer none]

+

[transfer none]

Since: 1.14

@@ -132,6 +132,6 @@ NM_DEPRECATED_IN_1_24_FOR ();
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceAdsl.html b/docs/libnm/html/NMDeviceAdsl.html index 0e8a73ae..b314c32e 100644 --- a/docs/libnm/html/NMDeviceAdsl.html +++ b/docs/libnm/html/NMDeviceAdsl.html @@ -8,7 +8,7 @@ - + @@ -102,6 +102,6 @@ nm_device_adsl_get_carrier ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html index e8e145c0..5113d883 100644 --- a/docs/libnm/html/NMDeviceBond.html +++ b/docs/libnm/html/NMDeviceBond.html @@ -8,7 +8,7 @@ - + @@ -207,6 +207,6 @@ copy used by the device, and must not be modified.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html index c0832466..50e2a4cb 100644 --- a/docs/libnm/html/NMDeviceBridge.html +++ b/docs/libnm/html/NMDeviceBridge.html @@ -8,7 +8,7 @@ - + @@ -207,6 +207,6 @@ copy used by the device, and must not be modified.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html index 576f152c..203f66f0 100644 --- a/docs/libnm/html/NMDeviceBt.html +++ b/docs/libnm/html/NMDeviceBt.html @@ -8,7 +8,7 @@ - + @@ -198,6 +198,6 @@ nm_device_bt_get_capabilities (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceDummy.html b/docs/libnm/html/NMDeviceDummy.html index 6b20f59d..0ec953c8 100644 --- a/docs/libnm/html/NMDeviceDummy.html +++ b/docs/libnm/html/NMDeviceDummy.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@ NM_DEPRECATED_IN_1_24_FOR ();
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceEthernet.html b/docs/libnm/html/NMDeviceEthernet.html index 69c6b370..8d4f2afe 100644 --- a/docs/libnm/html/NMDeviceEthernet.html +++ b/docs/libnm/html/NMDeviceEthernet.html @@ -8,7 +8,7 @@ - + @@ -252,7 +252,7 @@ nm_device_ethernet_get_s390_subchannels

Returns

array of strings, each specifying one subchannel the s390 device uses to communicate to the host.

-

[transfer none][element-type utf8]

+

[transfer none][element-type utf8]

Since: 1.2

@@ -291,6 +291,6 @@ one subchannel the s390 device uses to communicate to the host.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceGeneric.html b/docs/libnm/html/NMDeviceGeneric.html index ad57f2be..3adb4419 100644 --- a/docs/libnm/html/NMDeviceGeneric.html +++ b/docs/libnm/html/NMDeviceGeneric.html @@ -8,7 +8,7 @@ - + @@ -119,6 +119,6 @@ device, and must not be modified.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceIPTunnel.html b/docs/libnm/html/NMDeviceIPTunnel.html index b4fa2952..fcc97c2a 100644 --- a/docs/libnm/html/NMDeviceIPTunnel.html +++ b/docs/libnm/html/NMDeviceIPTunnel.html @@ -8,7 +8,7 @@ - + @@ -220,7 +220,7 @@ nm_device_ip_tunnel_get_parent (

Returns

the device's parent device.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -590,6 +590,6 @@ nm_device_ip_tunnel_get_flags (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceInfiniband.html b/docs/libnm/html/NMDeviceInfiniband.html index 6e035cc3..2be02c05 100644 --- a/docs/libnm/html/NMDeviceInfiniband.html +++ b/docs/libnm/html/NMDeviceInfiniband.html @@ -8,7 +8,7 @@ - + @@ -155,6 +155,6 @@ nm_device_infiniband_get_carrier (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceMacsec.html b/docs/libnm/html/NMDeviceMacsec.html index e8b49b95..b5bc353a 100644 --- a/docs/libnm/html/NMDeviceMacsec.html +++ b/docs/libnm/html/NMDeviceMacsec.html @@ -8,7 +8,7 @@ - + @@ -247,7 +247,7 @@ nm_device_macsec_get_parent (

Returns

the device's parent device.

-

[transfer none]

+

[transfer none]

Since: 1.6

@@ -676,6 +676,6 @@ nm_device_macsec_get_replay_protect (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceMacvlan.html b/docs/libnm/html/NMDeviceMacvlan.html index 21dd5f5d..70be76fa 100644 --- a/docs/libnm/html/NMDeviceMacvlan.html +++ b/docs/libnm/html/NMDeviceMacvlan.html @@ -8,7 +8,7 @@ - + @@ -139,7 +139,7 @@ nm_device_macvlan_get_parent (

Returns

the device's parent device.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -267,6 +267,6 @@ NM_DEPRECATED_IN_1_24_FOR ();
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceModem.html b/docs/libnm/html/NMDeviceModem.html index af31343d..3bc2f5c1 100644 --- a/docs/libnm/html/NMDeviceModem.html +++ b/docs/libnm/html/NMDeviceModem.html @@ -8,7 +8,7 @@ - + @@ -291,6 +291,6 @@ nm_device_modem_get_apn ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html index d1c9e9e5..e005a5b4 100644 --- a/docs/libnm/html/NMDeviceOlpcMesh.html +++ b/docs/libnm/html/NMDeviceOlpcMesh.html @@ -8,7 +8,7 @@ - + @@ -148,7 +148,7 @@ nm_device_olpc_mesh_get_companion (

Returns

the companion of the device of NULL.

-

[transfer none]

+

[transfer none]

@@ -201,6 +201,6 @@ nm_device_olpc_mesh_get_active_channel
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceOvsBridge.html b/docs/libnm/html/NMDeviceOvsBridge.html index 00799da2..e88a734d 100644 --- a/docs/libnm/html/NMDeviceOvsBridge.html +++ b/docs/libnm/html/NMDeviceOvsBridge.html @@ -8,7 +8,7 @@ - + @@ -111,6 +111,6 @@ copy used by the device, and must not be modified.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceOvsInterface.html b/docs/libnm/html/NMDeviceOvsInterface.html index 407048ff..e629de36 100644 --- a/docs/libnm/html/NMDeviceOvsInterface.html +++ b/docs/libnm/html/NMDeviceOvsInterface.html @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceOvsPort.html b/docs/libnm/html/NMDeviceOvsPort.html index 965f2099..faa9abfc 100644 --- a/docs/libnm/html/NMDeviceOvsPort.html +++ b/docs/libnm/html/NMDeviceOvsPort.html @@ -8,7 +8,7 @@ - + @@ -111,6 +111,6 @@ copy used by the device, and must not be modified.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDevicePpp.html b/docs/libnm/html/NMDevicePpp.html index 8485b5d4..0dfb0074 100644 --- a/docs/libnm/html/NMDevicePpp.html +++ b/docs/libnm/html/NMDevicePpp.html @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html index fb195140..f37b15aa 100644 --- a/docs/libnm/html/NMDeviceTeam.html +++ b/docs/libnm/html/NMDeviceTeam.html @@ -8,7 +8,7 @@ - + @@ -252,6 +252,6 @@ device, and must not be modified.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceTun.html b/docs/libnm/html/NMDeviceTun.html index 2cd9edc2..9d41ed96 100644 --- a/docs/libnm/html/NMDeviceTun.html +++ b/docs/libnm/html/NMDeviceTun.html @@ -8,7 +8,7 @@ - + @@ -335,6 +335,6 @@ nm_device_tun_get_multi_queue (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceVeth.html b/docs/libnm/html/NMDeviceVeth.html index d972fb70..dd03515c 100644 --- a/docs/libnm/html/NMDeviceVeth.html +++ b/docs/libnm/html/NMDeviceVeth.html @@ -8,7 +8,7 @@ - + @@ -88,7 +88,7 @@ nm_device_veth_get_peer (

Returns

the device's peer device.

-

[transfer none]

+

[transfer none]

Since: 1.30

@@ -103,6 +103,6 @@ nm_device_veth_get_peer ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceVlan.html b/docs/libnm/html/NMDeviceVlan.html index 301fc988..463b4216 100644 --- a/docs/libnm/html/NMDeviceVlan.html +++ b/docs/libnm/html/NMDeviceVlan.html @@ -8,7 +8,7 @@ - + @@ -185,7 +185,7 @@ nm_device_vlan_get_parent (

Returns

the device's parent device.

-

[transfer none]

+

[transfer none]

@@ -242,6 +242,6 @@ nm_device_vlan_get_vlan_id ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceVrf.html b/docs/libnm/html/NMDeviceVrf.html index 8681e7f7..8eef1ea5 100644 --- a/docs/libnm/html/NMDeviceVrf.html +++ b/docs/libnm/html/NMDeviceVrf.html @@ -8,7 +8,7 @@ - + @@ -102,6 +102,6 @@ nm_device_vrf_get_table ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html index 62c1fba9..745d07a3 100644 --- a/docs/libnm/html/NMDeviceVxlan.html +++ b/docs/libnm/html/NMDeviceVxlan.html @@ -8,7 +8,7 @@ - + @@ -328,7 +328,7 @@ nm_device_vxlan_get_parent (

Returns

the device's parent device.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -837,6 +837,6 @@ nm_device_vxlan_get_l3miss ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html index 3d28400e..4654723b 100644 --- a/docs/libnm/html/NMDeviceWifi.html +++ b/docs/libnm/html/NMDeviceWifi.html @@ -8,7 +8,7 @@ - + @@ -361,7 +361,7 @@ nm_device_wifi_get_active_access_point

Returns

the access point or NULL if none is active.

-

[transfer none]

+

[transfer none]

@@ -397,7 +397,7 @@ nm_device_wifi_get_access_point_by_path

Returns

the access point or NULL if none is found.

-

[transfer none]

+

[transfer none]

@@ -424,7 +424,7 @@ nm_device_wifi_get_access_points (

Returns

a GPtrArray containing all the -scanned NMAccessPoints. +scanned NMAccessPoints. The returned array is owned by the client and should not be modified.

[element-type NMAccessPoint]

@@ -775,6 +775,6 @@ set.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceWifiP2P.html b/docs/libnm/html/NMDeviceWifiP2P.html index 3ccd1f7a..eaccdedf 100644 --- a/docs/libnm/html/NMDeviceWifiP2P.html +++ b/docs/libnm/html/NMDeviceWifiP2P.html @@ -8,7 +8,7 @@ - + @@ -163,7 +163,7 @@ nm_device_wifi_p2p_get_peer_by_path (

Returns

the peer or NULL if none is found.

-

[transfer none]

+

[transfer none]

Since: 1.16

@@ -191,7 +191,7 @@ nm_device_wifi_p2p_get_peers (

Returns

a GPtrArray containing all the -found NMWifiP2PPeers. +found NMWifiP2PPeers. The returned array is owned by the client and should not be modified.

[element-type NMWifiP2PPeer]

@@ -402,6 +402,6 @@ nm_device_wifi_p2p_stop_find_finish (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html index 71044299..f863b3d3 100644 --- a/docs/libnm/html/NMDeviceWimax.html +++ b/docs/libnm/html/NMDeviceWimax.html @@ -8,7 +8,7 @@ - + @@ -217,7 +217,7 @@ nm_device_wimax_get_active_nsp (

Returns

the access point or NULL if none is active.

-

[transfer full]

+

[transfer full]

@@ -256,7 +256,7 @@ nm_device_wimax_get_nsp_by_path (

Returns

the access point or NULL if none is found.

-

[transfer none]

+

[transfer none]

@@ -287,7 +287,7 @@ nm_device_wimax_get_nsps (

Returns

a GPtrArray containing -all the scanned NMWimaxNsps. +all the scanned NMWimaxNsps. The returned array is owned by the client and should not be modified.

[element-type NMWimaxNsp]

@@ -504,6 +504,6 @@ nm_device_wimax_get_bsid ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceWireGuard.html b/docs/libnm/html/NMDeviceWireGuard.html index 8e87bc77..f31103fb 100644 --- a/docs/libnm/html/NMDeviceWireGuard.html +++ b/docs/libnm/html/NMDeviceWireGuard.html @@ -8,7 +8,7 @@ - + @@ -117,7 +117,7 @@ nm_device_wireguard_get_public_key (

Returns

the GBytes containing the 32-byte public key.

-

[transfer none]

+

[transfer none]

Since: 1.14

@@ -200,6 +200,6 @@ See: ip-rule(8)

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceWpan.html b/docs/libnm/html/NMDeviceWpan.html index 080a6dd7..5455ddf7 100644 --- a/docs/libnm/html/NMDeviceWpan.html +++ b/docs/libnm/html/NMDeviceWpan.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@ NM_DEPRECATED_IN_1_24_FOR ();
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html index f4cc1bd4..d0b57743 100644 --- a/docs/libnm/html/NMDhcpConfig.html +++ b/docs/libnm/html/NMDhcpConfig.html @@ -8,7 +8,7 @@ - + @@ -141,7 +141,7 @@ nm_dhcp_config_get_options (GHashTable containing strings for keys and values. This is the internal copy used by the configuration, and must not be modified.

-

[transfer none][element-type utf8 utf8]

+

[transfer none][element-type utf8 utf8]

@@ -196,6 +196,6 @@ configuration, and must not be modified.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html index b3d4adbf..2c9c22b6 100644 --- a/docs/libnm/html/NMIPConfig.html +++ b/docs/libnm/html/NMIPConfig.html @@ -8,7 +8,7 @@ - + @@ -199,7 +199,7 @@ nm_ip_config_get_gateway (

Returns

the IP address of the gateway.

-

[transfer none]

+

[transfer none]

@@ -229,7 +229,7 @@ nm_ip_config_get_addresses (NMIPAddresses. This is the internal copy used by the configuration and must not be modified. The library never modifies the returned array and thus it is safe for callers to reference and keep using it.

-

[element-type NMIPAddress][transfer none]

+

[element-type NMIPAddress][transfer none]

@@ -259,7 +259,7 @@ nm_ip_config_get_routes (NMIPRoutes. This is the internal copy used by the configuration, and must not be modified. The library never modifies the returned array and thus it is safe for callers to reference and keep using it.

-

[element-type NMIPRoute][transfer none]

+

[element-type NMIPRoute][transfer none]

@@ -286,7 +286,7 @@ nm_ip_config_get_nameservers (

Returns

the array of nameserver IP addresses.

-

[transfer none]

+

[transfer none]

@@ -314,7 +314,7 @@ nm_ip_config_get_domains (

Returns

the array of domains. (This is never NULL, though it may be 0-length).

-

[transfer none]

+

[transfer none]

@@ -342,7 +342,7 @@ nm_ip_config_get_searches (

Returns

the array of DNS search strings. (This is never NULL, though it may be 0-length).

-

[transfer none]

+

[transfer none]

@@ -370,7 +370,7 @@ nm_ip_config_get_wins_servers (

Returns

the arry of WINS server IP address strings. (This is never NULL, though it may be 0-length.).

-

[transfer none]

+

[transfer none]

@@ -426,6 +426,6 @@ nm_ip_config_get_wins_servers (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html index 19e4fd94..12dd2b28 100644 --- a/docs/libnm/html/NMObject.html +++ b/docs/libnm/html/NMObject.html @@ -8,7 +8,7 @@ - + @@ -139,7 +139,7 @@ object is still alive.

the NMClient cache in which the object can be found, or NULL if the object is no longer cached.

-

[transfer none]

+

[transfer none]

Since: 1.24

@@ -160,6 +160,6 @@ cached.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html index 84980e94..f589f9ed 100644 --- a/docs/libnm/html/NMRemoteConnection.html +++ b/docs/libnm/html/NMRemoteConnection.html @@ -8,7 +8,7 @@ - + @@ -327,7 +327,7 @@ nm_remote_connection_update2_finish (

Returns

on success, a GVariant of type "a{sv}" with the result. On failure, NULL.

-

[transfer full]

+

[transfer full]

@@ -793,7 +793,7 @@ not a simple property accessor.

a GVariant of type NM_VARIANT_TYPE_CONNECTION containing connection 's secrets, or NULL on error.

-

[transfer full]

+

[transfer full]

@@ -887,7 +887,7 @@ nm_remote_connection_get_secrets_finish

a GVariant of type NM_VARIANT_TYPE_CONNECTION containing connection 's secrets, or NULL on error.

-

[transfer full]

+

[transfer full]

@@ -1044,6 +1044,6 @@ user, -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html index e5405a7a..9bfcb04a 100644 --- a/docs/libnm/html/NMSecretAgentOld.html +++ b/docs/libnm/html/NMSecretAgentOld.html @@ -8,7 +8,7 @@ - + @@ -323,22 +323,22 @@ something like this:

14 15 16 - 
NMConnection *secrets;
-NMSettingWirelessSecurity *s_wsec;
-GVariant *secrets_dict;
+        
NMConnection *secrets;
+NMSettingWirelessSecurity *s_wsec;
+GVariant *secrets_dict;
 
-secrets = nm_simple_connection_new ();
-s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
-g_object_set (G_OBJECT (s_wsec),
-              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
-              NULL);
-nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
-secrets_dict = nm_connection_to_dbus (secrets, NM_CONNECTION_SERIALIZE_ALL);
+secrets = nm_simple_connection_new ();
+s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
+g_object_set (G_OBJECT (s_wsec),
+              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
+              NULL);
+nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
+secrets_dict = nm_connection_to_dbus (secrets, NM_CONNECTION_SERIALIZE_ALL);
 
-(call the NMSecretAgentOldGetSecretsFunc with secrets_dict)
+(call the NMSecretAgentOldGetSecretsFunc with secrets_dict)
 
-g_object_unref (secrets);
-g_variant_unref (secrets_dict);

+g_object_unref (secrets);
+g_variant_unref (secrets_dict);
@@ -365,7 +365,7 @@ something like this:

note that this object will be unrefed after the callback has returned, use g_object_ref()/g_object_unref() if you want to use this object after the callback has returned.

-[transfer none] +[transfer none]

secrets

@@ -422,7 +422,7 @@ should be called.

note that this object will be unrefed after the callback has returned, use g_object_ref()/g_object_unref() if you want to use this object after the callback has returned.

-[transfer none] +[transfer none]

error

@@ -469,7 +469,7 @@ should be called.

note that this object will be unrefed after the callback has returned, use g_object_ref()/g_object_unref() if you want to use this object after the callback has returned.

-[transfer none] +[transfer none]

error

@@ -511,7 +511,7 @@ nm_secret_agent_old_get_dbus_connection

the GDBusConnection used by the secret agent. You may either set this as construct property NM_SECRET_AGENT_OLD_DBUS_CONNECTION, or it will automatically set during initialization.

-

[transfer none]

+

[transfer none]

Since: 1.24

@@ -540,7 +540,7 @@ nm_secret_agent_old_get_main_context (GMainContext instance associate with the instance. This is the g_main_context_get_thread_default() at the time when creating the instance.

-

[transfer none]

+

[transfer none]

Since: 1.24

@@ -579,7 +579,7 @@ that all remains are cleaned up.

a GObject that you may register a weak pointer to know that the GMainContext is still kept busy by self .

-

[transfer none]

+

[transfer none]

Since: 1.24

@@ -1152,6 +1152,6 @@ of 3 characters. An example valid identifier is 'org.gnome.nm-applet'
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html index d7b87b47..36675132 100644 --- a/docs/libnm/html/NMSetting.html +++ b/docs/libnm/html/NMSetting.html @@ -8,7 +8,7 @@ - + @@ -440,7 +440,7 @@ nm_setting_duplicate (

Returns

a new NMSetting containing the same properties and values as the source NMSetting.

-

[transfer full]

+

[transfer full]

@@ -659,7 +659,7 @@ settings differ, on return a hash table mapping the differing keys to one or more NMSettingDiffResult values OR-ed together. If the settings do not differ, any hash table passed in is unmodified. If no hash table is passed in and the settings differ, a new one is created and returned.

-[inout][transfer full][element-type utf8 guint32] +[inout][transfer full][element-type utf8 guint32] @@ -866,7 +866,7 @@ nm_setting_option_get (

Returns

the GVariant or NULL if the option is not set.

-

[transfer none]

+

[transfer none]

Since: 1.26.

@@ -1097,7 +1097,7 @@ nm_setting_option_get_all_names (A NULL terminated array of key names. If no names are present, this returns NULL. The returned array and the names are owned by NMSetting and might be invalidated by the next operation.

-

[array length=out_len zero-terminated=1][transfer none]

+

[array length=out_len zero-terminated=1][transfer none]

Since: 1.26

@@ -1458,6 +1458,6 @@ if you specify NM_SETTING_COMPARE_FLAG_DIFF_RESULT_W
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSetting6Lowpan.html b/docs/libnm/html/NMSetting6Lowpan.html index a00b307f..f179af2b 100644 --- a/docs/libnm/html/NMSetting6Lowpan.html +++ b/docs/libnm/html/NMSetting6Lowpan.html @@ -8,7 +8,7 @@ - + @@ -91,7 +91,7 @@ nm_setting_6lowpan_new (void

Returns

the new empty NMSetting6Lowpan object.

-

[transfer full]

+

[transfer full]

Since: 1.14

@@ -138,6 +138,6 @@ nm_setting_6lowpan_get_parent (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html index da4624a4..c79db83f 100644 --- a/docs/libnm/html/NMSetting8021x.html +++ b/docs/libnm/html/NMSetting8021x.html @@ -8,7 +8,7 @@ - + @@ -1106,7 +1106,7 @@ nm_setting_802_1x_get_eap_method (NMSetting8021x *setting, const char *eap);

Adds an allowed EAP method. The setting is not valid until at least one -EAP method has been added. See “eap” property for a list of +EAP method has been added. See “eap” property for a list of allowed EAP methods.

Parameters

@@ -1259,7 +1259,7 @@ nm_setting_802_1x_get_anonymous_identity (NMSetting8021x *setting);

Returns the anonymous identifier used by some EAP methods (like TTLS) to authenticate the user in the outer unencrypted "phase 1" authentication. The -inner "phase 2" authentication will use the “identity” in +inner "phase 2" authentication will use the “identity” in a secure form, if applicable for that EAP method.

Parameters

@@ -1312,9 +1312,9 @@ nm_setting_802_1x_get_pac_file (

nm_setting_802_1x_get_system_ca_certs ()

gboolean
 nm_setting_802_1x_get_system_ca_certs (NMSetting8021x *setting);
-

Sets the “system-ca-certs” property. The -“ca-path” and “phase2-ca-path” -properties are ignored if the “system-ca-certs” property is +

Sets the “system-ca-certs” property. The +“ca-path” and “phase2-ca-path” +properties are ignored if the “system-ca-certs” property is TRUE, in which case a system-wide CA certificate directory specified at compile time (using the --system-ca-path configure option) is used in place of these properties.

@@ -1346,7 +1346,7 @@ nm_setting_802_1x_get_ca_path (Returns the path of the CA certificate directory if previously set. Systems will often have a directory that contains multiple individual CA certificates which the supplicant can then add to the verification chain. This may be -used in addition to the “ca-cert” property to add more CA +used in addition to the “ca-cert” property to add more CA certificates for verifying the network to client.

Parameters

@@ -1376,7 +1376,7 @@ nm_setting_802_1x_get_phase2_ca_path (“phase2-ca-cert” property +This may be used in addition to the “phase2-ca-cert” property to add more CA certificates for verifying the network to client.

Parameters

@@ -1456,7 +1456,7 @@ of the network cannot be confirmed by the client.

Returns

the CA certificate data.

-

[transfer none]

+

[transfer none]

@@ -1531,7 +1531,7 @@ nm_setting_802_1x_set_ca_cert (NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); -

Reads a certificate from disk and sets the “ca-cert” property +

Reads a certificate from disk and sets the “ca-cert” property with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

@@ -1606,7 +1606,7 @@ nm_setting_802_1x_get_ca_cert_password

Returns

the password used to access the CA certificate stored in -“ca-cert” property. Only makes sense if the certificate +“ca-cert” property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

Since: 1.8

@@ -1661,7 +1661,7 @@ nm_setting_802_1x_get_subject_match (

Returns

-

the “subject-match” property. This is the +

the “subject-match” property. This is the substring to be matched against the subject of the authentication server certificate, or NULL no subject verification is to be performed.

@@ -1674,7 +1674,7 @@ performed.

nm_setting_802_1x_get_num_altsubject_matches (NMSetting8021x *setting);

Returns the number of entries in the -“altsubject-matches” property of this setting.

+“altsubject-matches” property of this setting.

Parameters

@@ -1971,7 +1971,7 @@ authentication method.

Returns

the client certificate data.

-

[transfer none]

+

[transfer none]

@@ -2044,7 +2044,7 @@ nm_setting_802_1x_set_client_cert (NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); -

Reads a certificate from disk and sets the “client-cert” +

Reads a certificate from disk and sets the “client-cert” property with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

@@ -2123,7 +2123,7 @@ nm_setting_802_1x_get_client_cert_password

Returns

the password used to access the client certificate stored in -“client-cert” property. Only makes sense if the certificate +“client-cert” property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

Since: 1.8

@@ -2179,7 +2179,7 @@ nm_setting_802_1x_get_phase1_peapver (

Returns

the "phase 1" PEAP version to be used when authenticating with -EAP-PEAP as contained in the “phase1-peapver” property. Valid +EAP-PEAP as contained in the “phase1-peapver” property. Valid values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).

@@ -2208,7 +2208,7 @@ nm_setting_802_1x_get_phase1_peaplabel

Returns

whether the "phase 1" PEAP label is new-style or old-style, to be used when authenticating with EAP-PEAP, as contained in the -“phase1-peaplabel” property. Valid values are NULL (unset), +“phase1-peaplabel” property. Valid values are NULL (unset), "0" (use old-style label), and "1" (use new-style label). See the wpa_supplicant documentation for more details.

@@ -2237,7 +2237,7 @@ nm_setting_802_1x_get_phase1_fast_provisioning

Returns

whether "phase 1" PEAP fast provisioning should be used, as specified -by the “phase1-fast-provisioning” property. See the +by the “phase1-fast-provisioning” property. See the wpa_supplicant documentation for more details.

@@ -2264,7 +2264,7 @@ nm_setting_802_1x_get_phase2_auth (

Returns

the "phase 2" non-EAP (ex MD5) allowed authentication method as -specified by the “phase2-auth” property.

+specified by the “phase2-auth” property.

@@ -2290,7 +2290,7 @@ nm_setting_802_1x_get_phase2_autheap (

Returns

the "phase 2" EAP-based (ex TLS) allowed authentication method as -specified by the “phase2-autheap” property.

+specified by the “phase2-autheap” property.

@@ -2354,7 +2354,7 @@ of the network cannot be confirmed by the client.

Returns

the "phase 2" CA certificate data.

-

[transfer none]

+

[transfer none]

@@ -2431,7 +2431,7 @@ nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); -

Reads a certificate from disk and sets the “phase2-ca-cert” +

Reads a certificate from disk and sets the “phase2-ca-cert” property with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

@@ -2506,7 +2506,7 @@ nm_setting_802_1x_get_phase2_ca_cert_password

Returns

the password used to access the "phase2" CA certificate stored in -“phase2-ca-cert” property. Only makes sense if the certificate +“phase2-ca-cert” property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

Since: 1.8

@@ -2535,7 +2535,7 @@ nm_setting_802_1x_get_phase2_ca_cert_password_flags

Returns

the NMSettingSecretFlags pertaining to the -“phase2-private-key-password”

+“phase2-private-key-password”

Since: 1.8

@@ -2562,7 +2562,7 @@ nm_setting_802_1x_get_phase2_subject_match

Returns

-

the “phase2-subject-match” property. This is +

the “phase2-subject-match” property. This is the substring to be matched against the subject of the "phase 2" authentication server certificate, or NULL no subject verification is to be performed.

@@ -2575,7 +2575,7 @@ is to be performed.

nm_setting_802_1x_get_num_phase2_altsubject_matches (NMSetting8021x *setting);

Returns the number of entries in the -“phase2-altsubject-matches” property of this setting.

+“phase2-altsubject-matches” property of this setting.

Parameters

@@ -2877,7 +2877,7 @@ authentication method.

Returns

the "phase 2" client certificate data.

-

[transfer none]

+

[transfer none]

@@ -2952,7 +2952,7 @@ nm_setting_802_1x_set_phase2_client_cert NMSetting8021xCKScheme scheme, NMSetting8021xCKFormat *out_format, GError **error); -

Reads a certificate from disk and sets the “phase2-client-cert” +

Reads a certificate from disk and sets the “phase2-client-cert” property with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

@@ -3031,7 +3031,7 @@ nm_setting_802_1x_get_phase2_client_cert_password

Returns

the password used to access the "phase2" client certificate stored in -“phase2-client-cert” property. Only makes sense if the certificate +“phase2-client-cert” property. Only makes sense if the certificate is stored on a PKCS#11 token that requires a login.

Since: 1.8

@@ -3087,7 +3087,7 @@ nm_setting_802_1x_get_password (

Returns

the password used by the authentication method, if any, as specified -by the “password” property

+by the “password” property

@@ -3112,7 +3112,7 @@ nm_setting_802_1x_get_password_flags (

Returns

-

the NMSettingSecretFlags pertaining to the “password”

+

the NMSettingSecretFlags pertaining to the “password”

@@ -3139,8 +3139,8 @@ nm_setting_802_1x_get_password_raw (

Returns

the password used by the authentication method as a UTF-8-encoded array of bytes, as specified by the -“password-raw” property.

-

[transfer none]

+“password-raw” property.

+

[transfer none]

@@ -3167,7 +3167,7 @@ nm_setting_802_1x_get_password_raw_flags

Returns

the NMSettingSecretFlags pertaining to the -“password-raw”

+“password-raw”

@@ -3193,7 +3193,7 @@ nm_setting_802_1x_get_pin (

Returns

the PIN used by the authentication method, if any, as specified -by the “pin” property

+by the “pin” property

@@ -3219,7 +3219,7 @@ nm_setting_802_1x_get_pin_flags (

Returns

the NMSettingSecretFlags pertaining to the -“pin”

+“pin”

@@ -3285,7 +3285,7 @@ keys should always be encrypted with a private key password.

Returns

the private key data.

-

[transfer none]

+

[transfer none]

@@ -3363,14 +3363,14 @@ nm_setting_802_1x_set_private_key (

This function reads a private key from disk and sets the -“private-key” property with the private key file data if using +“private-key” property with the private key file data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

If password is given, this function attempts to decrypt the private key to verify that password is correct, and if it is, updates the -“private-key-password” property with the given password +“private-key-password” property with the given password . If the decryption is unsuccessful, FALSE is returned, error is set, and no @@ -3461,7 +3461,7 @@ nm_setting_802_1x_get_private_key_password

Returns

the private key password used to decrypt the private key if previously set with nm_setting_802_1x_set_private_key(), or the -“private-key-password” property.

+“private-key-password” property.

@@ -3488,7 +3488,7 @@ nm_setting_802_1x_get_private_key_password_flags

Returns

the NMSettingSecretFlags pertaining to the -“private-key-password”

+“private-key-password”

@@ -3515,7 +3515,7 @@ nm_setting_802_1x_get_private_key_format

Returns

the data format of the private key data stored in the -“private-key” property

+“private-key” property

@@ -3581,7 +3581,7 @@ keys should always be encrypted with a private key password.

Returns

the "phase 2" private key data.

-

[transfer none]

+

[transfer none]

@@ -3661,14 +3661,14 @@ nm_setting_802_1x_set_phase2_private_key when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x authentication method.

This function reads a private key from disk and sets the -“phase2-private-key” property with the private key file data if +“phase2-private-key” property with the private key file data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the private key file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

If password is given, this function attempts to decrypt the private key to verify that password is correct, and if it is, updates the -“phase2-private-key-password” property with the given +“phase2-private-key-password” property with the given password . If the decryption is unsuccessful, FALSE is returned, error is @@ -3760,7 +3760,7 @@ nm_setting_802_1x_get_phase2_private_key_password

Returns

the private key password used to decrypt the private key if previously set with nm_setting_802_1x_set_phase2_private_key() or the -“phase2-private-key-password” property.

+“phase2-private-key-password” property.

@@ -3787,7 +3787,7 @@ nm_setting_802_1x_get_phase2_private_key_password_flags

Returns

the NMSettingSecretFlags pertaining to the -“phase2-private-key-password”

+“phase2-private-key-password”

@@ -3814,7 +3814,7 @@ nm_setting_802_1x_get_phase2_private_key_format

Returns

the data format of the "phase 2" private key data stored in the -“phase2-private-key” property

+“phase2-private-key” property

@@ -4360,6 +4360,6 @@ type.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html index be71a24a..1aa75c7c 100644 --- a/docs/libnm/html/NMSettingAdsl.html +++ b/docs/libnm/html/NMSettingAdsl.html @@ -8,7 +8,7 @@ - + @@ -204,7 +204,7 @@ nm_setting_adsl_get_username (

Returns

-

the “username” property of the setting

+

the “username” property of the setting

@@ -229,7 +229,7 @@ nm_setting_adsl_get_password (

Returns

-

the “password” property of the setting

+

the “password” property of the setting

@@ -254,7 +254,7 @@ nm_setting_adsl_get_protocol (

Returns

-

the “protocol” property of the setting

+

the “protocol” property of the setting

@@ -279,7 +279,7 @@ nm_setting_adsl_get_encapsulation (

Returns

-

the “encapsulation” property of the setting

+

the “encapsulation” property of the setting

@@ -304,7 +304,7 @@ nm_setting_adsl_get_vpi (

Returns

-

the “vpi” property of the setting

+

the “vpi” property of the setting

@@ -329,7 +329,7 @@ nm_setting_adsl_get_vci (

Returns

-

the “vci” property of the setting

+

the “vci” property of the setting

@@ -354,7 +354,7 @@ nm_setting_adsl_get_password_flags (

Returns

-

the NMSettingSecretFlags pertaining to the “password”

+

the NMSettingSecretFlags pertaining to the “password”

@@ -440,6 +440,6 @@ nm_setting_adsl_get_password_flags (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingBluetooth.html b/docs/libnm/html/NMSettingBluetooth.html index dc649be1..389812b6 100644 --- a/docs/libnm/html/NMSettingBluetooth.html +++ b/docs/libnm/html/NMSettingBluetooth.html @@ -8,7 +8,7 @@ - + @@ -116,7 +116,7 @@ nm_setting_bluetooth_new (void

Returns

the new empty NMSettingBluetooth object.

-

[transfer full]

+

[transfer full]

@@ -222,6 +222,6 @@ which accepts PANU clients.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html index 7c23901f..7f850594 100644 --- a/docs/libnm/html/NMSettingBond.html +++ b/docs/libnm/html/NMSettingBond.html @@ -8,7 +8,7 @@ - + @@ -264,7 +264,7 @@ nm_setting_bond_new (void<

Returns

the new empty NMSettingBond object.

-

[transfer full]

+

[transfer full]

@@ -332,14 +332,14 @@ such as during option iteration.

 - + - +

out_name

on return, the name of the bonding option; this value is owned by the setting and should not be modified.

[out][transfer none][out][transfer none]

out_value

on return, the value of the name of the bonding option; this value is owned by the setting and should not be modified.

[out][transfer none][out][transfer none]
@@ -543,7 +543,7 @@ nm_setting_bond_get_valid_options (

Returns

a NULL-terminated array of strings of valid bond options.

-

[transfer none]

+

[transfer none]

@@ -577,7 +577,7 @@ nm_setting_bond_get_option_default (

Returns

the value of the bond option if not overridden by an entry in -the “options” property.

+the “options” property.

@@ -801,6 +801,6 @@ to the connection.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingBondPort.html b/docs/libnm/html/NMSettingBondPort.html index e8f55039..323d19da 100644 --- a/docs/libnm/html/NMSettingBondPort.html +++ b/docs/libnm/html/NMSettingBondPort.html @@ -8,7 +8,7 @@ - + @@ -92,7 +92,7 @@ nm_setting_bond_port_new (void

Returns

the new empty NMSettingBondPort object.

-

[transfer full]

+

[transfer full]

Since: 1.34

@@ -139,6 +139,6 @@ nm_setting_bond_port_get_queue_id (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html index 645a3387..3171089a 100644 --- a/docs/libnm/html/NMSettingBridge.html +++ b/docs/libnm/html/NMSettingBridge.html @@ -8,7 +8,7 @@ - + @@ -567,7 +567,7 @@ nm_setting_bridge_new (void

Returns

the new empty NMSettingBridge object.

-

[transfer full]

+

[transfer full]

@@ -592,7 +592,7 @@ nm_setting_bridge_get_mac_address (

Returns

-

the “mac-address” property of the setting

+

the “mac-address” property of the setting

@@ -617,7 +617,7 @@ nm_setting_bridge_get_stp (

Returns

-

the “stp” property of the setting

+

the “stp” property of the setting

@@ -642,7 +642,7 @@ nm_setting_bridge_get_priority (

Returns

-

the “priority” property of the setting

+

the “priority” property of the setting

@@ -667,7 +667,7 @@ nm_setting_bridge_get_forward_delay (

Returns

-

the “forward-delay” property of the setting

+

the “forward-delay” property of the setting

@@ -692,7 +692,7 @@ nm_setting_bridge_get_hello_time (

Returns

-

the “hello-time” property of the setting

+

the “hello-time” property of the setting

@@ -717,7 +717,7 @@ nm_setting_bridge_get_max_age (

Returns

-

the “max-age” property of the setting

+

the “max-age” property of the setting

@@ -742,7 +742,7 @@ nm_setting_bridge_get_ageing_time (

Returns

-

the “ageing-time” property of the setting

+

the “ageing-time” property of the setting

@@ -942,7 +942,7 @@ nm_setting_bridge_get_vlan (

Returns

the VLAN at index idx .

-

[transfer none]

+

[transfer none]

Since: 1.18

@@ -1086,7 +1086,7 @@ and 4094.

Returns

the new NMBridgeVlan object.

-

[transfer full]

+

[transfer full]

Since: 1.18

@@ -1167,7 +1167,7 @@ nm_bridge_vlan_new_clone (const a clone of vlan . This instance is always unsealed.

-

[transfer full]

+

[transfer full]

Since: 1.18

@@ -2081,6 +2081,6 @@ nm_setting_bridge_get_multicast_startup_query_interval
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html index 9a72cdb8..d6044d66 100644 --- a/docs/libnm/html/NMSettingBridgePort.html +++ b/docs/libnm/html/NMSettingBridgePort.html @@ -8,7 +8,7 @@ - + @@ -168,7 +168,7 @@ nm_setting_bridge_port_new (void<

Returns

the new empty NMSettingBridgePort object.

-

[transfer full]

+

[transfer full]

@@ -193,7 +193,7 @@ nm_setting_bridge_port_get_priority (

Returns

-

the “priority” property of the setting

+

the “priority” property of the setting

@@ -218,7 +218,7 @@ nm_setting_bridge_port_get_path_cost (

Returns

-

the “path-cost” property of the setting

+

the “path-cost” property of the setting

@@ -244,7 +244,7 @@ nm_setting_bridge_port_get_hairpin_mode

Returns

-

the “hairpin-mode” property of the setting

+

the “hairpin-mode” property of the setting

@@ -337,7 +337,7 @@ nm_setting_bridge_port_get_vlan (

Returns

the VLAN at index idx .

-

[transfer none]

+

[transfer none]

Since: 1.18

@@ -480,6 +480,6 @@ nm_setting_bridge_port_clear_vlans (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html index f8f9df3e..e0e96e90 100644 --- a/docs/libnm/html/NMSettingCdma.html +++ b/docs/libnm/html/NMSettingCdma.html @@ -8,7 +8,7 @@ - + @@ -162,7 +162,7 @@ nm_setting_cdma_get_number (

Returns

-

the “number” property of the setting

+

the “number” property of the setting

@@ -187,7 +187,7 @@ nm_setting_cdma_get_username (

Returns

-

the “username” property of the setting

+

the “username” property of the setting

@@ -212,7 +212,7 @@ nm_setting_cdma_get_password (

Returns

-

the “password” property of the setting

+

the “password” property of the setting

@@ -237,7 +237,7 @@ nm_setting_cdma_get_password_flags (

Returns

-

the NMSettingSecretFlags pertaining to the “password”

+

the NMSettingSecretFlags pertaining to the “password”

@@ -307,6 +307,6 @@ nm_setting_cdma_get_mtu ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index 2908451c..d4cd96ce 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -8,7 +8,7 @@ - + @@ -514,7 +514,7 @@ nm_setting_connection_new (void

nm_setting_connection_get_id ()

const char *
 nm_setting_connection_get_id (NMSettingConnection *setting);
-

Returns the “id” property of the connection.

+

Returns the “id” property of the connection.

Parameters

@@ -540,7 +540,7 @@ nm_setting_connection_get_id (

nm_setting_connection_get_uuid ()

const char *
 nm_setting_connection_get_uuid (NMSettingConnection *setting);
-

Returns the “uuid” property of the connection.

+

Returns the “uuid” property of the connection.

Parameters

@@ -594,7 +594,7 @@ nm_setting_connection_get_stable_id (const char * nm_setting_connection_get_interface_name (NMSettingConnection *setting); -

Returns the “interface-name” property of the connection.

+

Returns the “interface-name” property of the connection.

Parameters

@@ -621,7 +621,7 @@ nm_setting_connection_get_interface_name 
const char *
 nm_setting_connection_get_connection_type
                                (NMSettingConnection *setting);
-

Returns the “type” property of the connection.

+

Returns the “type” property of the connection.

Parameters

@@ -647,7 +647,7 @@ nm_setting_connection_get_connection_type

nm_setting_connection_get_autoconnect ()

gboolean
 nm_setting_connection_get_autoconnect (NMSettingConnection *setting);
-

Returns the “autoconnect” property of the connection.

+

Returns the “autoconnect” property of the connection.

Parameters

@@ -757,7 +757,7 @@ nm_setting_connection_get_multi_connect

nm_setting_connection_get_timestamp ()

guint64
 nm_setting_connection_get_timestamp (NMSettingConnection *setting);
-

Returns the “timestamp” property of the connection.

+

Returns the “timestamp” property of the connection.

Parameters

@@ -783,7 +783,7 @@ nm_setting_connection_get_timestamp (

nm_setting_connection_get_read_only ()

gboolean
 nm_setting_connection_get_read_only (NMSettingConnection *setting);
-

Returns the “read-only” property of the connection.

+

Returns the “read-only” property of the connection.

Parameters

@@ -810,7 +810,7 @@ nm_setting_connection_get_read_only (guint32 nm_setting_connection_get_num_permissions (NMSettingConnection *setting); -

Returns the number of entries in the “permissions” +

Returns the number of entries in the “permissions” property of this setting.

Parameters

@@ -841,7 +841,7 @@ nm_setting_connection_get_permission (const char **out_ptype, const char **out_pitem, const char **out_detail); -

Retrieve one of the entries of the “permissions” property +

Retrieve one of the entries of the “permissions” property of this setting.

Parameters

@@ -872,7 +872,7 @@ unless the entry is invalid, in which case it returns "invalid".

 +“permissions” for more detail

 @@ -894,7 +894,7 @@ was invalid

nm_setting_connection_get_zone ()

const char *
 nm_setting_connection_get_zone (NMSettingConnection *setting);
-

Returns the “zone” property of the connection.

+

Returns the “zone” property of the connection.

Parameters

out_pitem

on return, the permission item (formatted according to ptype , see -“permissions” for more detail

 
@@ -962,7 +962,7 @@ nm_setting_connection_add_permission (pitem must be a username. See -“permissions”: for more details.

+“permissions”: for more details.

Parameters

@@ -1051,7 +1051,7 @@ nm_setting_connection_remove_permission_by_value

Removes the permission from the connection. At this time, only the "user" permission type is supported, and pitem must -be a username. See “permissions”: for more details.

+be a username. See “permissions”: for more details.

Parameters

@@ -1095,7 +1095,7 @@ be a username. See “permissions”: for more details

nm_setting_connection_get_master ()

const char *
 nm_setting_connection_get_master (NMSettingConnection *setting);
-

Returns the “master” property of the connection.

+

Returns the “master” property of the connection.

Parameters

@@ -1158,7 +1158,7 @@ against setting

nm_setting_connection_get_slave_type ()

const char *
 nm_setting_connection_get_slave_type (NMSettingConnection *setting);
-

Returns the “slave-type” property of the connection.

+

Returns the “slave-type” property of the connection.

Parameters

@@ -1398,7 +1398,7 @@ nm_setting_connection_get_gateway_ping_timeout

Returns

-

the value contained in the “gateway-ping-timeout” +

the value contained in the “gateway-ping-timeout” property.

@@ -2018,6 +2018,6 @@ master is activated

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html index e23ecdb6..853854df 100644 --- a/docs/libnm/html/NMSettingDcb.html +++ b/docs/libnm/html/NMSettingDcb.html @@ -8,7 +8,7 @@ - + @@ -329,7 +329,7 @@ nm_setting_dcb_new (void

Returns

the new empty NMSettingDcb object.

-

[transfer full]

+

[transfer full]

@@ -354,7 +354,7 @@ nm_setting_dcb_get_app_fcoe_flags (

Returns

-

the “app-fcoe-flags” property of the setting

+

the “app-fcoe-flags” property of the setting

@@ -379,7 +379,7 @@ nm_setting_dcb_get_app_fcoe_priority (

Returns

-

the “app-fcoe-priority” property of the setting

+

the “app-fcoe-priority” property of the setting

@@ -404,7 +404,7 @@ nm_setting_dcb_get_app_fcoe_mode (

Returns

-

the “app-fcoe-mode” property of the setting

+

the “app-fcoe-mode” property of the setting

@@ -429,7 +429,7 @@ nm_setting_dcb_get_app_iscsi_flags (

Returns

-

the “app-iscsi-flags” property of the setting

+

the “app-iscsi-flags” property of the setting

@@ -454,7 +454,7 @@ nm_setting_dcb_get_app_iscsi_priority (

Returns

-

the “app-iscsi-priority” property of the setting

+

the “app-iscsi-priority” property of the setting

@@ -479,7 +479,7 @@ nm_setting_dcb_get_app_fip_flags (

Returns

-

the “app-fip-flags” property of the setting

+

the “app-fip-flags” property of the setting

@@ -504,7 +504,7 @@ nm_setting_dcb_get_app_fip_priority (

Returns

-

the “app-fip-priority” property of the setting

+

the “app-fip-priority” property of the setting

@@ -530,7 +530,7 @@ nm_setting_dcb_get_priority_flow_control_flags

Returns

-

the “priority-flow-control-flags” property of the setting

+

the “priority-flow-control-flags” property of the setting

@@ -577,7 +577,7 @@ nm_setting_dcb_set_priority_flow_control (NMSettingDcb *setting, guint user_priority, gboolean enabled); -

These values are only valid when “priority-flow-control” includes +

These values are only valid when “priority-flow-control” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

Parameters

@@ -630,7 +630,7 @@ nm_setting_dcb_get_priority_group_flags

Returns

-

the “priority-group-flags” property of the setting

+

the “priority-group-flags” property of the setting

@@ -665,7 +665,7 @@ nm_setting_dcb_get_priority_group_id (

Returns

the group number user_priority is assigned to. These values are -only valid when “priority-group-flags” includes the +only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

@@ -676,7 +676,7 @@ only valid when “priority-group-flags” includes th nm_setting_dcb_set_priority_group_id (NMSettingDcb *setting, guint user_priority, guint group_id); -

These values are only valid when “priority-group-flags” includes +

These values are only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

Parameters

@@ -741,7 +741,7 @@ nm_setting_dcb_get_priority_group_bandwidth

Returns

the bandwidth percentage assigned to group_id . These values are -only valid when “priority-group-flags” includes the +only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

@@ -753,7 +753,7 @@ nm_setting_dcb_set_priority_group_bandwidth (NMSettingDcb *setting, guint group_id, guint bandwidth_percent); -

These values are only valid when “priority-group-flags” includes +

These values are only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

Parameters

@@ -816,7 +816,7 @@ nm_setting_dcb_get_priority_bandwidth (

Returns

the allowed bandwidth percentage of user_priority in its priority group. -These values are only valid when “priority-group-flags” includes the +These values are only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

@@ -827,7 +827,7 @@ These values are only valid when “priority-group-flags”NMSettingDcb *setting, guint user_priority, guint bandwidth_percent); -

These values are only valid when “priority-group-flags” includes +

These values are only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

Parameters

@@ -893,7 +893,7 @@ nm_setting_dcb_get_priority_strict_bandwidth

TRUE if user_priority may use all of the bandwidth allocated to its assigned group, or FALSE if not. These values are only valid when -“priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

+“priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

@@ -904,7 +904,7 @@ nm_setting_dcb_set_priority_strict_bandwidth (NMSettingDcb *setting, guint user_priority, gboolean strict); -

These values are only valid when “priority-group-flags” includes +

These values are only valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

Parameters

@@ -969,7 +969,7 @@ nm_setting_dcb_get_priority_traffic_class

Returns

the traffic class assigned to user_priority . These values are only -valid when “priority-group-flags” includes the +valid when “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

@@ -1143,6 +1143,6 @@ peer configuration advertisements

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingDummy.html b/docs/libnm/html/NMSettingDummy.html index 40233dfb..fe0d590f 100644 --- a/docs/libnm/html/NMSettingDummy.html +++ b/docs/libnm/html/NMSettingDummy.html @@ -8,7 +8,7 @@ - + @@ -76,7 +76,7 @@ nm_setting_dummy_new (void

Returns

the new empty NMSettingDummy object.

-

[transfer full]

+

[transfer full]

Since: 1.8

@@ -91,6 +91,6 @@ nm_setting_dummy_new (void
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingEthtool.html b/docs/libnm/html/NMSettingEthtool.html index 05cbfff1..48f950c5 100644 --- a/docs/libnm/html/NMSettingEthtool.html +++ b/docs/libnm/html/NMSettingEthtool.html @@ -8,7 +8,7 @@ - + @@ -245,7 +245,7 @@ nm_setting_ethtool_new (void

Returns

the new empty NMSettingEthtool object.

-

[transfer full]

+

[transfer full]

Since: 1.14

@@ -291,7 +291,7 @@ names or setting and may get invalidated when setting gets modified.

-

[array zero-terminated=1][transfer container]

+

[array zero-terminated=1][transfer container]

Since: 1.20

@@ -422,6 +422,6 @@ nm_setting_ethtool_clear_features (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html index e11413df..2a3b9d16 100644 --- a/docs/libnm/html/NMSettingGeneric.html +++ b/docs/libnm/html/NMSettingGeneric.html @@ -8,7 +8,7 @@ - + @@ -67,7 +67,7 @@ optional properties that apply to "generic" devices (ie, devices that NetworkManager does not specifically recognize).

There are currently no properties on this object; it exists only to be -the "connection type" setting on NMConnections for generic devices.

+the "connection type" setting on NMConnections for generic devices.

Functions

@@ -79,7 +79,7 @@ nm_setting_generic_new (void

Returns

the new empty NMSettingGeneric object.

-

[transfer full]

+

[transfer full]

@@ -93,6 +93,6 @@ nm_setting_generic_new (void
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html index 07b24783..35c275cd 100644 --- a/docs/libnm/html/NMSettingGsm.html +++ b/docs/libnm/html/NMSettingGsm.html @@ -8,7 +8,7 @@ - + @@ -290,7 +290,7 @@ nm_setting_gsm_get_username (

Returns

-

the “username” property of the setting

+

the “username” property of the setting

@@ -315,7 +315,7 @@ nm_setting_gsm_get_password (

Returns

-

the “password” property of the setting

+

the “password” property of the setting

@@ -340,7 +340,7 @@ nm_setting_gsm_get_apn (

Returns

-

the “apn” property of the setting

+

the “apn” property of the setting

@@ -365,7 +365,7 @@ nm_setting_gsm_get_network_id (

Returns

-

the “network-id” property of the setting

+

the “network-id” property of the setting

@@ -390,7 +390,7 @@ nm_setting_gsm_get_pin (

Returns

-

the “pin” property of the setting

+

the “pin” property of the setting

@@ -415,7 +415,7 @@ nm_setting_gsm_get_home_only (

Returns

-

the “home-only” property of the setting

+

the “home-only” property of the setting

@@ -548,7 +548,7 @@ nm_setting_gsm_get_number (

Returns

-

the “number” property of the setting

+

the “number” property of the setting

@@ -573,7 +573,7 @@ nm_setting_gsm_get_pin_flags (

Returns

-

the NMSettingSecretFlags pertaining to the “pin”

+

the NMSettingSecretFlags pertaining to the “pin”

@@ -598,7 +598,7 @@ nm_setting_gsm_get_password_flags (

Returns

-

the NMSettingSecretFlags pertaining to the “password”

+

the NMSettingSecretFlags pertaining to the “password”

@@ -696,6 +696,6 @@ nm_setting_gsm_get_password_flags (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingHostname.html b/docs/libnm/html/NMSettingHostname.html index 9a660e96..5ad796ae 100644 --- a/docs/libnm/html/NMSettingHostname.html +++ b/docs/libnm/html/NMSettingHostname.html @@ -8,7 +8,7 @@ - + @@ -131,7 +131,7 @@ nm_setting_hostname_new (void

Returns

the new empty NMSettingHostname object.

-

[transfer full]

+

[transfer full]

Since: 1.30

@@ -284,6 +284,6 @@ property.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html index cfa184e9..5af35d24 100644 --- a/docs/libnm/html/NMSettingIP4Config.html +++ b/docs/libnm/html/NMSettingIP4Config.html @@ -8,7 +8,7 @@ - + @@ -147,7 +147,7 @@ nm_setting_ip4_config_new (void

Returns

the new empty NMSettingIP4Config object.

-

[transfer full]

+

[transfer full]

@@ -156,7 +156,7 @@ nm_setting_ip4_config_new (voidconst char * nm_setting_ip4_config_get_dhcp_client_id (NMSettingIP4Config *setting); -

Returns the value contained in the “dhcp-client-id” +

Returns the value contained in the “dhcp-client-id” property.

Parameters

@@ -309,6 +309,6 @@ through that interface to the default network.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html index e6283e4a..474684ba 100644 --- a/docs/libnm/html/NMSettingIP6Config.html +++ b/docs/libnm/html/NMSettingIP6Config.html @@ -8,7 +8,7 @@ - + @@ -195,7 +195,7 @@ nm_setting_ip6_config_new (void

Returns

the new empty NMSettingIP6Config object.

-

[transfer full]

+

[transfer full]

@@ -203,7 +203,7 @@ nm_setting_ip6_config_new (void

nm_setting_ip6_config_get_ip6_privacy ()

NMSettingIP6ConfigPrivacy
 nm_setting_ip6_config_get_ip6_privacy (NMSettingIP6Config *setting);
-

Returns the value contained in the “ip6-privacy” +

Returns the value contained in the “ip6-privacy” property.

Parameters

@@ -526,6 +526,6 @@ specified by RFC7217.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html index 6981e33d..02861e14 100644 --- a/docs/libnm/html/NMSettingIPConfig.html +++ b/docs/libnm/html/NMSettingIPConfig.html @@ -8,7 +8,7 @@ - + @@ -1508,7 +1508,7 @@ nm_ip_address_new (int fam

Returns

the new NMIPAddress object, or NULL on error.

-

[transfer full]

+

[transfer full]

@@ -1559,7 +1559,7 @@ correct size for family

Returns

the new NMIPAddress object, or NULL on error.

-

[transfer full]

+

[transfer full]

@@ -1718,7 +1718,7 @@ nm_ip_address_dup ([transfer full]

+

[transfer full]

Since: 1.32

@@ -1959,7 +1959,7 @@ nm_ip_address_get_attribute_names (

Returns

a NULL-terminated array of attribute names,.

-

[transfer full]

+

[transfer full]

@@ -2000,7 +2000,7 @@ on address , or NULL if address has no such attribute.

-

[transfer none]

+

[transfer none]

@@ -2034,7 +2034,7 @@ nm_ip_address_set_attribute (

value

 - +

the value.

[transfer none][allow-none][transfer none][allow-none]
@@ -2097,7 +2097,7 @@ nm_ip_route_new (int famil

Returns

the new NMIPRoute object, or NULL on error.

-

[transfer full]

+

[transfer full]

@@ -2161,7 +2161,7 @@ point to buffers of the correct size for family

Returns

the new NMIPRoute object, or NULL on error.

-

[transfer full]

+

[transfer full]

@@ -2319,7 +2319,7 @@ nm_ip_route_dup ([transfer full]

+

[transfer full]

Since: 1.32

@@ -2755,7 +2755,7 @@ nm_ip_route_get_attribute_names (

Returns

a NULL-terminated array of attribute names.

-

[transfer full]

+

[transfer full]

@@ -2796,7 +2796,7 @@ on route , or NULL if route has no such attribute.

-

[transfer none]

+

[transfer none]

@@ -2830,7 +2830,7 @@ nm_ip_route_set_attribute (

value

the value.

-[transfer none][allow-none] +[transfer none][allow-none] @@ -2927,7 +2927,7 @@ nm_ip_routing_rule_new (int

Returns

a newly created rule instance with the provided address family. The instance is unsealed.

-

[transfer full]

+

[transfer full]

Since: 1.18

@@ -2957,7 +2957,7 @@ nm_ip_routing_rule_new_clone (const rule . Note that the instance will always be unsealred.

-

[transfer full]

+

[transfer full]

Since: 1.18

@@ -2988,7 +2988,7 @@ This is not thread-safe.

the self argument with incremented reference count.

-

[transfer full]

+

[transfer full]

Since: 1.18

@@ -3644,7 +3644,7 @@ nm_ip_routing_rule_get_from (const

Returns

the set from/src parameter or NULL, if no value is set.

-

[transfer none]

+

[transfer none]

Since: 1.18

@@ -3737,7 +3737,7 @@ nm_ip_routing_rule_get_to (const

Returns

the set to/dst parameter or NULL, if no value is set.

-

[transfer none]

+

[transfer none]

Since: 1.18

@@ -3805,7 +3805,7 @@ nm_ip_routing_rule_get_iifname (const

Returns

the set iifname or NULL if unset.

-

[transfer none]

+

[transfer none]

Since: 1.18

@@ -3866,7 +3866,7 @@ nm_ip_routing_rule_get_oifname (const

Returns

the set oifname or NULL if unset.

-

[transfer none]

+

[transfer none]

Since: 1.18

@@ -4271,7 +4271,7 @@ conversion. Currently, not extra arguments are supported.

Returns

the new NMIPRoutingRule or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.18

@@ -4320,7 +4320,7 @@ conversion. Currently, not extra arguments are supported.

Returns

the string representation or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.18

@@ -5034,7 +5034,7 @@ nm_setting_ip_config_get_address (

Returns

the address at index idx .

-

[transfer none]

+

[transfer none]

@@ -5245,7 +5245,7 @@ nm_setting_ip_config_get_route (

Returns

the route at index idx .

-

[transfer none]

+

[transfer none]

@@ -5495,7 +5495,7 @@ nm_setting_ip_config_get_routing_rule (

Returns

the routing rule at index idx .

-

[transfer none]

+

[transfer none]

Since: 1.18

@@ -5938,7 +5938,7 @@ nm_setting_ip_config_get_dhcp_reject_servers

Returns

A NULL terminated array of DHCP reject servers. Even if no reject servers are configured, this always returns a non NULL value.

-

[array length=out_len zero-terminated=1][transfer none]

+

[array length=out_len zero-terminated=1][transfer none]

Since: 1.28

@@ -6551,6 +6551,6 @@ incompatible with any other FQDN flag.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingIPTunnel.html b/docs/libnm/html/NMSettingIPTunnel.html index b86c8cf5..88bc354e 100644 --- a/docs/libnm/html/NMSettingIPTunnel.html +++ b/docs/libnm/html/NMSettingIPTunnel.html @@ -8,7 +8,7 @@ - + @@ -240,7 +240,7 @@ nm_setting_ip_tunnel_new (void

Returns

the new empty NMSettingIPTunnel object.

-

[transfer full]

+

[transfer full]

Since: 1.2

@@ -716,6 +716,6 @@ nm_setting_ip_tunnel_get_flags (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html index 8b981899..c4c2ef31 100644 --- a/docs/libnm/html/NMSettingInfiniband.html +++ b/docs/libnm/html/NMSettingInfiniband.html @@ -8,7 +8,7 @@ - + @@ -144,7 +144,7 @@ nm_setting_infiniband_new (void

Returns

the new empty NMSettingInfiniband object.

-

[transfer full]

+

[transfer full]

@@ -169,7 +169,7 @@ nm_setting_infiniband_get_mac_address (

Returns

-

the “mac-address” property of the setting

+

the “mac-address” property of the setting

@@ -194,7 +194,7 @@ nm_setting_infiniband_get_mtu (

Returns

-

the “mtu” property of the setting

+

the “mtu” property of the setting

@@ -285,8 +285,8 @@ nm_setting_infiniband_get_parent (const char * nm_setting_infiniband_get_virtual_interface_name (NMSettingInfiniband *setting); -

Returns the interface name created by combining “parent” -and “p-key”. (If either property is unset, this will +

Returns the interface name created by combining “parent” +and “p-key”. (If either property is unset, this will return NULL.)

Parameters

@@ -349,6 +349,6 @@ return -
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingMacsec.html b/docs/libnm/html/NMSettingMacsec.html index 511276b4..3492a89a 100644 --- a/docs/libnm/html/NMSettingMacsec.html +++ b/docs/libnm/html/NMSettingMacsec.html @@ -8,7 +8,7 @@ - + @@ -209,7 +209,7 @@ nm_setting_macsec_new (void

Returns

the new empty NMSettingMacsec object.

-

[transfer full]

+

[transfer full]

Since: 1.6

@@ -599,6 +599,6 @@ verify frames are dropped

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingMacvlan.html b/docs/libnm/html/NMSettingMacvlan.html index 393773f7..2b084c14 100644 --- a/docs/libnm/html/NMSettingMacvlan.html +++ b/docs/libnm/html/NMSettingMacvlan.html @@ -8,7 +8,7 @@ - + @@ -138,7 +138,7 @@ nm_setting_macvlan_new (void

Returns

the new empty NMSettingMacvlan object.

-

[transfer full]

+

[transfer full]

Since: 1.2

@@ -349,6 +349,6 @@ nm_setting_macvlan_get_tap ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingMatch.html b/docs/libnm/html/NMSettingMatch.html index 8a6e33a2..188bd2c3 100644 --- a/docs/libnm/html/NMSettingMatch.html +++ b/docs/libnm/html/NMSettingMatch.html @@ -8,7 +8,7 @@ - + @@ -319,7 +319,7 @@ nm_setting_match_new (void But due to a bug the symbol is only exposed and usable since version 1.32. As workaround, use g_object_new(NM_TYPE_SETTING_MATCH) which works with all versions since 1.14.

-

[transfer full]

+

[transfer full]

Since: 1.32

@@ -544,7 +544,7 @@ nm_setting_match_get_interface_names (NULL terminated and you MUST provide a length.

-

[transfer none][array length=length]

+

[transfer none][array length=length]

Since: 1.14

@@ -770,7 +770,7 @@ nm_setting_match_get_kernel_command_lines

Returns

the configured interface names.

-

[transfer none][array length=length]

+

[transfer none][array length=length]

Since: 1.26

@@ -990,7 +990,7 @@ nm_setting_match_get_drivers (

Returns

the configured drivers.

-

[transfer none][array length=length]

+

[transfer none][array length=length]

Since: 1.26

@@ -1209,7 +1209,7 @@ nm_setting_match_get_paths (

Returns

the configured paths.

-

[transfer none][array length=length]

+

[transfer none][array length=length]

Since: 1.26

@@ -1248,6 +1248,6 @@ nm_setting_match_get_paths ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html index 42365d0f..c20ae085 100644 --- a/docs/libnm/html/NMSettingOlpcMesh.html +++ b/docs/libnm/html/NMSettingOlpcMesh.html @@ -8,7 +8,7 @@ - + @@ -140,7 +140,7 @@ nm_setting_olpc_mesh_get_ssid (

Returns

.

-

[transfer none]

+

[transfer none]

@@ -185,6 +185,6 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingOvsBridge.html b/docs/libnm/html/NMSettingOvsBridge.html index f4a853c8..9d0a6da9 100644 --- a/docs/libnm/html/NMSettingOvsBridge.html +++ b/docs/libnm/html/NMSettingOvsBridge.html @@ -8,7 +8,7 @@ - + @@ -138,7 +138,7 @@ nm_setting_ovs_bridge_new (void

Returns

the new empty NMSettingOvsBridge object.

-

[transfer full]

+

[transfer full]

Since: 1.10

@@ -315,6 +315,6 @@ nm_setting_ovs_bridge_get_datapath_type
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingOvsDpdk.html b/docs/libnm/html/NMSettingOvsDpdk.html index 487fcb32..1b138618 100644 --- a/docs/libnm/html/NMSettingOvsDpdk.html +++ b/docs/libnm/html/NMSettingOvsDpdk.html @@ -8,7 +8,7 @@ - + @@ -103,7 +103,7 @@ nm_setting_ovs_dpdk_new (void

Returns

the new empty NMSettingOvsDpdk object.

-

[transfer full]

+

[transfer full]

Since: 1.20

@@ -182,6 +182,6 @@ nm_setting_ovs_dpdk_get_n_rxq (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingOvsExternalIDs.html b/docs/libnm/html/NMSettingOvsExternalIDs.html index 95ac7f5b..639dd644 100644 --- a/docs/libnm/html/NMSettingOvsExternalIDs.html +++ b/docs/libnm/html/NMSettingOvsExternalIDs.html @@ -8,7 +8,7 @@ - + @@ -123,7 +123,7 @@ nm_setting_ovs_external_ids_new (

Returns

the new empty NMSettingOvsExternalIDs object.

-

[transfer full][type NMSettingOvsExternalIDs]

+

[transfer full][type NMSettingOvsExternalIDs]

Since: 1.30

@@ -160,7 +160,7 @@ nm_setting_ovs_external_ids_get_data_keys

Returns

a NULL-terminated array containing each key from the table.

-

[array length=out_len][transfer none]

+

[array length=out_len][transfer none]

@@ -196,7 +196,7 @@ nm_setting_ovs_external_ids_get_data (key or NULL if no such value exists.

-

[transfer none]

+

[transfer none]

Since: 1.30

@@ -331,6 +331,6 @@ is a valid user data value.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingOvsInterface.html b/docs/libnm/html/NMSettingOvsInterface.html index 6d0dacda..acb3fff9 100644 --- a/docs/libnm/html/NMSettingOvsInterface.html +++ b/docs/libnm/html/NMSettingOvsInterface.html @@ -8,7 +8,7 @@ - + @@ -91,7 +91,7 @@ nm_setting_ovs_interface_new (voi

Returns

the new empty NMSettingOvsInterface object.

-

[transfer full]

+

[transfer full]

Since: 1.10

@@ -139,6 +139,6 @@ nm_setting_ovs_interface_get_interface_type
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingOvsPatch.html b/docs/libnm/html/NMSettingOvsPatch.html index 889191cd..41b4d578 100644 --- a/docs/libnm/html/NMSettingOvsPatch.html +++ b/docs/libnm/html/NMSettingOvsPatch.html @@ -8,7 +8,7 @@ - + @@ -91,7 +91,7 @@ nm_setting_ovs_patch_new (void

Returns

the new empty NMSettingOvsPatch object.

-

[transfer full]

+

[transfer full]

Since: 1.10

@@ -138,6 +138,6 @@ nm_setting_ovs_patch_get_peer (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingOvsPort.html b/docs/libnm/html/NMSettingOvsPort.html index 18e19aac..d73d5b28 100644 --- a/docs/libnm/html/NMSettingOvsPort.html +++ b/docs/libnm/html/NMSettingOvsPort.html @@ -8,7 +8,7 @@ - + @@ -149,7 +149,7 @@ nm_setting_ovs_port_new (void

Returns

the new empty NMSettingOvsPort object.

-

[transfer full]

+

[transfer full]

Since: 1.10

@@ -357,6 +357,6 @@ nm_setting_ovs_port_get_bond_downdelay
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html index 8874fe03..01e0b26e 100644 --- a/docs/libnm/html/NMSettingPpp.html +++ b/docs/libnm/html/NMSettingPpp.html @@ -8,7 +8,7 @@ - + @@ -298,7 +298,7 @@ nm_setting_ppp_new (void

Returns

the new empty NMSettingPpp object.

-

[transfer full]

+

[transfer full]

@@ -870,6 +870,6 @@ nm_setting_ppp_get_lcp_echo_interval ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html index a122631a..b4758f37 100644 --- a/docs/libnm/html/NMSettingPppoe.html +++ b/docs/libnm/html/NMSettingPppoe.html @@ -8,7 +8,7 @@ - + @@ -137,7 +137,7 @@ nm_setting_pppoe_new (void

Returns

the new empty NMSettingPppoe object.

-

[transfer full]

+

[transfer full]

@@ -307,6 +307,6 @@ nm_setting_pppoe_get_password_flags (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingProxy.html b/docs/libnm/html/NMSettingProxy.html index 949baf3a..5a3296fe 100644 --- a/docs/libnm/html/NMSettingProxy.html +++ b/docs/libnm/html/NMSettingProxy.html @@ -8,7 +8,7 @@ - + @@ -320,6 +320,6 @@ nm_setting_proxy_get_pac_script (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html index 07f8d189..efed6596 100644 --- a/docs/libnm/html/NMSettingSerial.html +++ b/docs/libnm/html/NMSettingSerial.html @@ -8,7 +8,7 @@ - + @@ -153,7 +153,7 @@ nm_setting_serial_new (void

Returns

the new empty NMSettingSerial object.

-

[transfer full]

+

[transfer full]

@@ -178,7 +178,7 @@ nm_setting_serial_get_baud (

Returns

-

the “baud” property of the setting

+

the “baud” property of the setting

@@ -203,7 +203,7 @@ nm_setting_serial_get_bits (

Returns

-

the “bits” property of the setting

+

the “bits” property of the setting

@@ -228,7 +228,7 @@ nm_setting_serial_get_parity (

Returns

-

the “parity” property of the setting

+

the “parity” property of the setting

@@ -253,7 +253,7 @@ nm_setting_serial_get_stopbits (

Returns

-

the “stopbits” property of the setting

+

the “stopbits” property of the setting

@@ -278,7 +278,7 @@ nm_setting_serial_get_send_delay (

Returns

-

the “send-delay” property of the setting

+

the “send-delay” property of the setting

@@ -360,6 +360,6 @@ nm_setting_serial_get_send_delay (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingSriov.html b/docs/libnm/html/NMSettingSriov.html index 0b331f0a..a1b42911 100644 --- a/docs/libnm/html/NMSettingSriov.html +++ b/docs/libnm/html/NMSettingSriov.html @@ -8,7 +8,7 @@ - + @@ -326,7 +326,7 @@ nm_setting_sriov_new (void

Returns

the new empty NMSettingSriov object.

-

[transfer full]

+

[transfer full]

Since: 1.14

@@ -416,7 +416,7 @@ nm_setting_sriov_get_vf (

Returns

the VF at index idx .

-

[transfer none]

+

[transfer none]

Since: 1.14

@@ -676,7 +676,7 @@ supports one VLAN per VF.

Returns

a list of VLAN ids configured on the VF.

-

[transfer none][array length=length]

+

[transfer none][array length=length]

Since: 1.14

@@ -820,7 +820,7 @@ nm_sriov_vf_new (

Returns

the new NMSriovVF object.

-

[transfer full]

+

[transfer full]

Since: 1.14

@@ -935,7 +935,7 @@ nm_sriov_vf_dup (const

Returns

a copy of vf .

-

[transfer full]

+

[transfer full]

Since: 1.14

@@ -997,7 +997,7 @@ nm_sriov_vf_set_attribute (

value

the value.

-[transfer none][allow-none] +[transfer none][allow-none] @@ -1029,7 +1029,7 @@ nm_sriov_vf_get_attribute_names (const

Returns

a NULL-terminated array of attribute names.

-

[transfer container]

+

[transfer container]

Since: 1.14

@@ -1071,7 +1071,7 @@ on vf , or NULL if vf has no such attribute.

-

[transfer none]

+

[transfer none]

Since: 1.14

@@ -1214,6 +1214,6 @@ the value is of the correct type and well-formed.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingTCConfig.html b/docs/libnm/html/NMSettingTCConfig.html index 5e82df0b..50bebca4 100644 --- a/docs/libnm/html/NMSettingTCConfig.html +++ b/docs/libnm/html/NMSettingTCConfig.html @@ -8,7 +8,7 @@ - + @@ -477,7 +477,7 @@ nm_tc_qdisc_new (const char

Returns

the new NMTCQdisc object, or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -591,7 +591,7 @@ nm_tc_qdisc_dup (

Returns

a copy of qdisc .

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -726,7 +726,7 @@ nm_tc_qdisc_get_attribute_names (

Returns

a NULL-terminated array of attribute names or NULL if no attributes are set.

-

[transfer container]

+

[transfer container]

Since: 1.18

@@ -768,7 +768,7 @@ on qdisc , or NULL if qdisc has no such attribute.

-

[transfer none]

+

[transfer none]

Since: 1.18

@@ -803,7 +803,7 @@ nm_tc_qdisc_set_attribute (

value

the value.

-[transfer none][allow-none] +[transfer none][allow-none] @@ -842,7 +842,7 @@ nm_tc_action_new (const char

Returns

the new NMTCAction object, or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -956,7 +956,7 @@ nm_tc_action_dup (

Returns

a copy of action .

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -1007,7 +1007,7 @@ nm_tc_action_get_attribute_names (

Returns

a NULL-terminated array of attribute names,.

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -1049,7 +1049,7 @@ on action , or NULL if action has no such attribute.

-

[transfer none]

+

[transfer none]

Since: 1.12

@@ -1084,7 +1084,7 @@ nm_tc_action_set_attribute (

value

the value.

-[transfer none][allow-none] +[transfer none][allow-none] @@ -1129,7 +1129,7 @@ nm_tc_tfilter_new (const char

Returns

the new NMTCTfilter object, or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -1243,7 +1243,7 @@ nm_tc_tfilter_dup (

Returns

a copy of tfilter .

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -1418,7 +1418,7 @@ nm_setting_tc_config_new (void

Returns

the new empty NMSettingTCConfig object.

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -1480,7 +1480,7 @@ nm_setting_tc_config_get_qdisc (

Returns

the qdisc at index idx .

-

[transfer none]

+

[transfer none]

Since: 1.12

@@ -1672,7 +1672,7 @@ nm_setting_tc_config_get_tfilter (

Returns

the tfilter at index idx .

-

[transfer none]

+

[transfer none]

Since: 1.12

@@ -1829,6 +1829,6 @@ nm_setting_tc_config_clear_tfilters (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html index ab4694c2..55cc06d8 100644 --- a/docs/libnm/html/NMSettingTeam.html +++ b/docs/libnm/html/NMSettingTeam.html @@ -8,7 +8,7 @@ - + @@ -618,7 +618,7 @@ consistency with the link_watcher constructors of other type

Returns

the new NMTeamLinkWatcher object.

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -673,7 +673,7 @@ target address in the NS packet

Returns

the new NMTeamLinkWatcher object, or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -741,7 +741,7 @@ address in the arp request

Returns

the new NMTeamLinkWatcher object, or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -815,7 +815,7 @@ address in the arp request

Returns

the new NMTeamLinkWatcher object, or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.16

@@ -929,7 +929,7 @@ nm_team_link_watcher_dup (const

Returns

a copy of watcher .

-

[transfer full]

+

[transfer full]

Since: 1.12

@@ -1177,7 +1177,7 @@ nm_setting_team_new (void<

Returns

the new empty NMSettingTeam object.

-

[transfer full]

+

[transfer full]

@@ -1202,7 +1202,7 @@ nm_setting_team_get_config (

Returns

-

the “config” property of the setting

+

the “config” property of the setting

@@ -1775,7 +1775,7 @@ nm_setting_team_get_link_watcher (

Returns

the link watcher at index idx .

-

[transfer none]

+

[transfer none]

Since: 1.12

@@ -2204,6 +2204,6 @@ option 'validate_inactive' is enabled (set to true).

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html index 64b20b67..bd6712a5 100644 --- a/docs/libnm/html/NMSettingTeamPort.html +++ b/docs/libnm/html/NMSettingTeamPort.html @@ -8,7 +8,7 @@ - + @@ -211,7 +211,7 @@ nm_setting_team_port_new (void

Returns

the new empty NMSettingTeamPort object.

-

[transfer full]

+

[transfer full]

@@ -236,7 +236,7 @@ nm_setting_team_port_get_config (

Returns

-

the “config” property of the setting

+

the “config” property of the setting

@@ -428,7 +428,7 @@ nm_setting_team_port_get_link_watcher (

Returns

the link watcher at index idx .

-

[transfer none]

+

[transfer none]

Since: 1.12

@@ -625,6 +625,6 @@ nm_setting_team_port_clear_link_watchers
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html index 061a08ef..0d1a7357 100644 --- a/docs/libnm/html/NMSettingTun.html +++ b/docs/libnm/html/NMSettingTun.html @@ -8,7 +8,7 @@ - + @@ -161,7 +161,7 @@ nm_setting_tun_new (void

Returns

the new empty NMSettingTun object.

-

[transfer full]

+

[transfer full]

Since: 1.2

@@ -406,6 +406,6 @@ nm_setting_tun_get_multi_queue (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingUser.html b/docs/libnm/html/NMSettingUser.html index 432fbceb..d268e29c 100644 --- a/docs/libnm/html/NMSettingUser.html +++ b/docs/libnm/html/NMSettingUser.html @@ -8,7 +8,7 @@ - + @@ -156,7 +156,7 @@ nm_setting_user_get_keys (

Returns

a NULL-terminated array containing each key from the table.

-

[array length=out_len][transfer none]

+

[array length=out_len][transfer none]

@@ -192,7 +192,7 @@ nm_setting_user_get_data (key or NULL if no such value exists.

-

[transfer none]

+

[transfer none]

Since: 1.8

@@ -342,6 +342,6 @@ is a valid user data value.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingVeth.html b/docs/libnm/html/NMSettingVeth.html index 405f5e9e..dee004a3 100644 --- a/docs/libnm/html/NMSettingVeth.html +++ b/docs/libnm/html/NMSettingVeth.html @@ -8,7 +8,7 @@ - + @@ -91,7 +91,7 @@ nm_setting_veth_new (void<

Returns

the new empty NMSettingVeth object.

-

[transfer full]

+

[transfer full]

Since: 1.30

@@ -138,6 +138,6 @@ nm_setting_veth_get_peer ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html index 8d7504f3..69d1733c 100644 --- a/docs/libnm/html/NMSettingVlan.html +++ b/docs/libnm/html/NMSettingVlan.html @@ -8,7 +8,7 @@ - + @@ -208,7 +208,7 @@ nm_setting_vlan_new (void<

Returns

the new empty NMSettingVlan object.

-

[transfer full]

+

[transfer full]

@@ -233,7 +233,7 @@ nm_setting_vlan_get_parent (

Returns

-

the “parent” property of the setting

+

the “parent” property of the setting

@@ -258,7 +258,7 @@ nm_setting_vlan_get_id (

Returns

-

the “id” property of the setting

+

the “id” property of the setting

@@ -283,7 +283,7 @@ nm_setting_vlan_get_flags (

Returns

-

the “flags” property of the setting

+

the “flags” property of the setting

@@ -293,7 +293,7 @@ nm_setting_vlan_get_flags (NMSettingVlan *setting, NMVlanPriorityMap map);

Returns the number of entries in the -“ingress_priority_map” or “egress_priority_map” +“ingress_priority_map” or “egress_priority_map” properties of this setting.

Parameters

@@ -331,8 +331,8 @@ nm_setting_vlan_get_priority (guint32 idx, guint32 *out_from, guint32 *out_to); -

Retrieve one of the entries of the “ingress_priority_map” -or “egress_priority_map” properties of this setting.

+

Retrieve one of the entries of the “ingress_priority_map” +or “egress_priority_map” properties of this setting.

Parameters

@@ -384,8 +384,8 @@ nm_setting_vlan_add_priority (NMVlanPriorityMap map, guint32 from, guint32 to); -

Adds a priority mapping to the “ingress_priority_map” or -“egress_priority_map” properties of the setting. If from +

Adds a priority mapping to the “ingress_priority_map” or +“egress_priority_map” properties of the setting. If from is already in the given priority map, this function will overwrite the existing entry with the new to @@ -448,7 +448,7 @@ nm_setting_vlan_remove_priority (guint32 idx);

Removes the priority map at index idx from the -“ingress_priority_map” or “egress_priority_map” +“ingress_priority_map” or “egress_priority_map” properties.

Parameters

@@ -489,8 +489,8 @@ nm_setting_vlan_remove_priority_by_value guint32 to);

Removes the priority map form :to - from the “ingress_priority_map” -or “egress_priority_map” (according to map + from the “ingress_priority_map” +or “egress_priority_map” (according to map argument) properties.

@@ -541,8 +541,8 @@ nm_setting_vlan_remove_priority_str_by_value NMVlanPriorityMap map, const char *str);

Removes the priority map str - from the “ingress_priority_map” -or “egress_priority_map” (according to map + from the “ingress_priority_map” +or “egress_priority_map” (according to map argument) properties.

@@ -583,8 +583,8 @@ properties.

void
 nm_setting_vlan_clear_priorities (NMSettingVlan *setting,
                                   NMVlanPriorityMap map);
-

Clear all the entries from “ingress_priority_map” or -“egress_priority_map” properties.

+

Clear all the entries from “ingress_priority_map” or +“egress_priority_map” properties.

Parameters

@@ -615,8 +615,8 @@ nm_setting_vlan_clear_priorities (NMSettingVlan *setting, NMVlanPriorityMap map, const char *str); -

Adds a priority map entry into either the “ingress_priority_map” -or the “egress_priority_map” properties. The priority map maps +

Adds a priority map entry into either the “ingress_priority_map” +or the “egress_priority_map” properties. The priority map maps the Linux SKB priorities to 802.1p priorities.

Parameters

@@ -780,6 +780,6 @@ itself with its switch

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html index 7572d5e5..b7d49ee4 100644 --- a/docs/libnm/html/NMSettingVpn.html +++ b/docs/libnm/html/NMSettingVpn.html @@ -8,7 +8,7 @@ - + @@ -275,7 +275,7 @@ nm_setting_vpn_new (void

Returns

the new empty NMSettingVpn object.

-

[transfer full]

+

[transfer full]

@@ -574,7 +574,7 @@ nm_setting_vpn_get_data_keys (NULL-terminated array containing each data key or NULL if there are no data items.

-

[array length=out_length][transfer container]

+

[array length=out_length][transfer container]

Since: 1.12

@@ -796,7 +796,7 @@ nm_setting_vpn_get_secret_keys (a NULL-terminated array containing each secret key or NULL if there are no secrets.

-

[array length=out_length][transfer container]

+

[array length=out_length][transfer container]

Since: 1.12

@@ -873,6 +873,6 @@ nm_setting_vpn_get_timeout ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingVrf.html b/docs/libnm/html/NMSettingVrf.html index 835923cc..2a129b78 100644 --- a/docs/libnm/html/NMSettingVrf.html +++ b/docs/libnm/html/NMSettingVrf.html @@ -8,7 +8,7 @@ - + @@ -92,7 +92,7 @@ nm_setting_vrf_new (void

Returns

the new empty NMSettingVrf object.

-

[transfer full]

+

[transfer full]

Since: 1.24

@@ -139,6 +139,6 @@ nm_setting_vrf_get_table ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingVxlan.html b/docs/libnm/html/NMSettingVxlan.html index d2fe9165..0b3fe3fe 100644 --- a/docs/libnm/html/NMSettingVxlan.html +++ b/docs/libnm/html/NMSettingVxlan.html @@ -8,7 +8,7 @@ - + @@ -269,7 +269,7 @@ nm_setting_vxlan_new (void

Returns

the new empty NMSettingVxlan object.

-

[transfer full]

+

[transfer full]

Since: 1.2

@@ -796,6 +796,6 @@ nm_setting_vxlan_get_l3_miss ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWifiP2P.html b/docs/libnm/html/NMSettingWifiP2P.html index 2a00b2c3..8cd438e5 100644 --- a/docs/libnm/html/NMSettingWifiP2P.html +++ b/docs/libnm/html/NMSettingWifiP2P.html @@ -8,7 +8,7 @@ - + @@ -115,7 +115,7 @@ nm_setting_wifi_p2p_new (void

Returns

the new empty NMSettingWifiP2P object.

-

[transfer full]

+

[transfer full]

Since: 1.16

@@ -194,7 +194,7 @@ nm_setting_wifi_p2p_get_wfd_ies (

Returns

the “wfd-ies” property of the setting.

-

[transfer none]

+

[transfer none]

Since: 1.16

@@ -228,6 +228,6 @@ nm_setting_wifi_p2p_get_wfd_ies (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html index 7bff50bc..5346abdf 100644 --- a/docs/libnm/html/NMSettingWimax.html +++ b/docs/libnm/html/NMSettingWimax.html @@ -8,7 +8,7 @@ - + @@ -196,6 +196,6 @@ to.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWireGuard.html b/docs/libnm/html/NMSettingWireGuard.html index 167bfeb8..34f5415b 100644 --- a/docs/libnm/html/NMSettingWireGuard.html +++ b/docs/libnm/html/NMSettingWireGuard.html @@ -8,7 +8,7 @@ - + @@ -453,7 +453,7 @@ nm_wireguard_peer_new (void

Returns

a new, default, unsealed NMWireGuardPeer instance.

-

[transfer full]

+

[transfer full]

Since: 1.16

@@ -491,7 +491,7 @@ as well. Otherwise, they will be removed.

a clone of self . This instance is always unsealed.

-

[transfer full]

+

[transfer full]

Since: 1.16

@@ -626,7 +626,7 @@ nm_wireguard_peer_get_public_key (const

Returns

the public key or NULL if unset.

-

[transfer none]

+

[transfer none]

Since: 1.16

@@ -658,7 +658,7 @@ will be normalized (which may or may not modify the set value).

 - + @@ -701,7 +701,7 @@ nm_wireguard_peer_get_preshared_key (const

Returns

the preshared key or NULL if unset.

-

[transfer none]

+

[transfer none]

Since: 1.16

@@ -738,7 +738,7 @@ be accepted.

 - + @@ -903,7 +903,7 @@ nm_wireguard_peer_get_endpoint (const

Returns

the endpoint or NULL if none was set.

-

[transfer none]

+

[transfer none]

Since: 1.16

@@ -1027,7 +1027,7 @@ breaking API for introspection users.

. If idx is out of range, NULL will be returned.

-

[transfer none]

+

[transfer none]

Since: 1.16

@@ -1253,7 +1253,7 @@ nm_setting_wireguard_new (void

Returns

the new empty NMSettingWireGuard object.

-

[transfer full]

+

[transfer full]

Since: 1.16

@@ -1280,7 +1280,7 @@ nm_setting_wireguard_get_private_key (

Returns

the set private-key or NULL.

-

[transfer none]

+

[transfer none]

Since: 1.16

@@ -1422,7 +1422,7 @@ nm_setting_wireguard_get_peer (the NMWireGuardPeer entry at index idx . If the index is out of range, NULL is returned.

-

[transfer none]

+

[transfer none]

Since: 1.16

@@ -1468,7 +1468,7 @@ this is set to the

Returns

the NMWireGuardPeer instance with a matching public key. If no such peer exists, NULL is returned.

-

[transfer none]

+

[transfer none]

Since: 1.16

@@ -1831,6 +1831,6 @@ nm_setting_wireguard_get_ip6_auto_default_route
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html index aa1ef24b..6389ac4b 100644 --- a/docs/libnm/html/NMSettingWired.html +++ b/docs/libnm/html/NMSettingWired.html @@ -8,7 +8,7 @@ - + @@ -347,7 +347,7 @@ nm_setting_wired_new (void

Returns

the new empty NMSettingWired object.

-

[transfer full]

+

[transfer full]

@@ -372,7 +372,7 @@ nm_setting_wired_get_port (

Returns

-

the “port” property of the setting

+

the “port” property of the setting

@@ -397,7 +397,7 @@ nm_setting_wired_get_speed (

Returns

-

the “speed” property of the setting

+

the “speed” property of the setting

@@ -422,7 +422,7 @@ nm_setting_wired_get_duplex (

Returns

-

the “duplex” property of the setting

+

the “duplex” property of the setting

@@ -447,7 +447,7 @@ nm_setting_wired_get_auto_negotiate (

Returns

-

the “auto-negotiate” property of the setting

+

the “auto-negotiate” property of the setting

@@ -472,7 +472,7 @@ nm_setting_wired_get_mac_address (

Returns

-

the “mac-address” property of the setting

+

the “mac-address” property of the setting

@@ -498,7 +498,7 @@ nm_setting_wired_get_cloned_mac_address

Returns

-

the “cloned-mac-address” property of the setting

+

the “cloned-mac-address” property of the setting

@@ -578,7 +578,7 @@ nm_setting_wired_get_mac_address_blacklist

Returns

-

the “mac-address-blacklist” property of the setting

+

the “mac-address-blacklist” property of the setting

@@ -650,7 +650,7 @@ at index idx nm_setting_wired_add_mac_blacklist_item (NMSettingWired *setting, const char *mac); -

Adds a new MAC address to the “mac-address-blacklist” property.

+

Adds a new MAC address to the “mac-address-blacklist” property.

Parameters

public_key

the new public key or NULL to clear the public key.

[allow-none][transfer none][allow-none][transfer none]

accept_invalid

preshared_key

the new preshared key or NULL to clear the preshared key.

[allow-none][transfer none][allow-none][transfer none]

accept_invalid

@@ -793,7 +793,7 @@ nm_setting_wired_get_mtu (

Returns

-

the “mtu” property of the setting

+

the “mtu” property of the setting

@@ -823,7 +823,7 @@ conjunction with that device.

Returns

array of strings, each specifying one subchannel the s390 device uses to communicate to the host.

-

[transfer none][element-type utf8]

+

[transfer none][element-type utf8]

@@ -918,14 +918,14 @@ such as during option iteration.

 - + - +

out_key

on return, the key name of the s390 specific option; this value is owned by the setting and should not be modified.

[allow-none][out][transfer none][allow-none][out][transfer none]

out_value

on return, the value of the key of the s390 specific option; this value is owned by the setting and should not be modified.

[allow-none][out][transfer none][allow-none][out][transfer none]
@@ -1083,7 +1083,7 @@ and you may pass

Returns

a NULL-terminated array of strings of valid s390 options.

-

[transfer none]

+

[transfer none]

@@ -1344,6 +1344,6 @@ incompatible with other flags

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html index 60e5ddfd..b97a0b50 100644 --- a/docs/libnm/html/NMSettingWireless.html +++ b/docs/libnm/html/NMSettingWireless.html @@ -8,7 +8,7 @@ - + @@ -392,7 +392,7 @@ nm_setting_wireless_new (void

Returns

the new empty NMSettingWireless object.

-

[transfer full]

+

[transfer full]

@@ -417,8 +417,8 @@ nm_setting_wireless_get_ssid (

Returns

-

the “ssid” property of the setting.

-

[transfer none]

+

the “ssid” property of the setting.

+

[transfer none]

@@ -443,7 +443,7 @@ nm_setting_wireless_get_mode (

Returns

-

the “mode” property of the setting

+

the “mode” property of the setting

@@ -468,7 +468,7 @@ nm_setting_wireless_get_band (

Returns

-

the “band” property of the setting

+

the “band” property of the setting

@@ -493,7 +493,7 @@ nm_setting_wireless_get_channel (

Returns

-

the “channel” property of the setting

+

the “channel” property of the setting

@@ -518,7 +518,7 @@ nm_setting_wireless_get_bssid (

Returns

-

the “bssid” property of the setting

+

the “bssid” property of the setting

@@ -543,7 +543,7 @@ nm_setting_wireless_get_rate (

Returns

-

the “rate” property of the setting

+

the “rate” property of the setting

@@ -568,7 +568,7 @@ nm_setting_wireless_get_tx_power (

Returns

-

the “tx-power” property of the setting

+

the “tx-power” property of the setting

@@ -593,7 +593,7 @@ nm_setting_wireless_get_mac_address (

Returns

-

the “mac-address” property of the setting

+

the “mac-address” property of the setting

@@ -619,7 +619,7 @@ nm_setting_wireless_get_cloned_mac_address

Returns

-

the “cloned-mac-address” property of the setting

+

the “cloned-mac-address” property of the setting

@@ -672,7 +672,7 @@ nm_setting_wireless_get_mac_address_blacklist

Returns

-

the “mac-address-blacklist” property of the setting

+

the “mac-address-blacklist” property of the setting

@@ -744,7 +744,7 @@ at index idx nm_setting_wireless_add_mac_blacklist_item (NMSettingWireless *setting, const char *mac); -

Adds a new MAC address to the “mac-address-blacklist” property.

+

Adds a new MAC address to the “mac-address-blacklist” property.

Parameters

@@ -887,7 +887,7 @@ nm_setting_wireless_get_mtu (

Returns

-

the “mtu” property of the setting

+

the “mtu” property of the setting

@@ -912,7 +912,7 @@ nm_setting_wireless_get_hidden (

Returns

-

the “hidden” property of the setting

+

the “hidden” property of the setting

@@ -937,7 +937,7 @@ nm_setting_wireless_get_powersave (

Returns

-

the “powersave” property of the setting

+

the “powersave” property of the setting

Since: 1.2

@@ -1505,6 +1505,6 @@ for this connection.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html index c622764f..a97abbcf 100644 --- a/docs/libnm/html/NMSettingWirelessSecurity.html +++ b/docs/libnm/html/NMSettingWirelessSecurity.html @@ -8,7 +8,7 @@ - + @@ -453,7 +453,7 @@ nm_setting_wireless_security_new (

Returns

the new empty NMSettingWirelessSecurity object.

-

[transfer full]

+

[transfer full]

@@ -479,7 +479,7 @@ nm_setting_wireless_security_get_key_mgmt

Returns

-

the “key-mgmt” property of the setting

+

the “key-mgmt” property of the setting

@@ -1093,7 +1093,7 @@ nm_setting_wireless_security_get_psk (

Returns

-

the “psk” property of the setting

+

the “psk” property of the setting

@@ -1120,7 +1120,7 @@ nm_setting_wireless_security_get_psk_flags

Returns

the NMSettingSecretFlags pertaining to the -“psk”

+“psk”

@@ -1146,7 +1146,7 @@ nm_setting_wireless_security_get_leap_username

Returns

-

the “leap-username” property of the setting

+

the “leap-username” property of the setting

@@ -1172,7 +1172,7 @@ nm_setting_wireless_security_get_leap_password

Returns

-

the “leap-password” property of the setting

+

the “leap-password” property of the setting

@@ -1199,7 +1199,7 @@ nm_setting_wireless_security_get_leap_password_flags

Returns

the NMSettingSecretFlags pertaining to the -“leap-password”

+“leap-password”

@@ -1267,7 +1267,7 @@ nm_setting_wireless_security_set_wep_key @@ -1298,7 +1298,7 @@ nm_setting_wireless_security_get_wep_tx_keyidx

Returns

-

the “wep-tx-keyidx” property of the setting

+

the “wep-tx-keyidx” property of the setting

@@ -1324,7 +1324,7 @@ nm_setting_wireless_security_get_auth_alg

Returns

-

the “auth-alg” property of the setting

+

the “auth-alg” property of the setting

@@ -1376,7 +1376,7 @@ nm_setting_wireless_security_get_wep_key_type

Returns

-

the “wep-key-type” property of the setting

+

the “wep-key-type” property of the setting

@@ -1772,6 +1772,6 @@ although, with the same numeric values.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWpan.html b/docs/libnm/html/NMSettingWpan.html index 23ebdac3..3c13f380 100644 --- a/docs/libnm/html/NMSettingWpan.html +++ b/docs/libnm/html/NMSettingWpan.html @@ -8,7 +8,7 @@ - + @@ -147,7 +147,7 @@ nm_setting_wpan_new (void<

Returns

the new empty NMSettingWpan object.

-

[transfer full]

+

[transfer full]

Since: 1.14

@@ -334,6 +334,6 @@ nm_setting_wpan_get_channel ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html index 9f780d8b..d2eb741a 100644 --- a/docs/libnm/html/NMSimpleConnection.html +++ b/docs/libnm/html/NMSimpleConnection.html @@ -8,7 +8,7 @@ - + @@ -81,7 +81,7 @@ nm_simple_connection_new (void

Returns

the new empty NMConnection object.

-

[transfer full]

+

[transfer full]

@@ -120,7 +120,7 @@ description of the expected hash table.

the new NMSimpleConnection object, populated with settings created from the values in the hash table, or NULL if the connection failed to normalize.

-

[transfer full]

+

[transfer full]

@@ -148,12 +148,12 @@ nm_simple_connection_new_clone (

Returns

a new NMConnection containing the same settings and properties as the source NMConnection.

-

[transfer full]

+

[transfer full]

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html index 7f7a18bd..812ce210 100644 --- a/docs/libnm/html/NMVpnConnection.html +++ b/docs/libnm/html/NMVpnConnection.html @@ -8,7 +8,7 @@ - + @@ -150,6 +150,6 @@ string used by the connection, and must not be modified.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMVpnEditor.html b/docs/libnm/html/NMVpnEditor.html index e90577b4..ce6d9daf 100644 --- a/docs/libnm/html/NMVpnEditor.html +++ b/docs/libnm/html/NMVpnEditor.html @@ -8,7 +8,7 @@ - + @@ -98,7 +98,7 @@ nm_vpn_editor_get_widget (

Returns

.

-

[transfer none]

+

[transfer none]

@@ -173,6 +173,6 @@ to write values to the connection.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html index e3bf8a01..cd6e6342 100644 --- a/docs/libnm/html/NMVpnEditorPlugin.html +++ b/docs/libnm/html/NMVpnEditorPlugin.html @@ -8,7 +8,7 @@ - + @@ -325,7 +325,7 @@ nm_vpn_editor_plugin_get_editor (

Returns

a new NMVpnEditor or NULL on error.

-

[transfer full]

+

[transfer full]

@@ -421,7 +421,7 @@ nm_vpn_editor_plugin_import (NULL on error or if the file at path was not recognized by this plugin.

-

[transfer full]

+

[transfer full]

@@ -515,7 +515,7 @@ loading the shared library.

Returns

a new plugin instance or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.2

@@ -567,7 +567,7 @@ the given service.

Returns

a new plugin instance or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.4

@@ -594,7 +594,7 @@ nm_vpn_editor_plugin_get_plugin_info (

Returns

if set, return the NMVpnPluginInfo instance.

-

[transfer none]

+

[transfer none]

Since: 1.4

@@ -875,6 +875,6 @@ user_function (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMVpnPluginInfo.html b/docs/libnm/html/NMVpnPluginInfo.html index 65214dac..45880d12 100644 --- a/docs/libnm/html/NMVpnPluginInfo.html +++ b/docs/libnm/html/NMVpnPluginInfo.html @@ -8,7 +8,7 @@ - + @@ -398,7 +398,7 @@ must be present.

Returns

a newly created instance of plugin info or NULL if no matching value was found.

-

[transfer full]

+

[transfer full]

Since: 1.4

@@ -425,7 +425,7 @@ nm_vpn_plugin_info_get_name (

Returns

the name. Cannot be NULL.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -452,7 +452,7 @@ nm_vpn_plugin_info_get_filename (

Returns

the filename. Can be NULL.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -479,7 +479,7 @@ nm_vpn_plugin_info_get_service (

Returns

the service. Cannot be NULL.

-

[transfer none]

+

[transfer none]

Since: 1.4

@@ -506,7 +506,7 @@ nm_vpn_plugin_info_get_plugin (

Returns

the plugin. Can be NULL.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -533,7 +533,7 @@ nm_vpn_plugin_info_get_program (

Returns

the program. Can be NULL.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -638,7 +638,7 @@ nm_vpn_plugin_info_get_aliases (

Returns

the aliases from the name-file.

-

[array zero-terminated=1][element-type utf8][transfer none]

+

[array zero-terminated=1][element-type utf8][transfer none]

Since: 1.4

@@ -680,7 +680,7 @@ nm_vpn_plugin_info_lookup_property (

Returns

NMVpnPluginInfo is internally a GKeyFile. Returns the matching property.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -719,7 +719,7 @@ nm_vpn_plugin_info_list_load (voi

Returns

list of plugins loaded from the default directories rejecting duplicates.

-

[element-type NMVpnPluginInfo][transfer full]

+

[element-type NMVpnPluginInfo][transfer full]

Since: 1.2

@@ -836,7 +836,7 @@ nm_vpn_plugin_info_list_find_by_name (

Returns

the first plugin with a matching name (or NULL).

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -873,7 +873,7 @@ nm_vpn_plugin_info_list_find_by_filename

Returns

the first plugin with a matching filename (or NULL).

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -911,7 +911,7 @@ or one of the provided aliases.

Returns

the first plugin with a matching service (or NULL).

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -957,7 +957,7 @@ but it could be retrieved via

Returns

the resolved service-type or NULL on failure.

-

[transfer full]

+

[transfer full]

Since: 1.4

@@ -1005,7 +1005,7 @@ with

Returns

a NULL terminated strv list of strings. The list itself and the values must be freed with g_strfreev().

-

[transfer full]

+

[transfer full]

Since: 1.4

@@ -1032,7 +1032,7 @@ nm_vpn_plugin_info_get_editor_plugin (

Returns

the cached NMVpnEditorPlugin instance.

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -1103,7 +1103,7 @@ and can be later retrieved again via nm_vpn_plugin_info_get_editor_plugin(). You can load the plugin only once, unless you reset the state via nm_vpn_plugin_info_set_editor_plugin().

-

[transfer none]

+

[transfer none]

Since: 1.2

@@ -1148,6 +1148,6 @@ plugin only once, unless you reset the state via
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMVpnPluginOld.html b/docs/libnm/html/NMVpnPluginOld.html index 3b8fed77..07669e28 100644 --- a/docs/libnm/html/NMVpnPluginOld.html +++ b/docs/libnm/html/NMVpnPluginOld.html @@ -8,7 +8,7 @@ - + @@ -268,7 +268,7 @@ nm_vpn_plugin_old_get_connection (

Returns

.

-

[transfer full]

+

[transfer full]

@@ -433,13 +433,13 @@ an applet when the applet calls the authentication dialog of the VPN plugin.

 - + - +

key

the WEP key as a string, in either hexadecimal, ASCII, or passphrase -form as determined by the value of the “wep-key-type” +form as determined by the value of the “wep-key-type” property.

  

out_data

on successful return, a hash table (mapping char*:char*) containing the key/value pairs of VPN data items.

[out][transfer full][out][transfer full]

out_secrets

on successful return, a hash table (mapping char*:char*) containing the key/value pairsof VPN secrets.

[out][transfer full][out][transfer full]
@@ -623,6 +623,6 @@ user_function (
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMVpnServicePlugin.html b/docs/libnm/html/NMVpnServicePlugin.html index a016cd52..965727a3 100644 --- a/docs/libnm/html/NMVpnServicePlugin.html +++ b/docs/libnm/html/NMVpnServicePlugin.html @@ -8,7 +8,7 @@ - + @@ -265,7 +265,7 @@ nm_vpn_service_plugin_get_connection (

Returns

.

-

[transfer full]

+

[transfer full]

Since: 1.2

@@ -411,13 +411,13 @@ an applet when the applet calls the authentication dialog of the VPN plugin.

out_data

on successful return, a hash table (mapping char*:char*) containing the key/value pairs of VPN data items.

-[out][transfer full] +[out][transfer full]

out_secrets

on successful return, a hash table (mapping char*:char*) containing the key/value pairsof VPN secrets.

-[out][transfer full] +[out][transfer full] @@ -609,6 +609,6 @@ user_function ( -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMWifiP2PPeer.html b/docs/libnm/html/NMWifiP2PPeer.html index b4ddd6e8..aa6dbc45 100644 --- a/docs/libnm/html/NMWifiP2PPeer.html +++ b/docs/libnm/html/NMWifiP2PPeer.html @@ -8,7 +8,7 @@ - + @@ -373,7 +373,7 @@ nm_wifi_p2p_peer_get_wfd_ies (

Returns

the GBytes containing the WFD IEs, or NULL.

-

[transfer none]

+

[transfer none]

Since: 1.16

@@ -490,7 +490,7 @@ with this function.

connections

-

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection] @@ -500,10 +500,10 @@ filter.

Returns

an array of -NMConnections that could be activated with the given peer +NMConnections that could be activated with the given peer . The array should be freed with g_ptr_array_unref() when it is no longer required.

-

[transfer container][element-type NMConnection]

+

[transfer container][element-type NMConnection]

Since: 1.16

@@ -613,6 +613,6 @@ against

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html index c0556985..ed16e0f5 100644 --- a/docs/libnm/html/NMWimaxNsp.html +++ b/docs/libnm/html/NMWimaxNsp.html @@ -8,7 +8,7 @@ - + @@ -228,7 +228,7 @@ connections will match the nsp

connections

-

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection] @@ -238,10 +238,10 @@ filter.

Returns

an array of -NMConnections that could be activated with the given nsp +NMConnections that could be activated with the given nsp . The array should be freed with g_ptr_array_unref() when it is no longer required.

-

[transfer full][element-type NMConnection]

+

[transfer full][element-type NMConnection]

@@ -311,6 +311,6 @@ against

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/annotation-glossary.html b/docs/libnm/html/annotation-glossary.html index 9591c45b..3b043d13 100644 --- a/docs/libnm/html/annotation-glossary.html +++ b/docs/libnm/html/annotation-glossary.html @@ -8,7 +8,7 @@ - + @@ -49,7 +49,7 @@

Generics and defining elements of containers and arrays.

I

inout
-

Parameter for input and for returning results. Default is transfer full.

+

Parameter for input and for returning results. Default is transfer full.

N

nullable

NULL may be passed as the value in, out, in-out; or as a return value.

@@ -57,7 +57,7 @@
optional

NULL may be passed instead of a pointer to a location.

out
-

Parameter for returning results. Default is transfer full.

+

Parameter for returning results. Default is transfer full.

S

scope async

The callback is valid until first called.

@@ -67,15 +67,15 @@

Exposed in C code, not necessarily available in other languages.

T

transfer container
-

Free data container after the code is done.

+

The caller owns the data container, but not the data inside it.

transfer full
-

Free data after the code is done.

+

The caller owns the data, and is responsible for free it.

transfer none
-

Don't free data after the code is done.

+

The data is owned by the callee, which is responsible of freeing it.

type

Override the parsed C type with given type.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index 65be46db..7ebe8d18 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -49,51 +49,51 @@ NETWORKMANAGER_COMPILATION, macro in nm-default-libnm
-NMAccessPoint, struct in NMDeviceOvs +NMAccessPoint, struct in NMDeviceOvs
-NMAccessPoint:bssid, object property in NMDeviceOvs +NMAccessPoint:bssid, object property in NMDeviceOvs
-NMAccessPoint:flags, object property in NMDeviceOvs +NMAccessPoint:flags, object property in NMDeviceOvs
-NMAccessPoint:frequency, object property in NMDeviceOvs +NMAccessPoint:frequency, object property in NMDeviceOvs
-NMAccessPoint:hw-address, object property in NMDeviceOvs +NMAccessPoint:hw-address, object property in NMDeviceOvs
-NMAccessPoint:last-seen, object property in NMDeviceOvs +NMAccessPoint:last-seen, object property in NMDeviceOvs
-NMAccessPoint:max-bitrate, object property in NMDeviceOvs +NMAccessPoint:max-bitrate, object property in NMDeviceOvs
-NMAccessPoint:mode, object property in NMDeviceOvs +NMAccessPoint:mode, object property in NMDeviceOvs
-NMAccessPoint:rsn-flags, object property in NMDeviceOvs +NMAccessPoint:rsn-flags, object property in NMDeviceOvs
-NMAccessPoint:ssid, object property in NMDeviceOvs +NMAccessPoint:ssid, object property in NMDeviceOvs
-NMAccessPoint:strength, object property in NMDeviceOvs +NMAccessPoint:strength, object property in NMDeviceOvs
-NMAccessPoint:wpa-flags, object property in NMDeviceOvs +NMAccessPoint:wpa-flags, object property in NMDeviceOvs
@@ -101,75 +101,75 @@ NMAccessPoint:wpa-flags, object property in NMDeviceOvs
-NMActiveConnection, struct in NMDeviceOvs +NMActiveConnection, struct in NMDeviceOvs
-NMActiveConnection::state-changed, object signal in NMDeviceOvs +NMActiveConnection::state-changed, object signal in NMDeviceOvs
-NMActiveConnection:connection, object property in NMDeviceOvs +NMActiveConnection:connection, object property in NMDeviceOvs
-NMActiveConnection:default, object property in NMDeviceOvs +NMActiveConnection:default, object property in NMDeviceOvs
-NMActiveConnection:default6, object property in NMDeviceOvs +NMActiveConnection:default6, object property in NMDeviceOvs
-NMActiveConnection:devices, object property in NMDeviceOvs +NMActiveConnection:devices, object property in NMDeviceOvs
-NMActiveConnection:dhcp4-config, object property in NMDeviceOvs +NMActiveConnection:dhcp4-config, object property in NMDeviceOvs
-NMActiveConnection:dhcp6-config, object property in NMDeviceOvs +NMActiveConnection:dhcp6-config, object property in NMDeviceOvs
-NMActiveConnection:id, object property in NMDeviceOvs +NMActiveConnection:id, object property in NMDeviceOvs
-NMActiveConnection:ip4-config, object property in NMDeviceOvs +NMActiveConnection:ip4-config, object property in NMDeviceOvs
-NMActiveConnection:ip6-config, object property in NMDeviceOvs +NMActiveConnection:ip6-config, object property in NMDeviceOvs
-NMActiveConnection:master, object property in NMDeviceOvs +NMActiveConnection:master, object property in NMDeviceOvs
-NMActiveConnection:specific-object-path, object property in NMDeviceOvs +NMActiveConnection:specific-object-path, object property in NMDeviceOvs
-NMActiveConnection:state, object property in NMDeviceOvs +NMActiveConnection:state, object property in NMDeviceOvs
-NMActiveConnection:state-flags, object property in NMDeviceOvs +NMActiveConnection:state-flags, object property in NMDeviceOvs
-NMActiveConnection:type, object property in NMDeviceOvs +NMActiveConnection:type, object property in NMDeviceOvs
-NMActiveConnection:uuid, object property in NMDeviceOvs +NMActiveConnection:uuid, object property in NMDeviceOvs
-NMActiveConnection:vpn, object property in NMDeviceOvs +NMActiveConnection:vpn, object property in NMDeviceOvs
@@ -197,19 +197,19 @@ NMActiveConnectionClass, struct in
-NMCheckpoint, struct in NMDeviceOvs +NMCheckpoint, struct in NMDeviceOvs
-NMCheckpoint:created, object property in NMDeviceOvs +NMCheckpoint:created, object property in NMDeviceOvs
-NMCheckpoint:devices, object property in NMDeviceOvs +NMCheckpoint:devices, object property in NMDeviceOvs
-NMCheckpoint:rollback-timeout, object property in NMDeviceOvs +NMCheckpoint:rollback-timeout, object property in NMDeviceOvs
@@ -217,179 +217,179 @@ NMCheckpoint:rollback-timeout, object property in NMDeviceOvs
-NMClient, struct in NMDeviceOvs +NMClient, struct in NMDeviceOvs
-NMClient::active-connection-added, object signal in NMDeviceOvs +NMClient::active-connection-added, object signal in NMDeviceOvs
-NMClient::active-connection-removed, object signal in NMDeviceOvs +NMClient::active-connection-removed, object signal in NMDeviceOvs
-NMClient::any-device-added, object signal in NMDeviceOvs +NMClient::any-device-added, object signal in NMDeviceOvs
-NMClient::any-device-removed, object signal in NMDeviceOvs +NMClient::any-device-removed, object signal in NMDeviceOvs
-NMClient::connection-added, object signal in NMDeviceOvs +NMClient::connection-added, object signal in NMDeviceOvs
-NMClient::connection-removed, object signal in NMDeviceOvs +NMClient::connection-removed, object signal in NMDeviceOvs
-NMClient::device-added, object signal in NMDeviceOvs +NMClient::device-added, object signal in NMDeviceOvs
-NMClient::device-removed, object signal in NMDeviceOvs +NMClient::device-removed, object signal in NMDeviceOvs
-NMClient::permission-changed, object signal in NMDeviceOvs +NMClient::permission-changed, object signal in NMDeviceOvs
-NMClient:activating-connection, object property in NMDeviceOvs +NMClient:activating-connection, object property in NMDeviceOvs
-NMClient:active-connections, object property in NMDeviceOvs +NMClient:active-connections, object property in NMDeviceOvs
-NMClient:all-devices, object property in NMDeviceOvs +NMClient:all-devices, object property in NMDeviceOvs
-NMClient:can-modify, object property in NMDeviceOvs +NMClient:can-modify, object property in NMDeviceOvs
-NMClient:capabilities, object property in NMDeviceOvs +NMClient:capabilities, object property in NMDeviceOvs
-NMClient:checkpoints, object property in NMDeviceOvs +NMClient:checkpoints, object property in NMDeviceOvs
-NMClient:connections, object property in NMDeviceOvs +NMClient:connections, object property in NMDeviceOvs
-NMClient:connectivity, object property in NMDeviceOvs +NMClient:connectivity, object property in NMDeviceOvs
-NMClient:connectivity-check-available, object property in NMDeviceOvs +NMClient:connectivity-check-available, object property in NMDeviceOvs
-NMClient:connectivity-check-enabled, object property in NMDeviceOvs +NMClient:connectivity-check-enabled, object property in NMDeviceOvs
-NMClient:connectivity-check-uri, object property in NMDeviceOvs +NMClient:connectivity-check-uri, object property in NMDeviceOvs
-NMClient:dbus-connection, object property in NMDeviceOvs +NMClient:dbus-connection, object property in NMDeviceOvs
-NMClient:dbus-name-owner, object property in NMDeviceOvs +NMClient:dbus-name-owner, object property in NMDeviceOvs
-NMClient:devices, object property in NMDeviceOvs +NMClient:devices, object property in NMDeviceOvs
-NMClient:dns-configuration, object property in NMDeviceOvs +NMClient:dns-configuration, object property in NMDeviceOvs
-NMClient:dns-mode, object property in NMDeviceOvs +NMClient:dns-mode, object property in NMDeviceOvs
-NMClient:dns-rc-manager, object property in NMDeviceOvs +NMClient:dns-rc-manager, object property in NMDeviceOvs
-NMClient:hostname, object property in NMDeviceOvs +NMClient:hostname, object property in NMDeviceOvs
-NMClient:instance-flags, object property in NMDeviceOvs +NMClient:instance-flags, object property in NMDeviceOvs
-NMClient:metered, object property in NMDeviceOvs +NMClient:metered, object property in NMDeviceOvs
-NMClient:networking-enabled, object property in NMDeviceOvs +NMClient:networking-enabled, object property in NMDeviceOvs
-NMClient:nm-running, object property in NMDeviceOvs +NMClient:nm-running, object property in NMDeviceOvs
-NMClient:permissions-state, object property in NMDeviceOvs +NMClient:permissions-state, object property in NMDeviceOvs
-NMClient:primary-connection, object property in NMDeviceOvs +NMClient:primary-connection, object property in NMDeviceOvs
-NMClient:radio-flags, object property in NMDeviceOvs +NMClient:radio-flags, object property in NMDeviceOvs
-NMClient:startup, object property in NMDeviceOvs +NMClient:startup, object property in NMDeviceOvs
-NMClient:state, object property in NMDeviceOvs +NMClient:state, object property in NMDeviceOvs
-NMClient:version, object property in NMDeviceOvs +NMClient:version, object property in NMDeviceOvs
-NMClient:wimax-enabled, object property in NMDeviceOvs +NMClient:wimax-enabled, object property in NMDeviceOvs
-NMClient:wimax-hardware-enabled, object property in NMDeviceOvs +NMClient:wimax-hardware-enabled, object property in NMDeviceOvs
-NMClient:wireless-enabled, object property in NMDeviceOvs +NMClient:wireless-enabled, object property in NMDeviceOvs
-NMClient:wireless-hardware-enabled, object property in NMDeviceOvs +NMClient:wireless-hardware-enabled, object property in NMDeviceOvs
-NMClient:wwan-enabled, object property in NMDeviceOvs +NMClient:wwan-enabled, object property in NMDeviceOvs
-NMClient:wwan-hardware-enabled, object property in NMDeviceOvs +NMClient:wwan-hardware-enabled, object property in NMDeviceOvs
@@ -425,19 +425,19 @@ NMClientNotifyEventWithPtrCb, user_function in NMConnection, struct in NMSettingOvs
-NMConnection::changed, object signal in NMSettingOvs +NMConnection::changed, object signal in NMSettingOvs
-NMConnection::secrets-cleared, object signal in NMSettingOvs +NMConnection::secrets-cleared, object signal in NMSettingOvs
-NMConnection::secrets-updated, object signal in NMSettingOvs +NMConnection::secrets-updated, object signal in NMSettingOvs
@@ -469,195 +469,195 @@ NMConnection::secrets-updated, object signal in NMSettingOvs
-NMDevice, struct in NMDeviceOvs +NMDevice, struct in NMDeviceOvs
-NMDevice6Lowpan, struct in NMDeviceOvs +NMDevice6Lowpan, struct in NMDeviceOvs
-NMDevice6Lowpan:parent, object property in NMDeviceOvs +NMDevice6Lowpan:parent, object property in NMDeviceOvs
-NMDevice::state-changed, object signal in NMDeviceOvs +NMDevice::state-changed, object signal in NMDeviceOvs
-NMDevice:active-connection, object property in NMDeviceOvs +NMDevice:active-connection, object property in NMDeviceOvs
-NMDevice:autoconnect, object property in NMDeviceOvs +NMDevice:autoconnect, object property in NMDeviceOvs
-NMDevice:available-connections, object property in NMDeviceOvs +NMDevice:available-connections, object property in NMDeviceOvs
-NMDevice:capabilities, object property in NMDeviceOvs +NMDevice:capabilities, object property in NMDeviceOvs
-NMDevice:device-type, object property in NMDeviceOvs +NMDevice:device-type, object property in NMDeviceOvs
-NMDevice:dhcp4-config, object property in NMDeviceOvs +NMDevice:dhcp4-config, object property in NMDeviceOvs
-NMDevice:dhcp6-config, object property in NMDeviceOvs +NMDevice:dhcp6-config, object property in NMDeviceOvs
-NMDevice:driver, object property in NMDeviceOvs +NMDevice:driver, object property in NMDeviceOvs
-NMDevice:driver-version, object property in NMDeviceOvs +NMDevice:driver-version, object property in NMDeviceOvs
-NMDevice:firmware-missing, object property in NMDeviceOvs +NMDevice:firmware-missing, object property in NMDeviceOvs
-NMDevice:firmware-version, object property in NMDeviceOvs +NMDevice:firmware-version, object property in NMDeviceOvs
-NMDevice:hw-address, object property in NMDeviceOvs +NMDevice:hw-address, object property in NMDeviceOvs
-NMDevice:interface, object property in NMDeviceOvs +NMDevice:interface, object property in NMDeviceOvs
-NMDevice:interface-flags, object property in NMDeviceOvs +NMDevice:interface-flags, object property in NMDeviceOvs
-NMDevice:ip-interface, object property in NMDeviceOvs +NMDevice:ip-interface, object property in NMDeviceOvs
-NMDevice:ip4-config, object property in NMDeviceOvs +NMDevice:ip4-config, object property in NMDeviceOvs
-NMDevice:ip4-connectivity, object property in NMDeviceOvs +NMDevice:ip4-connectivity, object property in NMDeviceOvs
-NMDevice:ip6-config, object property in NMDeviceOvs +NMDevice:ip6-config, object property in NMDeviceOvs
-NMDevice:ip6-connectivity, object property in NMDeviceOvs +NMDevice:ip6-connectivity, object property in NMDeviceOvs
-NMDevice:lldp-neighbors, object property in NMDeviceOvs +NMDevice:lldp-neighbors, object property in NMDeviceOvs
-NMDevice:managed, object property in NMDeviceOvs +NMDevice:managed, object property in NMDeviceOvs
-NMDevice:metered, object property in NMDeviceOvs +NMDevice:metered, object property in NMDeviceOvs
-NMDevice:mtu, object property in NMDeviceOvs +NMDevice:mtu, object property in NMDeviceOvs
-NMDevice:nm-plugin-missing, object property in NMDeviceOvs +NMDevice:nm-plugin-missing, object property in NMDeviceOvs
-NMDevice:path, object property in NMDeviceOvs +NMDevice:path, object property in NMDeviceOvs
-NMDevice:physical-port-id, object property in NMDeviceOvs +NMDevice:physical-port-id, object property in NMDeviceOvs
-NMDevice:ports, object property in NMDeviceOvs +NMDevice:ports, object property in NMDeviceOvs
-NMDevice:product, object property in NMDeviceOvs +NMDevice:product, object property in NMDeviceOvs
-NMDevice:real, object property in NMDeviceOvs +NMDevice:real, object property in NMDeviceOvs
-NMDevice:state, object property in NMDeviceOvs +NMDevice:state, object property in NMDeviceOvs
-NMDevice:state-reason, object property in NMDeviceOvs +NMDevice:state-reason, object property in NMDeviceOvs
-NMDevice:udi, object property in NMDeviceOvs +NMDevice:udi, object property in NMDeviceOvs
-NMDevice:vendor, object property in NMDeviceOvs +NMDevice:vendor, object property in NMDeviceOvs
-NMDeviceAdsl, struct in NMDeviceOvs +NMDeviceAdsl, struct in NMDeviceOvs
-NMDeviceAdsl:carrier, object property in NMDeviceOvs +NMDeviceAdsl:carrier, object property in NMDeviceOvs
-NMDeviceBond, struct in NMDeviceOvs +NMDeviceBond, struct in NMDeviceOvs
-NMDeviceBond:carrier, object property in NMDeviceOvs +NMDeviceBond:carrier, object property in NMDeviceOvs
-NMDeviceBond:slaves, object property in NMDeviceOvs +NMDeviceBond:slaves, object property in NMDeviceOvs
-NMDeviceBridge, struct in NMDeviceOvs +NMDeviceBridge, struct in NMDeviceOvs
-NMDeviceBridge:carrier, object property in NMDeviceOvs +NMDeviceBridge:carrier, object property in NMDeviceOvs
-NMDeviceBridge:slaves, object property in NMDeviceOvs +NMDeviceBridge:slaves, object property in NMDeviceOvs
-NMDeviceBt, struct in NMDeviceOvs +NMDeviceBt, struct in NMDeviceOvs
-NMDeviceBt:bt-capabilities, object property in NMDeviceOvs +NMDeviceBt:bt-capabilities, object property in NMDeviceOvs
-NMDeviceBt:name, object property in NMDeviceOvs +NMDeviceBt:name, object property in NMDeviceOvs
@@ -669,7 +669,7 @@ NMDeviceClass, struct in NMDeviceDummy, struct in NMDeviceOvs
@@ -677,23 +677,23 @@ NMDeviceDummy, struct in NMDeviceOvs
-NMDeviceEthernet, struct in NMDeviceOvs +NMDeviceEthernet, struct in NMDeviceOvs
-NMDeviceEthernet:carrier, object property in NMDeviceOvs +NMDeviceEthernet:carrier, object property in NMDeviceOvs
-NMDeviceEthernet:perm-hw-address, object property in NMDeviceOvs +NMDeviceEthernet:perm-hw-address, object property in NMDeviceOvs
-NMDeviceEthernet:s390-subchannels, object property in NMDeviceOvs +NMDeviceEthernet:s390-subchannels, object property in NMDeviceOvs
-NMDeviceEthernet:speed, object property in NMDeviceOvs +NMDeviceEthernet:speed, object property in NMDeviceOvs
@@ -701,19 +701,19 @@ NMDeviceEthernetClass, struct in NMDeviceGeneric, struct in NMDeviceOvs
-NMDeviceGeneric:type-description, object property in NMDeviceOvs +NMDeviceGeneric:type-description, object property in NMDeviceOvs
-NMDeviceInfiniband, struct in NMDeviceOvs +NMDeviceInfiniband, struct in NMDeviceOvs
-NMDeviceInfiniband:carrier, object property in NMDeviceOvs +NMDeviceInfiniband:carrier, object property in NMDeviceOvs
@@ -721,155 +721,155 @@ NMDeviceInfiniband:carrier, object property in NMDeviceOvs
-NMDeviceIPTunnel, struct in NMDeviceOvs +NMDeviceIPTunnel, struct in NMDeviceOvs
-NMDeviceIPTunnel:encapsulation-limit, object property in NMDeviceOvs +NMDeviceIPTunnel:encapsulation-limit, object property in NMDeviceOvs
-NMDeviceIPTunnel:flags, object property in NMDeviceOvs +NMDeviceIPTunnel:flags, object property in NMDeviceOvs
-NMDeviceIPTunnel:flow-label, object property in NMDeviceOvs +NMDeviceIPTunnel:flow-label, object property in NMDeviceOvs
-NMDeviceIPTunnel:input-key, object property in NMDeviceOvs +NMDeviceIPTunnel:input-key, object property in NMDeviceOvs
-NMDeviceIPTunnel:local, object property in NMDeviceOvs +NMDeviceIPTunnel:local, object property in NMDeviceOvs
-NMDeviceIPTunnel:mode, object property in NMDeviceOvs +NMDeviceIPTunnel:mode, object property in NMDeviceOvs
-NMDeviceIPTunnel:output-key, object property in NMDeviceOvs +NMDeviceIPTunnel:output-key, object property in NMDeviceOvs
-NMDeviceIPTunnel:parent, object property in NMDeviceOvs +NMDeviceIPTunnel:parent, object property in NMDeviceOvs
-NMDeviceIPTunnel:path-mtu-discovery, object property in NMDeviceOvs +NMDeviceIPTunnel:path-mtu-discovery, object property in NMDeviceOvs
-NMDeviceIPTunnel:remote, object property in NMDeviceOvs +NMDeviceIPTunnel:remote, object property in NMDeviceOvs
-NMDeviceIPTunnel:tos, object property in NMDeviceOvs +NMDeviceIPTunnel:tos, object property in NMDeviceOvs
-NMDeviceIPTunnel:ttl, object property in NMDeviceOvs +NMDeviceIPTunnel:ttl, object property in NMDeviceOvs
-NMDeviceMacsec, struct in NMDeviceOvs +NMDeviceMacsec, struct in NMDeviceOvs
-NMDeviceMacsec:cipher-suite, object property in NMDeviceOvs +NMDeviceMacsec:cipher-suite, object property in NMDeviceOvs
-NMDeviceMacsec:encoding-sa, object property in NMDeviceOvs +NMDeviceMacsec:encoding-sa, object property in NMDeviceOvs
-NMDeviceMacsec:encrypt, object property in NMDeviceOvs +NMDeviceMacsec:encrypt, object property in NMDeviceOvs
-NMDeviceMacsec:es, object property in NMDeviceOvs +NMDeviceMacsec:es, object property in NMDeviceOvs
-NMDeviceMacsec:icv-length, object property in NMDeviceOvs +NMDeviceMacsec:icv-length, object property in NMDeviceOvs
-NMDeviceMacsec:include-sci, object property in NMDeviceOvs +NMDeviceMacsec:include-sci, object property in NMDeviceOvs
-NMDeviceMacsec:parent, object property in NMDeviceOvs +NMDeviceMacsec:parent, object property in NMDeviceOvs
-NMDeviceMacsec:protect, object property in NMDeviceOvs +NMDeviceMacsec:protect, object property in NMDeviceOvs
-NMDeviceMacsec:replay-protect, object property in NMDeviceOvs +NMDeviceMacsec:replay-protect, object property in NMDeviceOvs
-NMDeviceMacsec:scb, object property in NMDeviceOvs +NMDeviceMacsec:scb, object property in NMDeviceOvs
-NMDeviceMacsec:sci, object property in NMDeviceOvs +NMDeviceMacsec:sci, object property in NMDeviceOvs
-NMDeviceMacsec:validation, object property in NMDeviceOvs +NMDeviceMacsec:validation, object property in NMDeviceOvs
-NMDeviceMacsec:window, object property in NMDeviceOvs +NMDeviceMacsec:window, object property in NMDeviceOvs
-NMDeviceMacvlan, struct in NMDeviceOvs +NMDeviceMacvlan, struct in NMDeviceOvs
-NMDeviceMacvlan:mode, object property in NMDeviceOvs +NMDeviceMacvlan:mode, object property in NMDeviceOvs
-NMDeviceMacvlan:no-promisc, object property in NMDeviceOvs +NMDeviceMacvlan:no-promisc, object property in NMDeviceOvs
-NMDeviceMacvlan:parent, object property in NMDeviceOvs +NMDeviceMacvlan:parent, object property in NMDeviceOvs
-NMDeviceMacvlan:tap, object property in NMDeviceOvs +NMDeviceMacvlan:tap, object property in NMDeviceOvs
-NMDeviceModem, struct in NMDeviceOvs +NMDeviceModem, struct in NMDeviceOvs
-NMDeviceModem:apn, object property in NMDeviceOvs +NMDeviceModem:apn, object property in NMDeviceOvs
-NMDeviceModem:current-capabilities, object property in NMDeviceOvs +NMDeviceModem:current-capabilities, object property in NMDeviceOvs
-NMDeviceModem:device-id, object property in NMDeviceOvs +NMDeviceModem:device-id, object property in NMDeviceOvs
-NMDeviceModem:modem-capabilities, object property in NMDeviceOvs +NMDeviceModem:modem-capabilities, object property in NMDeviceOvs
-NMDeviceModem:operator-code, object property in NMDeviceOvs +NMDeviceModem:operator-code, object property in NMDeviceOvs
@@ -877,39 +877,39 @@ NMDeviceModem:operator-code, object property in NMDeviceOvs
-NMDeviceOlpcMesh, struct in NMDeviceOvs +NMDeviceOlpcMesh, struct in NMDeviceOvs
-NMDeviceOlpcMesh:active-channel, object property in NMDeviceOvs +NMDeviceOlpcMesh:active-channel, object property in NMDeviceOvs
-NMDeviceOlpcMesh:companion, object property in NMDeviceOvs +NMDeviceOlpcMesh:companion, object property in NMDeviceOvs
-NMDeviceOvsBridge, struct in NMDeviceOvs +NMDeviceOvsBridge, struct in NMDeviceOvs
-NMDeviceOvsBridge:slaves, object property in NMDeviceOvs +NMDeviceOvsBridge:slaves, object property in NMDeviceOvs
-NMDeviceOvsInterface, struct in NMDeviceOvs +NMDeviceOvsInterface, struct in NMDeviceOvs
-NMDeviceOvsPort, struct in NMDeviceOvs +NMDeviceOvsPort, struct in NMDeviceOvs
-NMDeviceOvsPort:slaves, object property in NMDeviceOvs +NMDeviceOvsPort:slaves, object property in NMDeviceOvs
-NMDevicePpp, struct in NMDeviceOvs +NMDevicePpp, struct in NMDeviceOvs
@@ -921,47 +921,47 @@ NMDevicePpp, struct in NMDeviceOvs
-NMDeviceTeam, struct in NMDeviceOvs +NMDeviceTeam, struct in NMDeviceOvs
-NMDeviceTeam:carrier, object property in NMDeviceOvs +NMDeviceTeam:carrier, object property in NMDeviceOvs
-NMDeviceTeam:config, object property in NMDeviceOvs +NMDeviceTeam:config, object property in NMDeviceOvs
-NMDeviceTeam:slaves, object property in NMDeviceOvs +NMDeviceTeam:slaves, object property in NMDeviceOvs
-NMDeviceTun, struct in NMDeviceOvs +NMDeviceTun, struct in NMDeviceOvs
-NMDeviceTun:group, object property in NMDeviceOvs +NMDeviceTun:group, object property in NMDeviceOvs
-NMDeviceTun:mode, object property in NMDeviceOvs +NMDeviceTun:mode, object property in NMDeviceOvs
-NMDeviceTun:multi-queue, object property in NMDeviceOvs +NMDeviceTun:multi-queue, object property in NMDeviceOvs
-NMDeviceTun:no-pi, object property in NMDeviceOvs +NMDeviceTun:no-pi, object property in NMDeviceOvs
-NMDeviceTun:owner, object property in NMDeviceOvs +NMDeviceTun:owner, object property in NMDeviceOvs
-NMDeviceTun:vnet-hdr, object property in NMDeviceOvs +NMDeviceTun:vnet-hdr, object property in NMDeviceOvs
@@ -969,147 +969,147 @@ NMDeviceTun:vnet-hdr, object property in NMDeviceOvs
-NMDeviceVeth, struct in NMDeviceOvs +NMDeviceVeth, struct in NMDeviceOvs
-NMDeviceVeth:peer, object property in NMDeviceOvs +NMDeviceVeth:peer, object property in NMDeviceOvs
-NMDeviceVlan, struct in NMDeviceOvs +NMDeviceVlan, struct in NMDeviceOvs
-NMDeviceVlan:carrier, object property in NMDeviceOvs +NMDeviceVlan:carrier, object property in NMDeviceOvs
-NMDeviceVlan:parent, object property in NMDeviceOvs +NMDeviceVlan:parent, object property in NMDeviceOvs
-NMDeviceVlan:vlan-id, object property in NMDeviceOvs +NMDeviceVlan:vlan-id, object property in NMDeviceOvs
-NMDeviceVrf, struct in NMDeviceOvs +NMDeviceVrf, struct in NMDeviceOvs
-NMDeviceVrf:table, object property in NMDeviceOvs +NMDeviceVrf:table, object property in NMDeviceOvs
-NMDeviceVxlan, struct in NMDeviceOvs +NMDeviceVxlan, struct in NMDeviceOvs
-NMDeviceVxlan:ageing, object property in NMDeviceOvs +NMDeviceVxlan:ageing, object property in NMDeviceOvs
-NMDeviceVxlan:carrier, object property in NMDeviceOvs +NMDeviceVxlan:carrier, object property in NMDeviceOvs
-NMDeviceVxlan:dst-port, object property in NMDeviceOvs +NMDeviceVxlan:dst-port, object property in NMDeviceOvs
-NMDeviceVxlan:group, object property in NMDeviceOvs +NMDeviceVxlan:group, object property in NMDeviceOvs
-NMDeviceVxlan:id, object property in NMDeviceOvs +NMDeviceVxlan:id, object property in NMDeviceOvs
-NMDeviceVxlan:l2miss, object property in NMDeviceOvs +NMDeviceVxlan:l2miss, object property in NMDeviceOvs
-NMDeviceVxlan:l3miss, object property in NMDeviceOvs +NMDeviceVxlan:l3miss, object property in NMDeviceOvs
-NMDeviceVxlan:learning, object property in NMDeviceOvs +NMDeviceVxlan:learning, object property in NMDeviceOvs
-NMDeviceVxlan:limit, object property in NMDeviceOvs +NMDeviceVxlan:limit, object property in NMDeviceOvs
-NMDeviceVxlan:local, object property in NMDeviceOvs +NMDeviceVxlan:local, object property in NMDeviceOvs
-NMDeviceVxlan:parent, object property in NMDeviceOvs +NMDeviceVxlan:parent, object property in NMDeviceOvs
-NMDeviceVxlan:proxy, object property in NMDeviceOvs +NMDeviceVxlan:proxy, object property in NMDeviceOvs
-NMDeviceVxlan:rsc, object property in NMDeviceOvs +NMDeviceVxlan:rsc, object property in NMDeviceOvs
-NMDeviceVxlan:src-port-max, object property in NMDeviceOvs +NMDeviceVxlan:src-port-max, object property in NMDeviceOvs
-NMDeviceVxlan:src-port-min, object property in NMDeviceOvs +NMDeviceVxlan:src-port-min, object property in NMDeviceOvs
-NMDeviceVxlan:tos, object property in NMDeviceOvs +NMDeviceVxlan:tos, object property in NMDeviceOvs
-NMDeviceVxlan:ttl, object property in NMDeviceOvs +NMDeviceVxlan:ttl, object property in NMDeviceOvs
-NMDeviceWifi, struct in NMDeviceOvs +NMDeviceWifi, struct in NMDeviceOvs
-NMDeviceWifi::access-point-added, object signal in NMDeviceOvs +NMDeviceWifi::access-point-added, object signal in NMDeviceOvs
-NMDeviceWifi::access-point-removed, object signal in NMDeviceOvs +NMDeviceWifi::access-point-removed, object signal in NMDeviceOvs
-NMDeviceWifi:access-points, object property in NMDeviceOvs +NMDeviceWifi:access-points, object property in NMDeviceOvs
-NMDeviceWifi:active-access-point, object property in NMDeviceOvs +NMDeviceWifi:active-access-point, object property in NMDeviceOvs
-NMDeviceWifi:bitrate, object property in NMDeviceOvs +NMDeviceWifi:bitrate, object property in NMDeviceOvs
-NMDeviceWifi:last-scan, object property in NMDeviceOvs +NMDeviceWifi:last-scan, object property in NMDeviceOvs
-NMDeviceWifi:mode, object property in NMDeviceOvs +NMDeviceWifi:mode, object property in NMDeviceOvs
-NMDeviceWifi:perm-hw-address, object property in NMDeviceOvs +NMDeviceWifi:perm-hw-address, object property in NMDeviceOvs
-NMDeviceWifi:wireless-capabilities, object property in NMDeviceOvs +NMDeviceWifi:wireless-capabilities, object property in NMDeviceOvs
@@ -1117,95 +1117,95 @@ NMDeviceWifi:wireless-capabilities, object property in NMDeviceOvs
-NMDeviceWifiP2P, struct in NMDeviceOvs +NMDeviceWifiP2P, struct in NMDeviceOvs
-NMDeviceWifiP2P::peer-added, object signal in NMDeviceOvs +NMDeviceWifiP2P::peer-added, object signal in NMDeviceOvs
-NMDeviceWifiP2P::peer-removed, object signal in NMDeviceOvs +NMDeviceWifiP2P::peer-removed, object signal in NMDeviceOvs
-NMDeviceWifiP2P:peers, object property in NMDeviceOvs +NMDeviceWifiP2P:peers, object property in NMDeviceOvs
-NMDeviceWimax, struct in NMDeviceOvs +NMDeviceWimax, struct in NMDeviceOvs
-NMDeviceWimax::nsp-added, object signal in NMDeviceOvs +NMDeviceWimax::nsp-added, object signal in NMDeviceOvs
-NMDeviceWimax::nsp-removed, object signal in NMDeviceOvs +NMDeviceWimax::nsp-removed, object signal in NMDeviceOvs
-NMDeviceWimax:active-nsp, object property in NMDeviceOvs +NMDeviceWimax:active-nsp, object property in NMDeviceOvs
-NMDeviceWimax:bsid, object property in NMDeviceOvs +NMDeviceWimax:bsid, object property in NMDeviceOvs
-NMDeviceWimax:center-frequency, object property in NMDeviceOvs +NMDeviceWimax:center-frequency, object property in NMDeviceOvs
-NMDeviceWimax:cinr, object property in NMDeviceOvs +NMDeviceWimax:cinr, object property in NMDeviceOvs
-NMDeviceWimax:hw-address, object property in NMDeviceOvs +NMDeviceWimax:hw-address, object property in NMDeviceOvs
-NMDeviceWimax:nsps, object property in NMDeviceOvs +NMDeviceWimax:nsps, object property in NMDeviceOvs
-NMDeviceWimax:rssi, object property in NMDeviceOvs +NMDeviceWimax:rssi, object property in NMDeviceOvs
-NMDeviceWimax:tx-power, object property in NMDeviceOvs +NMDeviceWimax:tx-power, object property in NMDeviceOvs
-NMDeviceWireGuard, struct in NMDeviceOvs +NMDeviceWireGuard, struct in NMDeviceOvs
-NMDeviceWireGuard:fwmark, object property in NMDeviceOvs +NMDeviceWireGuard:fwmark, object property in NMDeviceOvs
-NMDeviceWireGuard:listen-port, object property in NMDeviceOvs +NMDeviceWireGuard:listen-port, object property in NMDeviceOvs
-NMDeviceWireGuard:public-key, object property in NMDeviceOvs +NMDeviceWireGuard:public-key, object property in NMDeviceOvs
-NMDeviceWpan, struct in NMDeviceOvs +NMDeviceWpan, struct in NMDeviceOvs
-NMDhcpConfig, struct in NMDeviceOvs +NMDhcpConfig, struct in NMDeviceOvs
-NMDhcpConfig:family, object property in NMDeviceOvs +NMDhcpConfig:family, object property in NMDeviceOvs
-NMDhcpConfig:options, object property in NMDeviceOvs +NMDhcpConfig:options, object property in NMDeviceOvs
@@ -1221,39 +1221,39 @@ NMDhcpConfigClass, struct in NMIPConfig, struct in NMDeviceOvs
-NMIPConfig:addresses, object property in NMDeviceOvs +NMIPConfig:addresses, object property in NMDeviceOvs
-NMIPConfig:domains, object property in NMDeviceOvs +NMIPConfig:domains, object property in NMDeviceOvs
-NMIPConfig:family, object property in NMDeviceOvs +NMIPConfig:family, object property in NMDeviceOvs
-NMIPConfig:gateway, object property in NMDeviceOvs +NMIPConfig:gateway, object property in NMDeviceOvs
-NMIPConfig:nameservers, object property in NMDeviceOvs +NMIPConfig:nameservers, object property in NMDeviceOvs
-NMIPConfig:routes, object property in NMDeviceOvs +NMIPConfig:routes, object property in NMDeviceOvs
-NMIPConfig:searches, object property in NMDeviceOvs +NMIPConfig:searches, object property in NMDeviceOvs
-NMIPConfig:wins-servers, object property in NMDeviceOvs +NMIPConfig:wins-servers, object property in NMDeviceOvs
@@ -1581,15 +1581,15 @@ NML_NMCLIENT_LOG_W, macro in NMObject, struct in NMDeviceOvs
-NMObject:client, object property in NMDeviceOvs +NMObject:client, object property in NMDeviceOvs
-NMObject:path, object property in NMDeviceOvs +NMObject:path, object property in NMDeviceOvs
@@ -1613,23 +1613,23 @@ _NMObjectClassFieldInfo, struct in
-NMRemoteConnection, struct in NMDeviceOvs +NMRemoteConnection, struct in NMDeviceOvs
-NMRemoteConnection:filename, object property in NMDeviceOvs +NMRemoteConnection:filename, object property in NMDeviceOvs
-NMRemoteConnection:flags, object property in NMDeviceOvs +NMRemoteConnection:flags, object property in NMDeviceOvs
-NMRemoteConnection:unsaved, object property in NMDeviceOvs +NMRemoteConnection:unsaved, object property in NMDeviceOvs
-NMRemoteConnection:visible, object property in NMDeviceOvs +NMRemoteConnection:visible, object property in NMDeviceOvs
@@ -1685,7 +1685,7 @@ NMRemoteConnection:visible, object property in NMDeviceOvs
-NMSetting, struct in NMSettingOvs +NMSetting, struct in NMSettingOvs
@@ -1701,11 +1701,11 @@ NMSetting8021x, struct in NMSettingOvs
-NMSetting8021x:altsubject-matches, object property in NMSettingOvs +NMSetting8021x:altsubject-matches, object property in NMSettingOvs
-NMSetting8021x:anonymous-identity, object property in NMSettingOvs +NMSetting8021x:anonymous-identity, object property in NMSettingOvs
@@ -1713,7 +1713,7 @@ NMSetting8021x:auth-timeout, object property in NMSettingOvs
-NMSetting8021x:ca-cert, object property in NMSettingOvs +NMSetting8021x:ca-cert, object property in NMSettingOvs
@@ -1725,11 +1725,11 @@ NMSetting8021x:ca-cert-password-flags, object property in NMSettingOvs
-NMSetting8021x:ca-path, object property in NMSettingOvs +NMSetting8021x:ca-path, object property in NMSettingOvs
-NMSetting8021x:client-cert, object property in NMSettingOvs +NMSetting8021x:client-cert, object property in NMSettingOvs
@@ -1749,11 +1749,11 @@ NMSetting8021x:domain-suffix-match, object property in NMSettingOvs
-NMSetting8021x:eap, object property in NMSettingOvs +NMSetting8021x:eap, object property in NMSettingOvs
-NMSetting8021x:identity, object property in NMSettingOvs +NMSetting8021x:identity, object property in NMSettingOvs
@@ -1761,23 +1761,23 @@ NMSetting8021x:optional, object property in NMSettingOvs
-NMSetting8021x:pac-file, object property in NMSettingOvs +NMSetting8021x:pac-file, object property in NMSettingOvs
-NMSetting8021x:password, object property in NMSettingOvs +NMSetting8021x:password, object property in NMSettingOvs
-NMSetting8021x:password-flags, object property in NMSettingOvs +NMSetting8021x:password-flags, object property in NMSettingOvs
-NMSetting8021x:password-raw, object property in NMSettingOvs +NMSetting8021x:password-raw, object property in NMSettingOvs
-NMSetting8021x:password-raw-flags, object property in NMSettingOvs +NMSetting8021x:password-raw-flags, object property in NMSettingOvs
@@ -1785,31 +1785,31 @@ NMSetting8021x:phase1-auth-flags, object property in NMSettingOvs
-NMSetting8021x:phase1-fast-provisioning, object property in NMSettingOvs +NMSetting8021x:phase1-fast-provisioning, object property in NMSettingOvs
-NMSetting8021x:phase1-peaplabel, object property in NMSettingOvs +NMSetting8021x:phase1-peaplabel, object property in NMSettingOvs
-NMSetting8021x:phase1-peapver, object property in NMSettingOvs +NMSetting8021x:phase1-peapver, object property in NMSettingOvs
-NMSetting8021x:phase2-altsubject-matches, object property in NMSettingOvs +NMSetting8021x:phase2-altsubject-matches, object property in NMSettingOvs
-NMSetting8021x:phase2-auth, object property in NMSettingOvs +NMSetting8021x:phase2-auth, object property in NMSettingOvs
-NMSetting8021x:phase2-autheap, object property in NMSettingOvs +NMSetting8021x:phase2-autheap, object property in NMSettingOvs
-NMSetting8021x:phase2-ca-cert, object property in NMSettingOvs +NMSetting8021x:phase2-ca-cert, object property in NMSettingOvs
@@ -1821,11 +1821,11 @@ NMSetting8021x:phase2-ca-cert-password-flags, object property in NMSettingOvs
-NMSetting8021x:phase2-ca-path, object property in NMSettingOvs +NMSetting8021x:phase2-ca-path, object property in NMSettingOvs
-NMSetting8021x:phase2-client-cert, object property in NMSettingOvs +NMSetting8021x:phase2-client-cert, object property in NMSettingOvs
@@ -1845,47 +1845,47 @@ NMSetting8021x:phase2-domain-suffix-match, object property in NMSettingOvs
-NMSetting8021x:phase2-private-key, object property in NMSettingOvs +NMSetting8021x:phase2-private-key, object property in NMSettingOvs
-NMSetting8021x:phase2-private-key-password, object property in NMSettingOvs +NMSetting8021x:phase2-private-key-password, object property in NMSettingOvs
-NMSetting8021x:phase2-private-key-password-flags, object property in NMSettingOvs +NMSetting8021x:phase2-private-key-password-flags, object property in NMSettingOvs
-NMSetting8021x:phase2-subject-match, object property in NMSettingOvs +NMSetting8021x:phase2-subject-match, object property in NMSettingOvs
-NMSetting8021x:pin, object property in NMSettingOvs +NMSetting8021x:pin, object property in NMSettingOvs
-NMSetting8021x:pin-flags, object property in NMSettingOvs +NMSetting8021x:pin-flags, object property in NMSettingOvs
-NMSetting8021x:private-key, object property in NMSettingOvs +NMSetting8021x:private-key, object property in NMSettingOvs
-NMSetting8021x:private-key-password, object property in NMSettingOvs +NMSetting8021x:private-key-password, object property in NMSettingOvs
-NMSetting8021x:private-key-password-flags, object property in NMSettingOvs +NMSetting8021x:private-key-password-flags, object property in NMSettingOvs
-NMSetting8021x:subject-match, object property in NMSettingOvs +NMSetting8021x:subject-match, object property in NMSettingOvs
-NMSetting8021x:system-ca-certs, object property in NMSettingOvs +NMSetting8021x:system-ca-certs, object property in NMSettingOvs
@@ -1901,7 +1901,7 @@ NMSetting8021x:system-ca-certs, object property in NMSettingOvs
-NMSetting:name, object property in NMSettingOvs +NMSetting:name, object property in NMSettingOvs
@@ -1909,31 +1909,31 @@ NMSettingAdsl, struct in NMSettingOvs
-NMSettingAdsl:encapsulation, object property in NMSettingOvs +NMSettingAdsl:encapsulation, object property in NMSettingOvs
-NMSettingAdsl:password, object property in NMSettingOvs +NMSettingAdsl:password, object property in NMSettingOvs
-NMSettingAdsl:password-flags, object property in NMSettingOvs +NMSettingAdsl:password-flags, object property in NMSettingOvs
-NMSettingAdsl:protocol, object property in NMSettingOvs +NMSettingAdsl:protocol, object property in NMSettingOvs
-NMSettingAdsl:username, object property in NMSettingOvs +NMSettingAdsl:username, object property in NMSettingOvs
-NMSettingAdsl:vci, object property in NMSettingOvs +NMSettingAdsl:vci, object property in NMSettingOvs
-NMSettingAdsl:vpi, object property in NMSettingOvs +NMSettingAdsl:vpi, object property in NMSettingOvs
@@ -1941,11 +1941,11 @@ NMSettingBluetooth, struct in NMSettingOvs
-NMSettingBluetooth:bdaddr, object property in NMSettingOvs +NMSettingBluetooth:bdaddr, object property in NMSettingOvs
-NMSettingBluetooth:type, object property in NMSettingOvs +NMSettingBluetooth:type, object property in NMSettingOvs
@@ -1953,7 +1953,7 @@ NMSettingBond, struct in NMSettingOvs
-NMSettingBond:options, object property in NMSettingOvs +NMSettingBond:options, object property in NMSettingOvs
@@ -1969,11 +1969,11 @@ NMSettingBridge, struct in NMSettingOvs
-NMSettingBridge:ageing-time, object property in NMSettingOvs +NMSettingBridge:ageing-time, object property in NMSettingOvs
-NMSettingBridge:forward-delay, object property in NMSettingOvs +NMSettingBridge:forward-delay, object property in NMSettingOvs
@@ -1985,15 +1985,15 @@ NMSettingBridge:group-forward-mask, object property in NMSettingOvs
-NMSettingBridge:hello-time, object property in NMSettingOvs +NMSettingBridge:hello-time, object property in NMSettingOvs
-NMSettingBridge:mac-address, object property in NMSettingOvs +NMSettingBridge:mac-address, object property in NMSettingOvs
-NMSettingBridge:max-age, object property in NMSettingOvs +NMSettingBridge:max-age, object property in NMSettingOvs
@@ -2049,11 +2049,11 @@ NMSettingBridge:multicast-startup-query-interval, object property in NMSettingOv
-NMSettingBridge:priority, object property in NMSettingOvs +NMSettingBridge:priority, object property in NMSettingOvs
-NMSettingBridge:stp, object property in NMSettingOvs +NMSettingBridge:stp, object property in NMSettingOvs
@@ -2081,15 +2081,15 @@ NMSettingBridgePort, struct in NMSettingOvs
-NMSettingBridgePort:hairpin-mode, object property in NMSettingOvs +NMSettingBridgePort:hairpin-mode, object property in NMSettingOvs
-NMSettingBridgePort:path-cost, object property in NMSettingOvs +NMSettingBridgePort:path-cost, object property in NMSettingOvs
-NMSettingBridgePort:priority, object property in NMSettingOvs +NMSettingBridgePort:priority, object property in NMSettingOvs
@@ -2105,19 +2105,19 @@ NMSettingCdma:mtu, object property in NMSettingOvs
-NMSettingCdma:number, object property in NMSettingOvs +NMSettingCdma:number, object property in NMSettingOvs
-NMSettingCdma:password, object property in NMSettingOvs +NMSettingCdma:password, object property in NMSettingOvs
-NMSettingCdma:password-flags, object property in NMSettingOvs +NMSettingCdma:password-flags, object property in NMSettingOvs
-NMSettingCdma:username, object property in NMSettingOvs +NMSettingCdma:username, object property in NMSettingOvs
@@ -2129,7 +2129,7 @@ NMSettingCdma:username, object property in NMSettingOvs
-NMSettingConnection, struct in NMSettingOvs +NMSettingConnection, struct in NMSettingOvs
@@ -2137,7 +2137,7 @@ NMSettingConnection:auth-retries, object property in NMSettingOvs
-NMSettingConnection:autoconnect, object property in NMSettingOvs +NMSettingConnection:autoconnect, object property in NMSettingOvs
@@ -2157,15 +2157,15 @@ NMSettingConnection:dns-over-tls, object property in NMSettingOvs
-NMSettingConnection:gateway-ping-timeout, object property in NMSettingOvs +NMSettingConnection:gateway-ping-timeout, object property in NMSettingOvs
-NMSettingConnection:id, object property in NMSettingOvs +NMSettingConnection:id, object property in NMSettingOvs
-NMSettingConnection:interface-name, object property in NMSettingOvs +NMSettingConnection:interface-name, object property in NMSettingOvs
@@ -2177,7 +2177,7 @@ NMSettingConnection:llmnr, object property in NMSettingOvs
-NMSettingConnection:master, object property in NMSettingOvs +NMSettingConnection:master, object property in NMSettingOvs
@@ -2197,19 +2197,19 @@ NMSettingConnection:multi-connect, object property in NMSettingOvs
-NMSettingConnection:permissions, object property in NMSettingOvs +NMSettingConnection:permissions, object property in NMSettingOvs
-NMSettingConnection:read-only, object property in NMSettingOvs +NMSettingConnection:read-only, object property in NMSettingOvs
-NMSettingConnection:secondaries, object property in NMSettingOvs +NMSettingConnection:secondaries, object property in NMSettingOvs
-NMSettingConnection:slave-type, object property in NMSettingOvs +NMSettingConnection:slave-type, object property in NMSettingOvs
@@ -2217,15 +2217,15 @@ NMSettingConnection:stable-id, object property in NMSettingOvs
-NMSettingConnection:timestamp, object property in NMSettingOvs +NMSettingConnection:timestamp, object property in NMSettingOvs
-NMSettingConnection:type, object property in NMSettingOvs +NMSettingConnection:type, object property in NMSettingOvs
-NMSettingConnection:uuid, object property in NMSettingOvs +NMSettingConnection:uuid, object property in NMSettingOvs
@@ -2233,7 +2233,7 @@ NMSettingConnection:wait-device-timeout, object property in NMSettingOvs
-NMSettingConnection:zone, object property in NMSettingOvs +NMSettingConnection:zone, object property in NMSettingOvs
@@ -2261,63 +2261,63 @@ NMSettingDcb, struct in NMSettingOvs
-NMSettingDcb:app-fcoe-flags, object property in NMSettingOvs +NMSettingDcb:app-fcoe-flags, object property in NMSettingOvs
-NMSettingDcb:app-fcoe-mode, object property in NMSettingOvs +NMSettingDcb:app-fcoe-mode, object property in NMSettingOvs
-NMSettingDcb:app-fcoe-priority, object property in NMSettingOvs +NMSettingDcb:app-fcoe-priority, object property in NMSettingOvs
-NMSettingDcb:app-fip-flags, object property in NMSettingOvs +NMSettingDcb:app-fip-flags, object property in NMSettingOvs
-NMSettingDcb:app-fip-priority, object property in NMSettingOvs +NMSettingDcb:app-fip-priority, object property in NMSettingOvs
-NMSettingDcb:app-iscsi-flags, object property in NMSettingOvs +NMSettingDcb:app-iscsi-flags, object property in NMSettingOvs
-NMSettingDcb:app-iscsi-priority, object property in NMSettingOvs +NMSettingDcb:app-iscsi-priority, object property in NMSettingOvs
-NMSettingDcb:priority-bandwidth, object property in NMSettingOvs +NMSettingDcb:priority-bandwidth, object property in NMSettingOvs
-NMSettingDcb:priority-flow-control, object property in NMSettingOvs +NMSettingDcb:priority-flow-control, object property in NMSettingOvs
-NMSettingDcb:priority-flow-control-flags, object property in NMSettingOvs +NMSettingDcb:priority-flow-control-flags, object property in NMSettingOvs
-NMSettingDcb:priority-group-bandwidth, object property in NMSettingOvs +NMSettingDcb:priority-group-bandwidth, object property in NMSettingOvs
-NMSettingDcb:priority-group-flags, object property in NMSettingOvs +NMSettingDcb:priority-group-flags, object property in NMSettingOvs
-NMSettingDcb:priority-group-id, object property in NMSettingOvs +NMSettingDcb:priority-group-id, object property in NMSettingOvs
-NMSettingDcb:priority-strict-bandwidth, object property in NMSettingOvs +NMSettingDcb:priority-strict-bandwidth, object property in NMSettingOvs
-NMSettingDcb:priority-traffic-class, object property in NMSettingOvs +NMSettingDcb:priority-traffic-class, object property in NMSettingOvs
@@ -2345,7 +2345,7 @@ NMSettingGsm, struct in NMSettingOvs
-NMSettingGsm:apn, object property in NMSettingOvs +NMSettingGsm:apn, object property in NMSettingOvs
@@ -2357,7 +2357,7 @@ NMSettingGsm:device-id, object property in NMSettingOvs
-NMSettingGsm:home-only, object property in NMSettingOvs +NMSettingGsm:home-only, object property in NMSettingOvs
@@ -2365,27 +2365,27 @@ NMSettingGsm:mtu, object property in NMSettingOvs
-NMSettingGsm:network-id, object property in NMSettingOvs +NMSettingGsm:network-id, object property in NMSettingOvs
-NMSettingGsm:number, object property in NMSettingOvs +NMSettingGsm:number, object property in NMSettingOvs
-NMSettingGsm:password, object property in NMSettingOvs +NMSettingGsm:password, object property in NMSettingOvs
-NMSettingGsm:password-flags, object property in NMSettingOvs +NMSettingGsm:password-flags, object property in NMSettingOvs
-NMSettingGsm:pin, object property in NMSettingOvs +NMSettingGsm:pin, object property in NMSettingOvs
-NMSettingGsm:pin-flags, object property in NMSettingOvs +NMSettingGsm:pin-flags, object property in NMSettingOvs
@@ -2397,7 +2397,7 @@ NMSettingGsm:sim-operator-id, object property in NMSettingOvs
-NMSettingGsm:username, object property in NMSettingOvs +NMSettingGsm:username, object property in NMSettingOvs
@@ -2425,23 +2425,23 @@ NMSettingInfiniband, struct in NMSettingOvs
-NMSettingInfiniband:mac-address, object property in NMSettingOvs +NMSettingInfiniband:mac-address, object property in NMSettingOvs
-NMSettingInfiniband:mtu, object property in NMSettingOvs +NMSettingInfiniband:mtu, object property in NMSettingOvs
-NMSettingInfiniband:p-key, object property in NMSettingOvs +NMSettingInfiniband:p-key, object property in NMSettingOvs
-NMSettingInfiniband:parent, object property in NMSettingOvs +NMSettingInfiniband:parent, object property in NMSettingOvs
-NMSettingInfiniband:transport-mode, object property in NMSettingOvs +NMSettingInfiniband:transport-mode, object property in NMSettingOvs
@@ -2449,7 +2449,7 @@ NMSettingIP4Config, struct in NMSettingOvs
-NMSettingIP4Config:dhcp-client-id, object property in NMSettingOvs +NMSettingIP4Config:dhcp-client-id, object property in NMSettingOvs
@@ -2473,7 +2473,7 @@ NMSettingIP6Config:dhcp-duid, object property in NMSettingOvs
-NMSettingIP6Config:ip6-privacy, object property in NMSettingOvs +NMSettingIP6Config:ip6-privacy, object property in NMSettingOvs
@@ -2741,15 +2741,15 @@ NMSettingOlpcMesh, struct in NMSettingOvs
-NMSettingOlpcMesh:channel, object property in NMSettingOvs +NMSettingOlpcMesh:channel, object property in NMSettingOvs
-NMSettingOlpcMesh:dhcp-anycast-address, object property in NMSettingOvs +NMSettingOlpcMesh:dhcp-anycast-address, object property in NMSettingOvs
-NMSettingOlpcMesh:ssid, object property in NMSettingOvs +NMSettingOlpcMesh:ssid, object property in NMSettingOvs
@@ -2981,23 +2981,23 @@ NMSettingSerial, struct in NMSettingOvs
-NMSettingSerial:baud, object property in NMSettingOvs +NMSettingSerial:baud, object property in NMSettingOvs
-NMSettingSerial:bits, object property in NMSettingOvs +NMSettingSerial:bits, object property in NMSettingOvs
-NMSettingSerial:parity, object property in NMSettingOvs +NMSettingSerial:parity, object property in NMSettingOvs
-NMSettingSerial:send-delay, object property in NMSettingOvs +NMSettingSerial:send-delay, object property in NMSettingOvs
-NMSettingSerial:stopbits, object property in NMSettingOvs +NMSettingSerial:stopbits, object property in NMSettingOvs
@@ -3045,7 +3045,7 @@ NMSettingTeam, struct in NMSettingOvs
-NMSettingTeam:config, object property in NMSettingOvs +NMSettingTeam:config, object property in NMSettingOvs
@@ -3113,7 +3113,7 @@ NMSettingTeamPort, struct in NMSettingOvs
-NMSettingTeamPort:config, object property in NMSettingOvs +NMSettingTeamPort:config, object property in NMSettingOvs
@@ -3197,23 +3197,23 @@ NMSettingVlan, struct in NMSettingOvs
-NMSettingVlan:egress-priority-map, object property in NMSettingOvs +NMSettingVlan:egress-priority-map, object property in NMSettingOvs
-NMSettingVlan:flags, object property in NMSettingOvs +NMSettingVlan:flags, object property in NMSettingOvs
-NMSettingVlan:id, object property in NMSettingOvs +NMSettingVlan:id, object property in NMSettingOvs
-NMSettingVlan:ingress-priority-map, object property in NMSettingOvs +NMSettingVlan:ingress-priority-map, object property in NMSettingOvs
-NMSettingVlan:parent, object property in NMSettingOvs +NMSettingVlan:parent, object property in NMSettingOvs
@@ -3341,11 +3341,11 @@ NMSettingWimax, struct in NMSettingOvs
-NMSettingWimax:mac-address, object property in NMSettingOvs +NMSettingWimax:mac-address, object property in NMSettingOvs
-NMSettingWimax:network-name, object property in NMSettingOvs +NMSettingWimax:network-name, object property in NMSettingOvs
@@ -3357,15 +3357,15 @@ NMSettingWired:accept-all-mac-addresses, object property in NMSettingOvs
-NMSettingWired:auto-negotiate, object property in NMSettingOvs +NMSettingWired:auto-negotiate, object property in NMSettingOvs
-NMSettingWired:cloned-mac-address, object property in NMSettingOvs +NMSettingWired:cloned-mac-address, object property in NMSettingOvs
-NMSettingWired:duplex, object property in NMSettingOvs +NMSettingWired:duplex, object property in NMSettingOvs
@@ -3373,35 +3373,35 @@ NMSettingWired:generate-mac-address-mask, object property in NMSettingOvs
-NMSettingWired:mac-address, object property in NMSettingOvs +NMSettingWired:mac-address, object property in NMSettingOvs
-NMSettingWired:mac-address-blacklist, object property in NMSettingOvs +NMSettingWired:mac-address-blacklist, object property in NMSettingOvs
-NMSettingWired:mtu, object property in NMSettingOvs +NMSettingWired:mtu, object property in NMSettingOvs
-NMSettingWired:port, object property in NMSettingOvs +NMSettingWired:port, object property in NMSettingOvs
-NMSettingWired:s390-nettype, object property in NMSettingOvs +NMSettingWired:s390-nettype, object property in NMSettingOvs
-NMSettingWired:s390-options, object property in NMSettingOvs +NMSettingWired:s390-options, object property in NMSettingOvs
-NMSettingWired:s390-subchannels, object property in NMSettingOvs +NMSettingWired:s390-subchannels, object property in NMSettingOvs
-NMSettingWired:speed, object property in NMSettingOvs +NMSettingWired:speed, object property in NMSettingOvs
@@ -3461,19 +3461,19 @@ NMSettingWireless:ap-isolation, object property in NMSettingOvs
-NMSettingWireless:band, object property in NMSettingOvs +NMSettingWireless:band, object property in NMSettingOvs
-NMSettingWireless:bssid, object property in NMSettingOvs +NMSettingWireless:bssid, object property in NMSettingOvs
-NMSettingWireless:channel, object property in NMSettingOvs +NMSettingWireless:channel, object property in NMSettingOvs
-NMSettingWireless:cloned-mac-address, object property in NMSettingOvs +NMSettingWireless:cloned-mac-address, object property in NMSettingOvs
@@ -3481,15 +3481,15 @@ NMSettingWireless:generate-mac-address-mask, object property in NMSettingOvs
-NMSettingWireless:hidden, object property in NMSettingOvs +NMSettingWireless:hidden, object property in NMSettingOvs
-NMSettingWireless:mac-address, object property in NMSettingOvs +NMSettingWireless:mac-address, object property in NMSettingOvs
-NMSettingWireless:mac-address-blacklist, object property in NMSettingOvs +NMSettingWireless:mac-address-blacklist, object property in NMSettingOvs
@@ -3497,31 +3497,31 @@ NMSettingWireless:mac-address-randomization, object property in NMSettingOvs
-NMSettingWireless:mode, object property in NMSettingOvs +NMSettingWireless:mode, object property in NMSettingOvs
-NMSettingWireless:mtu, object property in NMSettingOvs +NMSettingWireless:mtu, object property in NMSettingOvs
-NMSettingWireless:powersave, object property in NMSettingOvs +NMSettingWireless:powersave, object property in NMSettingOvs
-NMSettingWireless:rate, object property in NMSettingOvs +NMSettingWireless:rate, object property in NMSettingOvs
-NMSettingWireless:seen-bssids, object property in NMSettingOvs +NMSettingWireless:seen-bssids, object property in NMSettingOvs
-NMSettingWireless:ssid, object property in NMSettingOvs +NMSettingWireless:ssid, object property in NMSettingOvs
-NMSettingWireless:tx-power, object property in NMSettingOvs +NMSettingWireless:tx-power, object property in NMSettingOvs
@@ -3537,7 +3537,7 @@ NMSettingWirelessSecurity, struct in NMSettingOvs
-NMSettingWirelessSecurity:auth-alg, object property in NMSettingOvs +NMSettingWirelessSecurity:auth-alg, object property in NMSettingOvs
@@ -3545,27 +3545,27 @@ NMSettingWirelessSecurity:fils, object property in NMSettingOvs
-NMSettingWirelessSecurity:group, object property in NMSettingOvs +NMSettingWirelessSecurity:group, object property in NMSettingOvs
-NMSettingWirelessSecurity:key-mgmt, object property in NMSettingOvs +NMSettingWirelessSecurity:key-mgmt, object property in NMSettingOvs
-NMSettingWirelessSecurity:leap-password, object property in NMSettingOvs +NMSettingWirelessSecurity:leap-password, object property in NMSettingOvs
-NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingOvs +NMSettingWirelessSecurity:leap-password-flags, object property in NMSettingOvs
-NMSettingWirelessSecurity:leap-username, object property in NMSettingOvs +NMSettingWirelessSecurity:leap-username, object property in NMSettingOvs
-NMSettingWirelessSecurity:pairwise, object property in NMSettingOvs +NMSettingWirelessSecurity:pairwise, object property in NMSettingOvs
@@ -3573,43 +3573,43 @@ NMSettingWirelessSecurity:pmf, object property in NMSettingOvs
-NMSettingWirelessSecurity:proto, object property in NMSettingOvs +NMSettingWirelessSecurity:proto, object property in NMSettingOvs
-NMSettingWirelessSecurity:psk, object property in NMSettingOvs +NMSettingWirelessSecurity:psk, object property in NMSettingOvs
-NMSettingWirelessSecurity:psk-flags, object property in NMSettingOvs +NMSettingWirelessSecurity:psk-flags, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key-flags, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key-type, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key-type, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key0, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key0, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key1, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key1, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key2, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key2, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-key3, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-key3, object property in NMSettingOvs
-NMSettingWirelessSecurity:wep-tx-keyidx, object property in NMSettingOvs +NMSettingWirelessSecurity:wep-tx-keyidx, object property in NMSettingOvs
@@ -3721,19 +3721,19 @@ NMUtilsPredicateStr, user_function in NMSettingOvs
-NMVpnConnection, struct in NMDeviceOvs +NMVpnConnection, struct in NMDeviceOvs
-NMVpnConnection::vpn-state-changed, object signal in NMDeviceOvs +NMVpnConnection::vpn-state-changed, object signal in NMDeviceOvs
-NMVpnConnection:banner, object property in NMDeviceOvs +NMVpnConnection:banner, object property in NMDeviceOvs
-NMVpnConnection:vpn-state, object property in NMDeviceOvs +NMVpnConnection:vpn-state, object property in NMDeviceOvs
@@ -3913,63 +3913,63 @@ NMVpnConnection:vpn-state, object property in NMDeviceOvs
-NMWifiP2PPeer, struct in NMDeviceOvs +NMWifiP2PPeer, struct in NMDeviceOvs
-NMWifiP2PPeer:flags, object property in NMDeviceOvs +NMWifiP2PPeer:flags, object property in NMDeviceOvs
-NMWifiP2PPeer:hw-address, object property in NMDeviceOvs +NMWifiP2PPeer:hw-address, object property in NMDeviceOvs
-NMWifiP2PPeer:last-seen, object property in NMDeviceOvs +NMWifiP2PPeer:last-seen, object property in NMDeviceOvs
-NMWifiP2PPeer:manufacturer, object property in NMDeviceOvs +NMWifiP2PPeer:manufacturer, object property in NMDeviceOvs
-NMWifiP2PPeer:model, object property in NMDeviceOvs +NMWifiP2PPeer:model, object property in NMDeviceOvs
-NMWifiP2PPeer:model-number, object property in NMDeviceOvs +NMWifiP2PPeer:model-number, object property in NMDeviceOvs
-NMWifiP2PPeer:name, object property in NMDeviceOvs +NMWifiP2PPeer:name, object property in NMDeviceOvs
-NMWifiP2PPeer:serial, object property in NMDeviceOvs +NMWifiP2PPeer:serial, object property in NMDeviceOvs
-NMWifiP2PPeer:strength, object property in NMDeviceOvs +NMWifiP2PPeer:strength, object property in NMDeviceOvs
-NMWifiP2PPeer:wfd-ies, object property in NMDeviceOvs +NMWifiP2PPeer:wfd-ies, object property in NMDeviceOvs
-NMWimaxNsp, struct in NMDeviceOvs +NMWimaxNsp, struct in NMDeviceOvs
-NMWimaxNsp:name, object property in NMDeviceOvs +NMWimaxNsp:name, object property in NMDeviceOvs
-NMWimaxNsp:network-type, object property in NMDeviceOvs +NMWimaxNsp:network-type, object property in NMDeviceOvs
-NMWimaxNsp:signal-quality, object property in NMDeviceOvs +NMWimaxNsp:signal-quality, object property in NMDeviceOvs
@@ -5449,11 +5449,11 @@ nm_context_busy_watcher_quark, function in NM_DBUS_INTERFACE_VPN, macro in nm-vpn-dbus-interface
-NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface +NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
@@ -5465,15 +5465,15 @@ NM_DBUS_INTERFACE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
-NM_DBUS_INVALID_VPN_CONNECTION, macro in nm-vpn-dbus-interface +NM_DBUS_INVALID_VPN_CONNECTION, macro in nm-vpn-dbus-interface
-NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in nm-vpn-dbus-interface +NM_DBUS_NO_ACTIVE_VPN_CONNECTION, macro in nm-vpn-dbus-interface
-NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface +NM_DBUS_NO_VPN_CONNECTIONS, macro in nm-vpn-dbus-interface
@@ -5509,11 +5509,11 @@ nm_dbus_path_not_empty, function in
-NM_DBUS_PATH_VPN, macro in nm-vpn-dbus-interface +NM_DBUS_PATH_VPN, macro in nm-vpn-dbus-interface
-NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface +NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
@@ -5529,67 +5529,67 @@ NM_DBUS_PATH_VPN_CONNECTION, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_ALREADY_STARTED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_ALREADY_STARTED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_ALREADY_STOPPED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_ALREADY_STOPPED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_BAD_ARGUMENTS, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_BAD_ARGUMENTS, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_ERROR_PREFIX, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_ERROR_PREFIX, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_CONNECT_FAILED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_IP4_CONFIG, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_LOGIN_BANNER, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_LOGIN_FAILED, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_STATE_CHANGE, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_STARTING_IN_PROGRESS, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_STOPPING_IN_PROGRESS, macro in nm-vpn-dbus-interface
-NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface +NM_DBUS_VPN_WRONG_STATE, macro in nm-vpn-dbus-interface
@@ -14361,11 +14361,11 @@ NM_VERSION_NEXT_STABLE, macro in nm-version-macros
-NM_VPN_DBUS_PLUGIN_INTERFACE, macro in nm-vpn-dbus-interface +NM_VPN_DBUS_PLUGIN_INTERFACE, macro in nm-vpn-dbus-interface
-NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface +NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface
@@ -14433,27 +14433,27 @@ NM_VPN_DBUS_PLUGIN_PATH, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CAN_PERSIST, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CAN_PERSIST, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_BANNER, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_BANNER, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_HAS_IP4, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_HAS_IP4, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_HAS_IP6, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_HAS_IP6, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_MTU, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_MTU, macro in nm-vpn-dbus-interface
@@ -14461,7 +14461,7 @@ NM_VPN_PLUGIN_CONFIG_PROXY_PAC, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
@@ -14597,55 +14597,55 @@ NM_VPN_PLUGIN_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_BANNER, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_BANNER, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_DNS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_DNS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_MSS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_MSS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_MTU, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_MTU, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_NBNS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_NBNS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_PREFIX, macro in nm-vpn-dbus-interface
@@ -14653,47 +14653,47 @@ NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_PTP, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_PTP, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_DNS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_DNS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_MSS, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_MSS, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_PREFIX, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_PREFIX, macro in nm-vpn-dbus-interface
@@ -14701,11 +14701,11 @@ NM_VPN_PLUGIN_IP6_CONFIG_PRESERVE_ROUTES, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_PTP, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_PTP, macro in nm-vpn-dbus-interface
-NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface +NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
@@ -15071,6 +15071,6 @@ NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/ch02.html b/docs/libnm/html/ch02.html index bd869fe5..47a7dab8 100644 --- a/docs/libnm/html/ch02.html +++ b/docs/libnm/html/ch02.html @@ -8,7 +8,7 @@ - + @@ -41,6 +41,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html index ae4cdf94..a6d653a4 100644 --- a/docs/libnm/html/ch03.html +++ b/docs/libnm/html/ch03.html @@ -8,7 +8,7 @@ - + @@ -201,6 +201,6 @@ use WEP, LEAP, WPA or WPA2/RSN security
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/ch04.html b/docs/libnm/html/ch04.html index 66672854..bc92ddc7 100644 --- a/docs/libnm/html/ch04.html +++ b/docs/libnm/html/ch04.html @@ -8,7 +8,7 @@ - + @@ -140,6 +140,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/ch05.html b/docs/libnm/html/ch05.html index 68c1a7fa..1fabc6fc 100644 --- a/docs/libnm/html/ch05.html +++ b/docs/libnm/html/ch05.html @@ -8,7 +8,7 @@ - + @@ -35,6 +35,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/ch06.html b/docs/libnm/html/ch06.html index 5ba90006..b8bcee8a 100644 --- a/docs/libnm/html/ch06.html +++ b/docs/libnm/html/ch06.html @@ -8,7 +8,7 @@ - + @@ -41,6 +41,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index dded1a65..bf4a43c5 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for libnm 1.38.2 + for libnm 1.38.4 The latest version of this documentation can be found on-line at https://networkmanager.dev/docs/libnm/latest/. @@ -402,6 +402,6 @@ use WEP, LEAP, WPA or WPA2/RSN security

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html index d5e957ed..e7ca0035 100644 --- a/docs/libnm/html/libnm-nm-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-dbus-interface.html @@ -8,7 +8,7 @@ - + @@ -4087,6 +4087,6 @@ is detected in the system.

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html index c4575070..7e8b4ede 100644 --- a/docs/libnm/html/libnm-nm-errors.html +++ b/docs/libnm/html/libnm-nm-errors.html @@ -8,7 +8,7 @@ - + @@ -254,7 +254,7 @@ nm_vpn_plugin_error_quark (void

enum NMAgentManagerError

Errors returned from the secret-agent manager.

These errors may be returned from operations that could cause secrets to be -requested (such as nm_client_activate_connection()), and correspond to D-Bus +requested (such as nm_client_activate_connection()), and correspond to D-Bus errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.

Members

@@ -326,7 +326,7 @@ request

enum NMConnectionError

Describes errors that may result from operations involving a NMConnection -or its NMSettings.

+or its NMSettings.

These errors may be returned directly from NMConnection and NMSetting methods, or may be returned from D-Bus operations (eg on NMClient or NMDevice), where they correspond to errors in the @@ -737,7 +737,7 @@ activation but is not available.

when they encounter problems retrieving secrets on behalf of NM. They correspond to errors in the "org.freedesktop.NetworkManager.SecretManager" namespace.

-

Client APIs such as nm_client_activate_connection() will not see these error +

Client APIs such as nm_client_activate_connection() will not see these error codes; instead, the secret agent manager will translate them to the corresponding NMAgentManagerError codes.

@@ -998,6 +998,6 @@ performed as the plugin does not support interactive operations, such as
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1
\ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-keyfile.html b/docs/libnm/html/libnm-nm-keyfile.html index a55f1c48..5d0967d5 100644 --- a/docs/libnm/html/libnm-nm-keyfile.html +++ b/docs/libnm/html/libnm-nm-keyfile.html @@ -8,7 +8,7 @@ - + @@ -259,7 +259,7 @@ be an absolute path.

Returns

on success, returns the created connection.

-

[transfer full]

+

[transfer full]

Since: 1.30

@@ -386,7 +386,7 @@ to override the default behavior.

Returns

a new GKeyFile or NULL on error.

-

[transfer full]

+

[transfer full]

Since: 1.30

@@ -422,7 +422,7 @@ after calling this function on it.

src

error to move into the return location.

-[transfer full] +[transfer full] @@ -458,24 +458,24 @@ on all events, but the context information may be unset.

out_kf_group_name

if the event is in the context of a keyfile group, the group name.

-[out][allow-none][transfer none] +[out][allow-none][transfer none]

out_kf_key_name

if the event is in the context of a keyfile value, the key name.

-[out][allow-none][transfer none] +[out][allow-none][transfer none]

out_cur_setting

if the event happens while handling a particular NMSetting instance.

-[out][allow-none][transfer none] +[out][allow-none][transfer none]

out_cur_property_name

the property name if applicable.

-[out][allow-none][transfer none] +[out][allow-none][transfer none] @@ -507,7 +507,7 @@ event.

out_message

the warning message.

-[out][allow-none][transfer none] +[out][allow-none][transfer none]

out_severity

@@ -636,6 +636,6 @@ depends on the
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html index a501161b..0d733cd1 100644 --- a/docs/libnm/html/libnm-nm-utils.html +++ b/docs/libnm/html/libnm-nm-utils.html @@ -8,7 +8,7 @@ - + @@ -853,7 +853,7 @@ _only_.

an allocated string containing a UTF-8 representation of the SSID, which must be freed by the caller using g_free(). Returns NULL on errors.

-

[transfer full]

+

[transfer full]

@@ -1100,7 +1100,7 @@ type 'au' representing an array of IPv4 addresses.

Returns

a new floating GVariant representing dns .

-

[transfer none]

+

[transfer none]

@@ -1128,7 +1128,7 @@ IPv4 addresses into an array of IP address strings.

Returns

a NULL-terminated array of IP address strings.

-

[transfer full][type utf8]

+

[transfer full][type utf8]

@@ -1169,7 +1169,7 @@ gateway). The "gateway" field of the first address will get the value of

Returns

a new floating GVariant representing addresses .

-

[transfer none]

+

[transfer none]

@@ -1201,7 +1201,7 @@ of the other addresses are ignored.

out_gateway

on return, will contain the IP gateway.

-[out][allow-none][transfer full] +[out][allow-none][transfer full] @@ -1210,7 +1210,7 @@ of the other addresses are ignored.

Returns

a newly allocated GPtrArray of NMIPAddress objects.

-

[transfer full][element-type NMIPAddress]

+

[transfer full][element-type NMIPAddress]

@@ -1241,7 +1241,7 @@ metric).

Returns

a new floating GVariant representing routes .

-

[transfer none]

+

[transfer none]

@@ -1271,7 +1271,7 @@ and metric) into a

Returns

a newly allocated GPtrArray of NMIPRoute objects.

-

[transfer full][element-type NMIPRoute]

+

[transfer full][element-type NMIPRoute]

@@ -1380,7 +1380,7 @@ type 'aay' representing an array of IPv6 addresses.

Returns

a new floating GVariant representing dns .

-

[transfer none]

+

[transfer none]

@@ -1410,7 +1410,7 @@ ignored.

Returns

a NULL-terminated array of IP address strings.

-

[transfer full][type utf8]

+

[transfer full][type utf8]

@@ -1452,7 +1452,7 @@ all 0s.

Returns

a new floating GVariant representing addresses .

-

[transfer none]

+

[transfer none]

@@ -1484,7 +1484,7 @@ fields of the other addresses are ignored.

out_gateway

on return, will contain the IP gateway.

-[out][allow-none][transfer full] +[out][allow-none][transfer full] @@ -1493,7 +1493,7 @@ fields of the other addresses are ignored.

Returns

a newly allocated GPtrArray of NMIPAddress objects.

-

[transfer full][element-type NMIPAddress]

+

[transfer full][element-type NMIPAddress]

@@ -1524,7 +1524,7 @@ metric).

Returns

a new floating GVariant representing routes .

-

[transfer none]

+

[transfer none]

@@ -1554,7 +1554,7 @@ hop, and metric) into a

Returns

a newly allocated GPtrArray of NMIPRoute objects.

-

[transfer full][element-type NMIPRoute]

+

[transfer full][element-type NMIPRoute]

@@ -1586,7 +1586,7 @@ include additional attributes.

Returns

a new floating GVariant representing addresses .

-

[transfer none]

+

[transfer none]

@@ -1625,7 +1625,7 @@ objects.

Returns

a newly allocated GPtrArray of NMIPAddress objects.

-

[transfer full][element-type NMIPAddress]

+

[transfer full][element-type NMIPAddress]

@@ -1656,7 +1656,7 @@ prefix, next hop, metric, and additional attributes).

Returns

a new floating GVariant representing routes .

-

[transfer none]

+

[transfer none]

@@ -1695,7 +1695,7 @@ prefix, next hop, metric, and additional attributes) into a

Returns

a newly allocated GPtrArray of NMIPRoute objects.

-

[transfer full][element-type NMIPRoute]

+

[transfer full][element-type NMIPRoute]

@@ -1706,7 +1706,7 @@ nm_utils_uuid_generate (void

Returns

a newly allocated UUID suitable for use as the NMSettingConnection -object's “id”: property. Should be freed with g_free()

+object's “id”: property. Should be freed with g_free()

@@ -1803,7 +1803,7 @@ function.

the full path to the helper, if found, or NULL if not found. The returned string is not owned by the caller, but later invocations of the function might overwrite it.

-

[transfer none]

+

[transfer none]

@@ -2063,7 +2063,7 @@ nm_utils_hwaddr_ntoa (

Returns

the textual form of addr .

-

[transfer full]

+

[transfer full]

@@ -2102,7 +2102,7 @@ nm_utils_hwaddr_atoba (const char

a new GByteArray, or NULL if asc couldn't be parsed.

-

[transfer full]

+

[transfer full]

@@ -2233,7 +2233,7 @@ is expected to convert to

the canonicalized address if asc appears to be a valid hardware address of the indicated length, NULL if not.

-

[transfer full]

+

[transfer full]

@@ -2363,7 +2363,7 @@ array

Returns

the textual form of bytes .

-

[transfer full]

+

[transfer full]

@@ -2396,7 +2396,7 @@ may not start or end with ':'.

Returns

the converted bytes, or NULL on error.

-

[transfer full]

+

[transfer full]

@@ -2834,7 +2834,7 @@ containing the unrecognized token in err_token

err_token

location to store the first unrecognized token.

-[out][allow-none][transfer full] +[out][allow-none][transfer full] @@ -2884,7 +2884,7 @@ nm_utils_enum_get_values (

Returns

a NULL-terminated dynamically-allocated array of static strings or NULL on error.

-

[transfer container]

+

[transfer container]

Since: 1.2

@@ -2959,7 +2959,7 @@ nm_utils_parse_variant_attributes (const GVariant values. Warning: the variant are still floating references, owned by the hash table. If you take a reference, ensure to sink the one of the hash table first.

-

[transfer full][element-type utf8 GVariant]

+

[transfer full][element-type utf8 GVariant]

Since: 1.8

@@ -3260,7 +3260,7 @@ nm_utils_sriov_vf_from_str (const

Returns

the virtual function object.

-

[transfer full]

+

[transfer full]

Since: 1.14

@@ -3457,6 +3457,6 @@ for both -
Generated by GTK-Doc V1.33.0 +
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html index 0f1bccb7..bfe553b1 100644 --- a/docs/libnm/html/libnm-nm-version.html +++ b/docs/libnm/html/libnm-nm-version.html @@ -8,7 +8,7 @@ - + @@ -754,6 +754,6 @@ NM_DEPRECATED_IN_1_24_FOR ();
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/license.html b/docs/libnm/html/license.html index 490c9412..207a9d49 100644 --- a/docs/libnm/html/license.html +++ b/docs/libnm/html/license.html @@ -7,7 +7,7 @@ - + @@ -55,6 +55,6 @@

-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html index 7e8b5b6b..bca609ec 100644 --- a/docs/libnm/html/object-tree.html +++ b/docs/libnm/html/object-tree.html @@ -8,7 +8,7 @@ - + @@ -234,6 +234,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/ref-overview.html b/docs/libnm/html/ref-overview.html index b0c7a2ef..25f70fa1 100644 --- a/docs/libnm/html/ref-overview.html +++ b/docs/libnm/html/ref-overview.html @@ -8,7 +8,7 @@ - + @@ -62,6 +62,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/html/style.css b/docs/libnm/html/style.css index c163abaa..2eeda1f0 100644 --- a/docs/libnm/html/style.css +++ b/docs/libnm/html/style.css @@ -461,22 +461,22 @@ span.linenos { color: inherit; background-color: transparent; padding-left: 5px; td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .hll { background-color: #ffffcc } -.c { color: #408080; font-style: italic } /* Comment */ +.c { color: #3D7B7B; font-style: italic } /* Comment */ .err { border: 1px solid #FF0000 } /* Error */ .k { color: #008000; font-weight: bold } /* Keyword */ .o { color: #666666 } /* Operator */ -.ch { color: #408080; font-style: italic } /* Comment.Hashbang */ -.cm { color: #408080; font-style: italic } /* Comment.Multiline */ -.cp { color: #BC7A00 } /* Comment.Preproc */ -.cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ -.c1 { color: #408080; font-style: italic } /* Comment.Single */ -.cs { color: #408080; font-style: italic } /* Comment.Special */ +.ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */ +.cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */ +.cp { color: #9C6500 } /* Comment.Preproc */ +.cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */ +.c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */ +.cs { color: #3D7B7B; font-style: italic } /* Comment.Special */ .gd { color: #A00000 } /* Generic.Deleted */ .ge { font-style: italic } /* Generic.Emph */ -.gr { color: #FF0000 } /* Generic.Error */ +.gr { color: #E40000 } /* Generic.Error */ .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.gi { color: #00A000 } /* Generic.Inserted */ -.go { color: #888888 } /* Generic.Output */ +.gi { color: #008400 } /* Generic.Inserted */ +.go { color: #717171 } /* Generic.Output */ .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ .gs { font-weight: bold } /* Generic.Strong */ .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ @@ -489,15 +489,15 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .kt { color: #B00040 } /* Keyword.Type */ .m { color: #666666 } /* Literal.Number */ .s { color: #BA2121 } /* Literal.String */ -.na { color: #7D9029 } /* Name.Attribute */ +.na { color: #687822 } /* Name.Attribute */ .nb { color: #008000 } /* Name.Builtin */ .nc { color: #0000FF; font-weight: bold } /* Name.Class */ .no { color: #880000 } /* Name.Constant */ .nd { color: #AA22FF } /* Name.Decorator */ -.ni { color: #999999; font-weight: bold } /* Name.Entity */ -.ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.ni { color: #717171; font-weight: bold } /* Name.Entity */ +.ne { color: #CB3F38; font-weight: bold } /* Name.Exception */ .nf { color: #0000FF } /* Name.Function */ -.nl { color: #A0A000 } /* Name.Label */ +.nl { color: #767600 } /* Name.Label */ .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ .nt { color: #008000; font-weight: bold } /* Name.Tag */ .nv { color: #19177C } /* Name.Variable */ @@ -514,11 +514,11 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: .dl { color: #BA2121 } /* Literal.String.Delimiter */ .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ .s2 { color: #BA2121 } /* Literal.String.Double */ -.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */ .sh { color: #BA2121 } /* Literal.String.Heredoc */ -.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */ .sx { color: #008000 } /* Literal.String.Other */ -.sr { color: #BB6688 } /* Literal.String.Regex */ +.sr { color: #A45A77 } /* Literal.String.Regex */ .s1 { color: #BA2121 } /* Literal.String.Single */ .ss { color: #19177C } /* Literal.String.Symbol */ .bp { color: #008000 } /* Name.Builtin.Pseudo */ diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html index a170dc3d..a6f26d37 100644 --- a/docs/libnm/html/usage.html +++ b/docs/libnm/html/usage.html @@ -8,7 +8,7 @@ - + @@ -73,18 +73,18 @@ 10 11 12 - 
#include <glib.h>
-#include <NetworkManager.h>
+        
#include <glib.h>
+#include <NetworkManager.h>
 
-int
-main (int argc, char *argv[])
-{
-	NMClient *client;
+int
+main (int argc, char *argv[])
+{
+	NMClient *client;
 
-	client = nm_client_new (NULL, NULL);
-	if (client)
-		g_print ("NetworkManager version: %s\n", nm_client_get_version (client));
-}

+	client = nm_client_new (NULL, NULL);
+	if (client)
+		g_print ("NetworkManager version: %s\n", nm_client_get_version (client));
+}
@@ -96,7 +96,7 @@ 

$ cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c
   $ ./hello-nm
-  NetworkManager version: 1.38.2
+  NetworkManager version: 1.38.4
 
   $

@@ -114,9 +114,9 @@ 

1
 2
 3
- 
PKG_CHECK_MODULES(LIBNM, libnm >= 1.8)
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
-LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
+ 
PKG_CHECK_MODULES(LIBNM, libnm >= 1.8)
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
+LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
@@ -137,12 +137,12 @@ 4 5 6 - 
import gi
-gi.require_version('NM', '1.0')
-from gi.repository import NM
+        
import gi
+gi.require_version('NM', '1.0')
+from gi.repository import NM
 
-client = NM.Client.new(None)
-print ("NetworkManager version " + client.get_version())

+client = NM.Client.new(None)
+print ("NetworkManager version " + client.get_version())
@@ -271,6 +271,6 @@
-
Generated by GTK-Doc V1.33.0
+
Generated by GTK-Doc V1.33.1 \ No newline at end of file diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml index c85090d6..c097b6a0 100644 --- a/docs/libnm/version.xml +++ b/docs/libnm/version.xml @@ -1 +1 @@ -1.38.2 +1.38.4 diff --git a/gtk-doc.make b/gtk-doc.make index 7d9a27f3..c673175d 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -57,6 +57,7 @@ DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ + $(DOC_MODULE).actions \ $(DOC_MODULE).args \ $(DOC_MODULE).hierarchy \ $(DOC_MODULE).interfaces \ diff --git a/m4/libtool.m4 b/m4/libtool.m4 index a644432f..e3adedad 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,6 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -31,7 +32,7 @@ m4_define([_LT_COPYING], [dnl # along with this program. If not, see . ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -219,8 +221,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -778,7 +780,7 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1042,8 +1044,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1067,17 +1069,12 @@ _LT_EOF _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1126,12 +1123,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1245,7 +1242,8 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1262,7 +1260,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1292,7 +1290,7 @@ ia64-*-hpux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1309,7 +1307,7 @@ ia64-*-hpux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1321,7 +1319,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1343,7 +1341,7 @@ mips64*-*linux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1351,7 +1349,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1359,7 +1357,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1379,14 +1377,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1454,7 +1452,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1493,9 +1491,22 @@ need_locks=$enable_libtool_lock m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1714,7 +1725,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1757,7 +1768,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2207,26 +2218,35 @@ m4_defun([_LT_CMD_STRIPLIB], striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2549,7 +2569,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2559,14 +2579,14 @@ m4_if([$1], [],[ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2585,7 +2605,7 @@ m4_if([$1], [],[ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2622,7 +2642,7 @@ m4_if([$1], [],[ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2655,7 +2675,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3457,7 +3477,7 @@ beos*) bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3491,14 +3511,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3512,7 +3532,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3559,7 +3579,7 @@ netbsd*) newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3686,13 +3706,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3718,7 +3738,7 @@ else # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3958,7 +3978,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -3976,20 +3996,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4013,7 +4033,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4031,9 +4051,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4320,7 +4340,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4403,7 +4423,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4739,7 +4759,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4922,7 +4942,7 @@ m4_if([$1], [CXX], [ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4930,7 +4950,7 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -4987,15 +5007,15 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5047,7 +5067,7 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5159,6 +5179,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5173,7 +5194,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5216,7 +5237,7 @@ _LT_EOF _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5228,7 +5249,7 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -5244,7 +5265,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5376,7 +5397,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5559,12 +5580,12 @@ _LT_EOF cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5605,7 +5626,7 @@ _LT_EOF fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5653,7 +5674,7 @@ _LT_EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5864,6 +5885,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6634,8 +6656,8 @@ if test yes != "$_lt_caught_CXX_error"; then cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6733,6 +6755,7 @@ if test yes != "$_lt_caught_CXX_error"; then emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6763,7 +6786,7 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6900,7 +6923,7 @@ if test yes != "$_lt_caught_CXX_error"; then # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7040,13 +7063,13 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8192,6 +8215,14 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 94b08297..b0b5e9c2 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 48bc9344..902508bd 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index fa04b52a..b155d0ac 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c6b26f88..0f7a8759 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff --git a/man/NetworkManager-dispatcher.8 b/man/NetworkManager-dispatcher.8 index 3745041c..147b8622 100644 --- a/man/NetworkManager-dispatcher.8 +++ b/man/NetworkManager-dispatcher.8 @@ -2,9 +2,9 @@ .\" Title: NetworkManager-dispatcher .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Network management daemons -.\" Source: NetworkManager-dispatcher 1.38.2 +.\" Source: NetworkManager-dispatcher 1.38.4 .\" Language: English .\" .TH "NETWORKMANAGER\-DISPATCHER" "8" "" "NetworkManager\-dispatcher 1\&" "Network management daemons" diff --git a/man/NetworkManager-wait-online.service.8 b/man/NetworkManager-wait-online.service.8 index 798681e1..50d11d0e 100644 --- a/man/NetworkManager-wait-online.service.8 +++ b/man/NetworkManager-wait-online.service.8 @@ -2,9 +2,9 @@ .\" Title: NetworkManager-wait-online.service .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Network management daemons -.\" Source: NetworkManager-wait-online.service 1.38.2 +.\" Source: NetworkManager-wait-online.service 1.38.4 .\" Language: English .\" .TH "NETWORKMANAGER\-WAIT\-ONLINE\&" "8" "" "NetworkManager\-wait\-online\&" "Network management daemons" diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index c1c562a7..c57e7f5f 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.38\&.2" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.38\&.4" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 6a6275f6..fe4387a8 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.38\&.2" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.38\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-cloud-setup.8 b/man/nm-cloud-setup.8 index 40c12adb..9c0f36d7 100644 --- a/man/nm-cloud-setup.8 +++ b/man/nm-cloud-setup.8 @@ -2,12 +2,12 @@ .\" Title: nm-cloud-setup .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Automatic Network Configuration in Cloud with NetworkManager -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.38\&.2" "Automatic Network Configuratio" +.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.38\&.4" "Automatic Network Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8 index 81cab3d6..98290bb5 100644 --- a/man/nm-initrd-generator.8 +++ b/man/nm-initrd-generator.8 @@ -2,12 +2,12 @@ .\" Title: nm-initrd-generator .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: System Administration -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.38\&.2" "System Administration" +.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.38\&.4" "System Administration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-online.1 b/man/nm-online.1 index 1378e7e3..133321ee 100644 --- a/man/nm-online.1 +++ b/man/nm-online.1 @@ -2,12 +2,12 @@ .\" Title: nm-online .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.38\&.2" "General Commands Manual" +.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.38\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7 index 6a7b5ecd..1355f0a0 100644 --- a/man/nm-openvswitch.7 +++ b/man/nm-openvswitch.7 @@ -2,12 +2,12 @@ .\" Title: nm-openvswitch .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Open vSwitch support overview -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.38\&.2" "Open vSwitch support overview" +.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.38\&.4" "Open vSwitch support overview" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-dbus.5 b/man/nm-settings-dbus.5 index 3eb47c64..0293adae 100644 --- a/man/nm-settings-dbus.5 +++ b/man/nm-settings-dbus.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-dbus .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.38\&.2" "Configuration" +.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.38\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-dbus.xml b/man/nm-settings-dbus.xml index e7d60952..2e1cd29c 100644 --- a/man/nm-settings-dbus.xml +++ b/man/nm-settings-dbus.xml @@ -1,6 +1,6 @@ -nm-settings-dbusNetworkManager developersnm-settings-dbus5NetworkManagerConfiguration1.38.2nm-settings-dbusDescription of settings and properties of NetworkManager connection profiles on the D-Bus APIDescription +nm-settings-dbusNetworkManager developersnm-settings-dbus5NetworkManagerConfiguration1.38.4nm-settings-dbusDescription of settings and properties of NetworkManager connection profiles on the D-Bus APIDescription NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 7d7be1cc..a00b1bd9 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.38\&.2" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.38\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 1f4e6c64..b30c4768 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ -nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.38.2nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription +nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.38.4nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index d9f7089b..b6d6d5cb 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.38\&.2" "Configuration" +.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.38\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index 9fa8ddce..ef253689 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.38.2nm-settings-keyfileDescription of keyfile settings pluginDescription +nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.38.4nm-settings-keyfileDescription of keyfile settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-nmcli.5 b/man/nm-settings-nmcli.5 index 8a8e1d4a..d317038a 100644 --- a/man/nm-settings-nmcli.5 +++ b/man/nm-settings-nmcli.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Configuration -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.38\&.2" "Configuration" +.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.38\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-nmcli.xml b/man/nm-settings-nmcli.xml index 8451a351..60086f0f 100644 --- a/man/nm-settings-nmcli.xml +++ b/man/nm-settings-nmcli.xml @@ -1,6 +1,6 @@ -nm-settings-nmcliNetworkManager developersnm-settings-nmcli5NetworkManagerConfiguration1.38.2nm-settings-nmcliDescription of settings and properties of NetworkManager connection profiles for nmcliDescription +nm-settings-nmcliNetworkManager developersnm-settings-nmcli5NetworkManagerConfiguration1.38.4nm-settings-nmcliDescription of settings and properties of NetworkManager connection profiles for nmcliDescription NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7 index 8f861e91..233f1668 100644 --- a/man/nmcli-examples.7 +++ b/man/nmcli-examples.7 @@ -2,12 +2,12 @@ .\" Title: nmcli-examples .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: Examples -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.38\&.2" "Examples" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.38\&.4" "Examples" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmcli.1 b/man/nmcli.1 index 0e6387fb..6720403b 100644 --- a/man/nmcli.1 +++ b/man/nmcli.1 @@ -2,12 +2,12 @@ .\" Title: nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NMCLI" "1" "" "NetworkManager 1\&.38\&.2" "General Commands Manual" +.TH "NMCLI" "1" "" "NetworkManager 1\&.38\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmtui.1 b/man/nmtui.1 index 9ffd4202..4a49b956 100644 --- a/man/nmtui.1 +++ b/man/nmtui.1 @@ -2,12 +2,12 @@ .\" Title: nmtui .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/16/2022 +.\" Date: 08/11/2022 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.38.2 +.\" Source: NetworkManager 1.38.4 .\" Language: English .\" -.TH "NMTUI" "1" "" "NetworkManager 1\&.38\&.2" "General Commands Manual" +.TH "NMTUI" "1" "" "NetworkManager 1\&.38\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/meson.build b/meson.build index 51ad0028..9675cd8d 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( # - add corresponding NM_VERSION_x_y_z macros in # "src/libnm-core-public/nm-version-macros.h.in" # - update number in configure.ac - version: '1.38.2', + version: '1.38.4', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c index f11c172a..9bf7ac01 100644 --- a/src/core/devices/nm-device-bridge.c +++ b/src/core/devices/nm-device-bridge.c @@ -994,7 +994,8 @@ enslave_slave(NMDevice *device, NMDevice *slave, NMConnection *connection, gbool nm_assert(s_bridge); s_port = nm_connection_get_setting_bridge_port(connection); - bridge_set_vlan_options(device, s_bridge); + if (!nm_device_sys_iface_state_is_external(device)) + bridge_set_vlan_options(device, s_bridge); if (nm_setting_bridge_get_vlan_filtering(s_bridge)) { gs_free const NMPlatformBridgeVlan **plat_vlans = NULL; diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 82ce712a..6b854517 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -1286,7 +1286,7 @@ out_fail: duid, duid_error); - nm_utils_random_bytes(&uuid, sizeof(uuid)); + nm_random_get_bytes(&uuid, sizeof(uuid)); duid_out = nm_utils_generate_duid_uuid(&uuid); } @@ -2022,7 +2022,7 @@ out_fail: fail_reason); client_id_buf = g_malloc(1 + 15); client_id_buf[0] = 0; - nm_utils_random_bytes(&client_id_buf[1], 15); + nm_random_get_bytes(&client_id_buf[1], 15); result = g_bytes_new_take(client_id_buf, 1 + 15); out_good: @@ -7857,7 +7857,8 @@ nm_device_slave_notify_release(NMDevice *self, NMDeviceStateReason reason) void nm_device_removed(NMDevice *self, gboolean unconfigure_ip_config) { - NMDevicePrivate *priv; + NMDevicePrivate *priv; + const NML3ConfigData *l3cd_old; g_return_if_fail(NM_IS_DEVICE(self)); @@ -7875,6 +7876,18 @@ nm_device_removed(NMDevice *self, gboolean unconfigure_ip_config) } _dev_l3_register_l3cds(self, priv->l3cfg, FALSE, unconfigure_ip_config); + + /* _dev_l3_register_l3cds() schedules a commit, but if the device has + * commit type NONE, that doesn't emit a l3cd-changed. Do it manually, + * to ensure that entries are removed from the DNS manager. */ + if (priv->l3cfg + && NM_IN_SET(priv->sys_iface_state, + NM_DEVICE_SYS_IFACE_STATE_REMOVED, + NM_DEVICE_SYS_IFACE_STATE_EXTERNAL)) { + l3cd_old = nm_l3cfg_get_combined_l3cd(priv->l3cfg, TRUE); + if (l3cd_old) + g_signal_emit(self, signals[L3CD_CHANGED], 0, l3cd_old, NULL); + } } static gboolean @@ -11382,8 +11395,8 @@ _dev_ipac6_start(NMDevice *self) if (node_type == NM_NDISC_NODE_TYPE_ROUTER) _dev_ipac6_set_state(self, NM_DEVICE_IP_STATE_READY); - else - _dev_ipac6_grace_period_start(self, ra_timeout, TRUE); + + _dev_ipac6_grace_period_start(self, ra_timeout, TRUE); nm_ndisc_start(priv->ipac6_data.ndisc); } @@ -11623,7 +11636,7 @@ activate_stage3_ip_config_for_addr_family(NMDevice *self, int addr_family, const priv->ip_data_x[IS_IPv4].wait_for_ports = FALSE; } - if (klass->ready_for_ip_config && !klass->ready_for_ip_config(self)) + if (klass->ready_for_ip_config && !klass->ready_for_ip_config(self, FALSE)) goto out_devip; if (IS_IPv4) { @@ -11887,7 +11900,7 @@ activate_stage3_ip_config(NMDevice *self) } if (!nm_device_sys_iface_state_is_external(self) - && (!klass->ready_for_ip_config || klass->ready_for_ip_config(self))) { + && (!klass->ready_for_ip_config || klass->ready_for_ip_config(self, TRUE))) { if (priv->ipmanual_data.state_6 == NM_DEVICE_IP_STATE_NONE && !NM_IN_STRSET(ipv6_method, NM_SETTING_IP6_CONFIG_METHOD_DISABLED, @@ -12682,6 +12695,16 @@ check_and_reapply_connection(NMDevice *self, if (nm_g_hash_table_lookup(diffs, NM_SETTING_IP6_CONFIG_SETTING_NAME)) priv->ip_data_6.do_reapply = TRUE; + if (nm_g_hash_table_contains_any( + nm_g_hash_table_lookup(diffs, NM_SETTING_CONNECTION_SETTING_NAME), + NM_SETTING_CONNECTION_LLDP, + NM_SETTING_CONNECTION_MDNS, + NM_SETTING_CONNECTION_LLMNR, + NM_SETTING_CONNECTION_DNS_OVER_TLS)) { + priv->ip_data_4.do_reapply = TRUE; + priv->ip_data_6.do_reapply = TRUE; + } + nm_device_activate_schedule_stage3_ip_config(self, FALSE); _routing_rules_sync(self, NM_TERNARY_TRUE); diff --git a/src/core/devices/nm-device.h b/src/core/devices/nm-device.h index 80def125..d59aecb2 100644 --- a/src/core/devices/nm-device.h +++ b/src/core/devices/nm-device.h @@ -346,7 +346,7 @@ typedef struct _NMDeviceClass { NMActStageReturn (*act_stage1_prepare)(NMDevice *self, NMDeviceStateReason *out_failure_reason); NMActStageReturn (*act_stage2_config)(NMDevice *self, NMDeviceStateReason *out_failure_reason); void (*act_stage3_ip_config)(NMDevice *self, int addr_family); - gboolean (*ready_for_ip_config)(NMDevice *self); + gboolean (*ready_for_ip_config)(NMDevice *self, gboolean is_manual); const char *(*get_ip_method_auto)(NMDevice *self, int addr_family); diff --git a/src/core/devices/ovs/nm-device-ovs-bridge.c b/src/core/devices/ovs/nm-device-ovs-bridge.c index 683ada13..ea77dd18 100644 --- a/src/core/devices/ovs/nm-device-ovs-bridge.c +++ b/src/core/devices/ovs/nm-device-ovs-bridge.c @@ -67,7 +67,7 @@ get_generic_capabilities(NMDevice *device) } static gboolean -ready_for_ip_config(NMDevice *device) +ready_for_ip_config(NMDevice *device, gboolean is_manual) { return FALSE; } diff --git a/src/core/devices/ovs/nm-device-ovs-interface.c b/src/core/devices/ovs/nm-device-ovs-interface.c index 6b9d3d7e..1f531a6f 100644 --- a/src/core/devices/ovs/nm-device-ovs-interface.c +++ b/src/core/devices/ovs/nm-device-ovs-interface.c @@ -198,7 +198,7 @@ set_platform_mtu(NMDevice *device, guint32 mtu) } static gboolean -ready_for_ip_config(NMDevice *device) +ready_for_ip_config(NMDevice *device, gboolean is_manual) { return nm_device_get_ip_ifindex(device) > 0; } diff --git a/src/core/devices/ovs/nm-device-ovs-port.c b/src/core/devices/ovs/nm-device-ovs-port.c index 116f58c4..6ba52f40 100644 --- a/src/core/devices/ovs/nm-device-ovs-port.c +++ b/src/core/devices/ovs/nm-device-ovs-port.c @@ -61,7 +61,7 @@ get_generic_capabilities(NMDevice *device) } static gboolean -ready_for_ip_config(NMDevice *device) +ready_for_ip_config(NMDevice *device, gboolean is_manual) { return FALSE; } diff --git a/src/core/devices/ovs/nm-ovs-factory.c b/src/core/devices/ovs/nm-ovs-factory.c index 3ff0abf8..5aaa5c01 100644 --- a/src/core/devices/ovs/nm-ovs-factory.c +++ b/src/core/devices/ovs/nm-ovs-factory.c @@ -244,7 +244,11 @@ ovsdb_interface_failed(NMOvsdb *ovsdb, TRUE); } - nm_device_state_changed(device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_OVSDB_FAILED); + if (nm_device_is_activating(device)) { + nm_device_state_changed(device, + NM_DEVICE_STATE_FAILED, + NM_DEVICE_STATE_REASON_OVSDB_FAILED); + } } static void diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c index 2572213c..04608d14 100644 --- a/src/core/devices/wifi/nm-device-wifi.c +++ b/src/core/devices/wifi/nm-device-wifi.c @@ -86,6 +86,7 @@ typedef struct { GCancellable *scan_request_cancellable; GSource *scan_request_delay_source; + GSource *roam_supplicant_wait_source; NMWifiAP *current_ap; @@ -939,6 +940,7 @@ deactivate(NMDevice *device) int ifindex = nm_device_get_ifindex(device); nm_clear_g_source(&priv->periodic_update_id); + nm_clear_g_source_inst(&priv->roam_supplicant_wait_source); cleanup_association_attempt(self, TRUE); @@ -2512,8 +2514,15 @@ supplicant_iface_state(NMDeviceWifi *self, : "Connected to wireless network", (ssid_str = _nm_utils_ssid_to_string_gbytes(ssid))); nm_device_activate_schedule_stage3_ip_config(device, FALSE); - } else if (devstate == NM_DEVICE_STATE_ACTIVATED) + } else if (devstate == NM_DEVICE_STATE_ACTIVATED) { periodic_update(self); + if (priv->roam_supplicant_wait_source) { + _LOGD(LOGD_WIFI, + "supplicant state settled after roaming, renew dynamic IP configuration"); + nm_clear_g_source_inst(&priv->roam_supplicant_wait_source); + nm_device_update_dynamic_ip_setup(device); + } + } break; case NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED: if ((devstate == NM_DEVICE_STATE_ACTIVATED) || nm_device_is_activating(device)) { @@ -2584,6 +2593,21 @@ supplicant_iface_assoc_cb(NMSupplicantInterface *iface, GError *error, gpointer } } +static gboolean +roam_supplicant_wait_timeout(gpointer user_data) +{ + NMDeviceWifi *self = NM_DEVICE_WIFI(user_data); + NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE(self); + + _LOGD(LOGD_WIFI, "timeout waiting for supplicant to settle after roaming"); + + /* Eventually we still want to restart DHCP when the supplicant + * becomes ready */ + nm_clear_g_source_inst(&priv->roam_supplicant_wait_source); + priv->roam_supplicant_wait_source = g_source_ref(nm_g_source_sentinel_get(0)); + return G_SOURCE_CONTINUE; +} + static void supplicant_iface_notify_current_bss(NMSupplicantInterface *iface, GParamSpec *pspec, @@ -2636,7 +2660,19 @@ supplicant_iface_notify_current_bss(NMSupplicantInterface *iface, * Also, some APs (e.g. Cisco) can be configured to drop * all traffic until DHCP completes. To support such * cases, renew the lease when roaming to a new AP. */ - nm_device_update_dynamic_ip_setup(NM_DEVICE(self)); + + if (nm_supplicant_interface_get_state(priv->sup_iface) + == NM_SUPPLICANT_INTERFACE_STATE_COMPLETED) { + nm_device_update_dynamic_ip_setup(NM_DEVICE(self)); + } else { + /* Wait that the authentication to new the AP completes before + * trying to renew, otherwise the DHCP REQUEST could be lost + * and the client will fall back to a DISCOVER, potentially + * getting a different address. */ + nm_clear_g_source_inst(&priv->roam_supplicant_wait_source); + priv->roam_supplicant_wait_source = + nm_g_timeout_add_source(10000, roam_supplicant_wait_timeout, self); + } } set_current_ap(self, new_ap, TRUE); @@ -3743,6 +3779,7 @@ dispose(GObject *object) nm_assert(c_list_is_empty(&priv->scanning_prohibited_lst_head)); nm_clear_g_source(&priv->periodic_update_id); + nm_clear_g_source_inst(&priv->roam_supplicant_wait_source); wifi_secrets_cancel(self); diff --git a/src/core/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c index 27222aae..2e0d51e5 100644 --- a/src/core/devices/wifi/nm-iwd-manager.c +++ b/src/core/devices/wifi/nm-iwd-manager.c @@ -306,7 +306,7 @@ iwd_agent_export(GDBusConnection *connection, gpointer user_data, char **agent_p unsigned int rnd; guint id; - nm_utils_random_bytes(&rnd, sizeof(rnd)); + nm_random_get_bytes(&rnd, sizeof(rnd)); nm_sprintf_buf(path, "/agent/%u", rnd); diff --git a/src/core/devices/wwan/nm-device-modem.c b/src/core/devices/wwan/nm-device-modem.c index 77ba1b24..e0209aff 100644 --- a/src/core/devices/wwan/nm-device-modem.c +++ b/src/core/devices/wwan/nm-device-modem.c @@ -621,13 +621,13 @@ is_available(NMDevice *device, NMDeviceCheckDevAvailableFlags flags) } static gboolean -ready_for_ip_config(NMDevice *device) +ready_for_ip_config(NMDevice *device, gboolean is_manual) { - /* Tell NMDevice to only run device-specific IP + /* Tell NMDevice to only run manual and device-specific IP * configuration (devip) and skip other methods - * (manual, dhcp, etc). + * (dhcp, link-local, shared, etc). */ - return FALSE; + return is_manual; } /*****************************************************************************/ diff --git a/src/core/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c index cbf30f56..997fe727 100644 --- a/src/core/devices/wwan/nm-modem-broadband.c +++ b/src/core/devices/wwan/nm-modem-broadband.c @@ -1032,7 +1032,6 @@ stage3_ip_config_start(NMModem *modem, int addr_family, NMModemIPMethod ip_metho l3cd = nm_l3_config_data_new(nm_platform_get_multi_idx(NM_PLATFORM_GET), ifindex, NM_IP_CONFIG_SOURCE_WWAN); - nm_l3_config_data_set_dns_priority(l3cd, AF_INET, 0); address = (NMPlatformIP4Address){ .address = address_network, @@ -1116,11 +1115,9 @@ stage3_ip_config_start(NMModem *modem, int addr_family, NMModemIPMethod ip_metho _LOGI("IPv6 base configuration:"); - l3cd = nm_l3_config_data_new(nm_platform_get_multi_idx(NM_PLATFORM_GET), + l3cd = nm_l3_config_data_new(nm_platform_get_multi_idx(NM_PLATFORM_GET), ifindex, NM_IP_CONFIG_SOURCE_WWAN); - nm_l3_config_data_set_dns_priority(l3cd, AF_INET6, 0); - do_auto = TRUE; address.plen = mm_bearer_ip_config_get_prefix(self->_priv.ipv6_config); diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c index 2bfd7e01..00a2d207 100644 --- a/src/core/dhcp/nm-dhcp-client.c +++ b/src/core/dhcp/nm-dhcp-client.c @@ -32,7 +32,10 @@ /*****************************************************************************/ -enum { SIGNAL_NOTIFY, LAST_SIGNAL }; +enum { + SIGNAL_NOTIFY, + LAST_SIGNAL, +}; static guint signals[LAST_SIGNAL] = {0}; @@ -42,18 +45,30 @@ typedef struct _NMDhcpClientPrivate { NMDhcpClientConfig config; const NML3ConfigData *l3cd; GSource *no_lease_timeout_source; - GSource *ipv6_lladdr_timeout_source; + GSource *watch_source; GBytes *effective_client_id; - pid_t pid; - guint watch_id; - NMDhcpState state; - bool iaid_explicit : 1; - bool is_stopped : 1; + + union { + struct { + struct { + GDBusMethodInvocation *invocation; + } bound; + } v4; + struct { + GSource *lladdr_timeout_source; + GSource *dad_timeout_source; + } v6; + }; + struct { gulong id; bool wait_dhcp_commit : 1; + bool wait_ipv6_dad : 1; bool wait_ll_address : 1; } l3cfg_notify; + + pid_t pid; + bool is_stopped : 1; } NMDhcpClientPrivate; G_DEFINE_ABSTRACT_TYPE(NMDhcpClient, nm_dhcp_client, G_TYPE_OBJECT) @@ -62,6 +77,13 @@ G_DEFINE_ABSTRACT_TYPE(NMDhcpClient, nm_dhcp_client, G_TYPE_OBJECT) /*****************************************************************************/ +static gboolean _dhcp_client_accept(NMDhcpClient *self, const NML3ConfigData *l3cd, GError **error); + +_nm_unused static gboolean _dhcp_client_decline(NMDhcpClient *self, + const NML3ConfigData *l3cd, + const char *error_message, + GError **error); + static void l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcpClient *self); @@ -72,47 +94,76 @@ G_STATIC_ASSERT(!(((pid_t) -1) > 0)); /*****************************************************************************/ -static void -_emit_notify(NMDhcpClient *self, const NMDhcpClientNotifyData *notify_data) +NM_UTILS_LOOKUP_STR_DEFINE(nm_dhcp_client_event_type_to_string, + NMDhcpClientEventType, + NM_UTILS_LOOKUP_DEFAULT_NM_ASSERT(NULL), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_BOUND, "bound"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_EXPIRE, "expire"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED, "extended"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_FAIL, "fail"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_TERMINATED, + "terminated"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT, "timeout"), + NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_CLIENT_EVENT_TYPE_UNSPECIFIED, + "unspecified"), ); + +/*****************************************************************************/ + +int +nm_dhcp_client_get_addr_family(NMDhcpClient *self) { - g_signal_emit(G_OBJECT(self), signals[SIGNAL_NOTIFY], 0, notify_data); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); + + return priv->config.addr_family; } -/*****************************************************************************/ +const char * +nm_dhcp_client_get_iface(NMDhcpClient *self) +{ + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); -static void -connect_l3cfg_notify(NMDhcpClient *self) + return priv->config.iface; +} + +NMDedupMultiIndex * +nm_dhcp_client_get_multi_idx(NMDhcpClient *self) { NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - gboolean do_connect; - do_connect = priv->l3cfg_notify.wait_dhcp_commit | priv->l3cfg_notify.wait_ll_address; + return nm_l3cfg_get_multi_idx(priv->config.l3cfg); +} - if (!do_connect) { - nm_clear_g_signal_handler(priv->config.l3cfg, &priv->l3cfg_notify.id); - return; - } +int +nm_dhcp_client_get_ifindex(NMDhcpClient *self) +{ + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - if (priv->l3cfg_notify.id == 0) { - priv->l3cfg_notify.id = g_signal_connect(priv->config.l3cfg, - NM_L3CFG_SIGNAL_NOTIFY, - G_CALLBACK(l3_cfg_notify_cb), - self); - } + return nm_l3cfg_get_ifindex(priv->config.l3cfg); } -pid_t -nm_dhcp_client_get_pid(NMDhcpClient *self) +const NMDhcpClientConfig * +nm_dhcp_client_get_config(NMDhcpClient *self) { - g_return_val_if_fail(NM_IS_DHCP_CLIENT(self), -1); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - return NM_DHCP_CLIENT_GET_PRIVATE(self)->pid; + return &priv->config; } +GBytes * +nm_dhcp_client_get_effective_client_id(NMDhcpClient *self) +{ + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); + + return priv->effective_client_id; +} + +/*****************************************************************************/ + void nm_dhcp_client_set_effective_client_id(NMDhcpClient *self, GBytes *client_id) { - NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); + gs_free char *tmp_str = NULL; g_return_if_fail(NM_IS_DHCP_CLIENT(self)); g_return_if_fail(!client_id || g_bytes_get_size(client_id) >= 2); @@ -123,72 +174,63 @@ nm_dhcp_client_set_effective_client_id(NMDhcpClient *self, GBytes *client_id) return; g_bytes_unref(priv->effective_client_id); - priv->effective_client_id = client_id; - if (client_id) - g_bytes_ref(client_id); + priv->effective_client_id = nm_g_bytes_ref(client_id); - { - gs_free char *s = NULL; + _LOGT("%s: set %s", + priv->config.addr_family == AF_INET6 ? "duid" : "client-id", + priv->effective_client_id + ? (tmp_str = nm_dhcp_utils_duid_to_string(priv->effective_client_id)) + : "default"); +} - _LOGT("%s: set %s", - priv->config.addr_family == AF_INET6 ? "duid" : "client-id", - priv->effective_client_id - ? (s = nm_dhcp_utils_duid_to_string(priv->effective_client_id)) - : "default"); - } +/*****************************************************************************/ + +static void +_emit_notify(NMDhcpClient *self, const NMDhcpClientNotifyData *notify_data) +{ + g_signal_emit(G_OBJECT(self), signals[SIGNAL_NOTIFY], 0, notify_data); } /*****************************************************************************/ -NM_UTILS_LOOKUP_STR_DEFINE(nm_dhcp_state_to_string, - NMDhcpState, - NM_UTILS_LOOKUP_DEFAULT(NULL), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_BOUND, "bound"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_DONE, "done"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_EXPIRE, "expire"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_EXTENDED, "extended"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_FAIL, "fail"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_NOOP, "noop"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_TERMINATED, "terminated"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_TIMEOUT, "timeout"), - NM_UTILS_LOOKUP_STR_ITEM(NM_DHCP_STATE_UNKNOWN, "unknown"), ); - -static NMDhcpState -reason_to_state(NMDhcpClient *self, const char *iface, const char *reason) +static void +l3_cfg_notify_check_connected(NMDhcpClient *self) { - if (g_ascii_strcasecmp(reason, "bound") == 0 || g_ascii_strcasecmp(reason, "bound6") == 0 - || g_ascii_strcasecmp(reason, "static") == 0) - return NM_DHCP_STATE_BOUND; - else if (g_ascii_strcasecmp(reason, "renew") == 0 || g_ascii_strcasecmp(reason, "renew6") == 0 - || g_ascii_strcasecmp(reason, "reboot") == 0 - || g_ascii_strcasecmp(reason, "rebind") == 0 - || g_ascii_strcasecmp(reason, "rebind6") == 0) - return NM_DHCP_STATE_EXTENDED; - else if (g_ascii_strcasecmp(reason, "timeout") == 0) - return NM_DHCP_STATE_TIMEOUT; - else if (g_ascii_strcasecmp(reason, "nak") == 0 || g_ascii_strcasecmp(reason, "expire") == 0 - || g_ascii_strcasecmp(reason, "expire6") == 0) - return NM_DHCP_STATE_EXPIRE; - else if (g_ascii_strcasecmp(reason, "end") == 0 || g_ascii_strcasecmp(reason, "stop") == 0 - || g_ascii_strcasecmp(reason, "stopped") == 0) - return NM_DHCP_STATE_DONE; - else if (g_ascii_strcasecmp(reason, "fail") == 0 || g_ascii_strcasecmp(reason, "abend") == 0) - return NM_DHCP_STATE_FAIL; - else if (g_ascii_strcasecmp(reason, "preinit") == 0) - return NM_DHCP_STATE_NOOP; - - _LOGD("unmapped DHCP state '%s'", reason); - return NM_DHCP_STATE_UNKNOWN; + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); + gboolean do_connect; + + do_connect = priv->l3cfg_notify.wait_dhcp_commit | priv->l3cfg_notify.wait_ll_address + | priv->l3cfg_notify.wait_ipv6_dad; + + if (!do_connect) { + nm_clear_g_signal_handler(priv->config.l3cfg, &priv->l3cfg_notify.id); + return; + } + + if (priv->l3cfg_notify.id == 0) { + priv->l3cfg_notify.id = g_signal_connect(priv->config.l3cfg, + NM_L3CFG_SIGNAL_NOTIFY, + G_CALLBACK(l3_cfg_notify_cb), + self); + } } /*****************************************************************************/ +pid_t +nm_dhcp_client_get_pid(NMDhcpClient *self) +{ + g_return_val_if_fail(NM_IS_DHCP_CLIENT(self), -1); + + return NM_DHCP_CLIENT_GET_PRIVATE(self)->pid; +} + static void watch_cleanup(NMDhcpClient *self) { NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - nm_clear_g_source(&priv->watch_id); + nm_clear_g_source_inst(&priv->watch_source); } void @@ -225,6 +267,8 @@ stop(NMDhcpClient *self, gboolean release) priv->pid = -1; } +/*****************************************************************************/ + static gboolean _no_lease_timeout(gpointer user_data) { @@ -237,19 +281,12 @@ _no_lease_timeout(gpointer user_data) &((NMDhcpClientNotifyData){ .notify_type = NM_DHCP_CLIENT_NOTIFY_TYPE_NO_LEASE_TIMEOUT, })); - return G_SOURCE_CONTINUE; -} -const NMDhcpClientConfig * -nm_dhcp_client_get_config(NMDhcpClient *self) -{ - NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - - return &priv->config; + return G_SOURCE_CONTINUE; } static void -schedule_no_lease_timeout(NMDhcpClient *self) +_no_lease_timeout_schedule(NMDhcpClient *self) { NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); @@ -267,29 +304,55 @@ schedule_no_lease_timeout(NMDhcpClient *self) } } +/*****************************************************************************/ + void -nm_dhcp_client_set_state(NMDhcpClient *self, NMDhcpState new_state, const NML3ConfigData *l3cd) +_nm_dhcp_client_notify(NMDhcpClient *self, + NMDhcpClientEventType client_event_type, + const NML3ConfigData *l3cd) { NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); GHashTable *options; const int IS_IPv4 = NM_IS_IPv4(priv->config.addr_family); nm_auto_unref_l3cd const NML3ConfigData *l3cd_merged = NULL; - - g_return_if_fail(NM_IS_DHCP_CLIENT(self)); - - if (NM_IN_SET(new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)) { - g_return_if_fail(NM_IS_L3_CONFIG_DATA(l3cd)); - g_return_if_fail(nm_l3_config_data_get_dhcp_lease(l3cd, priv->config.addr_family)); - } else - g_return_if_fail(!l3cd); + char sbuf1[NM_HASH_OBFUSCATE_PTR_STR_BUF_SIZE]; + + nm_assert(NM_IN_SET(client_event_type, + NM_DHCP_CLIENT_EVENT_TYPE_UNSPECIFIED, + NM_DHCP_CLIENT_EVENT_TYPE_BOUND, + NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED, + NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT, + NM_DHCP_CLIENT_EVENT_TYPE_EXPIRE, + NM_DHCP_CLIENT_EVENT_TYPE_FAIL, + NM_DHCP_CLIENT_EVENT_TYPE_TERMINATED)); + nm_assert((client_event_type >= NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT) + == NM_IN_SET(client_event_type, + NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT, + NM_DHCP_CLIENT_EVENT_TYPE_EXPIRE, + NM_DHCP_CLIENT_EVENT_TYPE_FAIL, + NM_DHCP_CLIENT_EVENT_TYPE_TERMINATED)); + nm_assert((!!l3cd) + == NM_IN_SET(client_event_type, + NM_DHCP_CLIENT_EVENT_TYPE_BOUND, + NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED)); + + nm_assert(!l3cd || NM_IS_L3_CONFIG_DATA(l3cd)); + nm_assert(!l3cd || nm_l3_config_data_get_dhcp_lease(l3cd, priv->config.addr_family)); + + _LOGT("notify: event=%s%s%s", + nm_dhcp_client_event_type_to_string(client_event_type), + NM_PRINT_FMT_QUOTED2(l3cd, ", l3cd=", NM_HASH_OBFUSCATE_PTR_STR(l3cd, sbuf1), "")); if (l3cd) nm_l3_config_data_seal(l3cd); - if (new_state >= NM_DHCP_STATE_TIMEOUT) + if (client_event_type >= NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT) watch_cleanup(self); if (!IS_IPv4 && l3cd) { + /* nm_dhcp_utils_merge_new_dhcp6_lease() relies on "life_starts" option + * for merging, which is only set by dhclient. Internal client never sets that, + * but it supports multiple IP addresses per lease. */ if (nm_dhcp_utils_merge_new_dhcp6_lease(priv->l3cd, l3cd, &l3cd_merged)) { l3cd = nm_l3_config_data_seal(l3cd_merged); } @@ -302,11 +365,11 @@ nm_dhcp_client_set_state(NMDhcpClient *self, NMDhcpState new_state, const NML3Co nm_clear_g_source_inst(&priv->no_lease_timeout_source); } else { if (priv->l3cd) - schedule_no_lease_timeout(self); + _no_lease_timeout_schedule(self); } /* FIXME(l3cfg:dhcp): the API of NMDhcpClient is changing to expose a simpler API. - * The internals like NMDhcpState should not be exposed (or possibly dropped in large + * The internals like the state should not be exposed (or possibly dropped in large * parts). */ nm_l3_config_data_reset(&priv->l3cd, l3cd); @@ -353,7 +416,7 @@ nm_dhcp_client_set_state(NMDhcpClient *self, NMDhcpState new_state, const NML3Co * as a configuration parameter (in NMDhcpClientConfig). When ACD is enabled, * when a new lease gets announced, it must first use NML3Cfg to run ACD on the * interface (the previous lease -- if any -- will still be used at that point). - * If ACD fails, we call nm_dhcp_client_decline() and try to get a different + * If ACD fails, we call _dhcp_client_decline() and try to get a different * lease. * If ACD passes, we need to notify the new lease, and the user (NMDevice) may * then configure the address. We need to watch the configured addresses (in NML3Cfg), @@ -367,13 +430,24 @@ nm_dhcp_client_set_state(NMDhcpClient *self, NMDhcpState new_state, const NML3Co * as a static address (bypassing ACD), then NML3Cfg is aware of that and signals * immediate success. */ - if (nm_dhcp_client_can_accept(self) && new_state == NM_DHCP_STATE_BOUND && priv->l3cd + if (client_event_type == NM_DHCP_CLIENT_EVENT_TYPE_BOUND && priv->l3cd && nm_l3_config_data_get_num_addresses(priv->l3cd, priv->config.addr_family) > 0) { priv->l3cfg_notify.wait_dhcp_commit = TRUE; } else { priv->l3cfg_notify.wait_dhcp_commit = FALSE; } - connect_l3cfg_notify(self); + + if (!priv->l3cfg_notify.wait_dhcp_commit && priv->l3cd) { + gs_free_error GError *error = NULL; + + _LOGD("accept lease right away"); + if (!_dhcp_client_accept(self, priv->l3cd, &error)) { + _LOGD("accept failed: %s", error->message); + /* Unclear why this happened, or what to do about it. Just proceed. */ + } + } + + l3_cfg_notify_check_connected(self); { const NMDhcpClientNotifyData notify_data = { @@ -396,14 +470,15 @@ daemon_watch_cb(GPid pid, int status, gpointer user_data) NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); gs_free char *desc = NULL; - g_return_if_fail(priv->watch_id); - priv->watch_id = 0; + g_return_if_fail(priv->watch_source); + + priv->watch_source = NULL; _LOGI("client pid %d %s", pid, (desc = nm_utils_get_process_exit_status_desc(status))); priv->pid = -1; - nm_dhcp_client_set_state(self, NM_DHCP_STATE_TERMINATED, NULL); + _nm_dhcp_client_notify(self, NM_DHCP_CLIENT_EVENT_TYPE_TERMINATED, NULL); } void @@ -414,8 +489,8 @@ nm_dhcp_client_watch_child(NMDhcpClient *self, pid_t pid) g_return_if_fail(priv->pid == -1); priv->pid = pid; - g_return_if_fail(priv->watch_id == 0); - priv->watch_id = g_child_watch_add(pid, daemon_watch_cb, self); + g_return_if_fail(!priv->watch_source); + priv->watch_source = nm_g_child_watch_add_source(pid, daemon_watch_cb, self); } void @@ -429,71 +504,74 @@ nm_dhcp_client_stop_watch_child(NMDhcpClient *self, pid_t pid) watch_cleanup(self); } -gboolean -nm_dhcp_client_start_ip4(NMDhcpClient *self, GError **error) +static gboolean +_accept(NMDhcpClient *self, const NML3ConfigData *l3cd, GError **error) { - NMDhcpClientPrivate *priv; - - g_return_val_if_fail(NM_IS_DHCP_CLIENT(self), FALSE); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - g_return_val_if_fail(priv->pid == -1, FALSE); - g_return_val_if_fail(priv->config.addr_family == AF_INET, FALSE); - g_return_val_if_fail(priv->config.uuid, FALSE); + if (!NM_IS_IPv4(priv->config.addr_family)) + return TRUE; - schedule_no_lease_timeout(self); + if (!priv->v4.bound.invocation) + return TRUE; - return NM_DHCP_CLIENT_GET_CLASS(self)->ip4_start(self, error); + g_dbus_method_invocation_return_value(g_steal_pointer(&priv->v4.bound.invocation), NULL); + return TRUE; } -gboolean -nm_dhcp_client_accept(NMDhcpClient *self, GError **error) +static gboolean +_dhcp_client_accept(NMDhcpClient *self, const NML3ConfigData *l3cd, GError **error) { - NMDhcpClientPrivate *priv; + NMDhcpClientClass *klass; g_return_val_if_fail(NM_IS_DHCP_CLIENT(self), FALSE); + nm_assert(l3cd); - priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - - g_return_val_if_fail(priv->l3cd, FALSE); + klass = NM_DHCP_CLIENT_GET_CLASS(self); - if (NM_DHCP_CLIENT_GET_CLASS(self)->accept) { - return NM_DHCP_CLIENT_GET_CLASS(self)->accept(self, error); - } + g_return_val_if_fail(NM_DHCP_CLIENT_GET_PRIVATE(self)->l3cd, FALSE); - return TRUE; + return klass->accept(self, l3cd, error); } -gboolean -nm_dhcp_client_can_accept(NMDhcpClient *self) +static gboolean +decline(NMDhcpClient *self, const NML3ConfigData *l3cd, const char *error_message, GError **error) { - gboolean can_accept; - - g_return_val_if_fail(NM_IS_DHCP_CLIENT(self), FALSE); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - can_accept = !!(NM_DHCP_CLIENT_GET_CLASS(self)->accept); + if (!NM_IS_IPv4(priv->config.addr_family)) + return TRUE; - nm_assert(can_accept == (!!(NM_DHCP_CLIENT_GET_CLASS(self)->decline))); + if (!priv->v4.bound.invocation) { + nm_utils_error_set(error, + NM_UTILS_ERROR_UNKNOWN, + "calling decline in unexpected script state"); + return FALSE; + } - return can_accept; + g_dbus_method_invocation_return_error(g_steal_pointer(&priv->v4.bound.invocation), + NM_DEVICE_ERROR, + NM_DEVICE_ERROR_FAILED, + "acd failed"); + return TRUE; } -gboolean -nm_dhcp_client_decline(NMDhcpClient *self, const char *error_message, GError **error) +static gboolean +_dhcp_client_decline(NMDhcpClient *self, + const NML3ConfigData *l3cd, + const char *error_message, + GError **error) { - NMDhcpClientPrivate *priv; + NMDhcpClientClass *klass; g_return_val_if_fail(NM_IS_DHCP_CLIENT(self), FALSE); + nm_assert(l3cd); - priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - - g_return_val_if_fail(priv->l3cd, FALSE); + klass = NM_DHCP_CLIENT_GET_CLASS(self); - if (NM_DHCP_CLIENT_GET_CLASS(self)->decline) { - return NM_DHCP_CLIENT_GET_CLASS(self)->decline(self, error_message, error); - } + g_return_val_if_fail(NM_DHCP_CLIENT_GET_PRIVATE(self)->l3cd, FALSE); - return TRUE; + return klass->decline(self, l3cd, error_message, error); } static GBytes * @@ -508,7 +586,7 @@ ipv6_lladdr_timeout(gpointer user_data) NMDhcpClient *self = user_data; NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - nm_clear_g_source_inst(&priv->ipv6_lladdr_timeout_source); + nm_clear_g_source_inst(&priv->v6.lladdr_timeout_source); _emit_notify( self, @@ -519,6 +597,23 @@ ipv6_lladdr_timeout(gpointer user_data) return G_SOURCE_CONTINUE; } +static gboolean +ipv6_dad_timeout(gpointer user_data) +{ + NMDhcpClient *self = user_data; + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); + + nm_clear_g_source_inst(&priv->v6.dad_timeout_source); + + _emit_notify( + self, + &((NMDhcpClientNotifyData){ + .notify_type = NM_DHCP_CLIENT_NOTIFY_TYPE_IT_LOOKS_BAD, + .it_looks_bad.reason = "timeout reached while waiting for IPv6 DAD to complete", + })); + return G_SOURCE_CONTINUE; +} + static const NMPlatformIP6Address * ipv6_lladdr_find(NMDhcpClient *self) { @@ -528,6 +623,8 @@ ipv6_lladdr_find(NMDhcpClient *self) NMDedupMultiIter iter; const NMPObject *obj; + nm_assert(!NM_IS_IPv4(priv->config.addr_family)); + l3cfg = priv->config.l3cfg; nmp_lookup_init_object(&lookup, NMP_OBJECT_TYPE_IP6_ADDRESS, nm_l3cfg_get_ifindex(l3cfg)); @@ -544,6 +641,37 @@ ipv6_lladdr_find(NMDhcpClient *self) return NULL; } +static const NMPlatformIP6Address * +ipv6_tentative_addr_find(NMDhcpClient *self) +{ + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); + NMDedupMultiIter iter; + const NMPlatformIP6Address *addr; + NML3Cfg *l3cfg = priv->config.l3cfg; + + /* For each address in the lease, check whether it's tentative + * in platform. */ + nm_l3_config_data_iter_ip6_address_for_each (&iter, priv->l3cd, &addr) { + const NMPlatformIP6Address *pladdr; + NMPObject needle; + + nmp_object_stackinit_id_ip6_address(&needle, nm_l3cfg_get_ifindex(l3cfg), &addr->address); + pladdr = NMP_OBJECT_CAST_IP6_ADDRESS(nm_platform_lookup_obj(nm_l3cfg_get_platform(l3cfg), + NMP_CACHE_ID_TYPE_OBJECT_TYPE, + &needle)); + if (!pladdr) { + /* Address was removed from platform */ + continue; + } + + if (NM_FLAGS_HAS(pladdr->n_ifa_flags, IFA_F_TENTATIVE) + && !NM_FLAGS_HAS(pladdr->n_ifa_flags, IFA_F_OPTIMISTIC)) + return pladdr; + } + + return NULL; +} + static void l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcpClient *self) { @@ -551,23 +679,19 @@ l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcp nm_assert(l3cfg == priv->config.l3cfg); - switch (notify_data->notify_type) { - case NM_L3_CONFIG_NOTIFY_TYPE_PLATFORM_CHANGE_ON_IDLE: - { + if (notify_data->notify_type == NM_L3_CONFIG_NOTIFY_TYPE_PLATFORM_CHANGE_ON_IDLE + && priv->l3cfg_notify.wait_ll_address) { const NMPlatformIP6Address *addr; gs_free_error GError *error = NULL; - if (!priv->l3cfg_notify.wait_ll_address) - return; - addr = ipv6_lladdr_find(self); if (addr) { _LOGD("got IPv6LL address, starting transaction"); priv->l3cfg_notify.wait_ll_address = FALSE; - connect_l3cfg_notify(self); - nm_clear_g_source_inst(&priv->ipv6_lladdr_timeout_source); + l3_cfg_notify_check_connected(self); + nm_clear_g_source_inst(&priv->v6.lladdr_timeout_source); - schedule_no_lease_timeout(self); + _no_lease_timeout_schedule(self); if (!NM_DHCP_CLIENT_GET_CLASS(self)->ip6_start(self, &addr->address, &error)) { _emit_notify(self, @@ -577,11 +701,30 @@ l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcp })); } } + } - break; + if (notify_data->notify_type == NM_L3_CONFIG_NOTIFY_TYPE_PLATFORM_CHANGE_ON_IDLE + && priv->l3cfg_notify.wait_ipv6_dad) { + const NMPlatformIP6Address *tentative; + + tentative = ipv6_tentative_addr_find(self); + if (!tentative) { + _LOGD("addresses in the lease completed DAD"); + priv->l3cfg_notify.wait_ipv6_dad = FALSE; + nm_clear_g_source_inst(&priv->v6.dad_timeout_source); + l3_cfg_notify_check_connected(self); + _emit_notify( + self, + &((NMDhcpClientNotifyData){.notify_type = NM_DHCP_CLIENT_NOTIFY_TYPE_LEASE_UPDATE, + .lease_update = { + .l3cd = priv->l3cd, + .accepted = TRUE, + }})); + } } - case NM_L3_CONFIG_NOTIFY_TYPE_POST_COMMIT: - { + + if (notify_data->notify_type == NM_L3_CONFIG_NOTIFY_TYPE_POST_COMMIT + && priv->l3cfg_notify.wait_dhcp_commit) { const NML3ConfigData *committed_l3cd; NMDedupMultiIter ipconf_iter; const NMPlatformIPAddress *lease_address; @@ -592,9 +735,6 @@ l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcp * configured. If the address was added, we can proceed accepting the * lease and notifying NMDevice. */ - if (!priv->l3cfg_notify.wait_dhcp_commit) - return; - nm_l3_config_data_iter_ip_address_for_each (&ipconf_iter, priv->l3cd, priv->config.addr_family, @@ -610,20 +750,35 @@ l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcp address4->address, address4->plen, address4->peer_address)) - return; + goto wait_dhcp_commit_done; } else { const NMPlatformIP6Address *address6 = (const NMPlatformIP6Address *) lease_address; + const NMPlatformIP6Address *tentative; + char str[NM_UTILS_TO_STRING_BUFFER_SIZE]; if (!nm_l3_config_data_lookup_address_6(committed_l3cd, &address6->address)) - return; + goto wait_dhcp_commit_done; + + tentative = ipv6_tentative_addr_find(self); + if (tentative) { + priv->l3cfg_notify.wait_ipv6_dad = TRUE; + priv->v6.dad_timeout_source = + nm_g_timeout_add_seconds_source(30, ipv6_dad_timeout, self); + _LOGD("wait DAD for address %s", + nm_platform_ip6_address_to_string(tentative, str, sizeof(str))); + } else { + priv->l3cfg_notify.wait_ipv6_dad = FALSE; + nm_clear_g_source_inst(&priv->v6.dad_timeout_source); + } } priv->l3cfg_notify.wait_dhcp_commit = FALSE; - connect_l3cfg_notify(self); - _LOGD("accept address"); + l3_cfg_notify_check_connected(self); - if (!nm_dhcp_client_accept(self, &error)) { + _LOGD("accept lease"); + + if (!_dhcp_client_accept(self, priv->l3cd, &error)) { gs_free char *reason = g_strdup_printf("error accepting lease: %s", error->message); _emit_notify(self, @@ -631,58 +786,67 @@ l3_cfg_notify_cb(NML3Cfg *l3cfg, const NML3ConfigNotifyData *notify_data, NMDhcp .notify_type = NM_DHCP_CLIENT_NOTIFY_TYPE_IT_LOOKS_BAD, .it_looks_bad.reason = reason, })); - return; + goto wait_dhcp_commit_done; } - _emit_notify( - self, - &((NMDhcpClientNotifyData){.notify_type = NM_DHCP_CLIENT_NOTIFY_TYPE_LEASE_UPDATE, - .lease_update = { - .l3cd = priv->l3cd, - .accepted = TRUE, - }})); - break; - }; - default: - /* ignore */; + if (priv->config.addr_family == AF_INET || !priv->l3cfg_notify.wait_ipv6_dad) { + _emit_notify( + self, + &((NMDhcpClientNotifyData){.notify_type = NM_DHCP_CLIENT_NOTIFY_TYPE_LEASE_UPDATE, + .lease_update = { + .l3cd = priv->l3cd, + .accepted = TRUE, + }})); + } } +wait_dhcp_commit_done:; } gboolean -nm_dhcp_client_start_ip6(NMDhcpClient *self, GError **error) +nm_dhcp_client_start(NMDhcpClient *self, GError **error) { NMDhcpClientPrivate *priv; gs_unref_bytes GBytes *own_client_id = NULL; - const NMPlatformIP6Address *addr; + const NMPlatformIP6Address *addr = NULL; + int IS_IPv4; g_return_val_if_fail(NM_IS_DHCP_CLIENT(self), FALSE); + priv = NM_DHCP_CLIENT_GET_PRIVATE(self); g_return_val_if_fail(priv->pid == -1, FALSE); - g_return_val_if_fail(priv->config.addr_family == AF_INET6, FALSE); g_return_val_if_fail(priv->config.uuid, FALSE); - g_return_val_if_fail(!priv->effective_client_id, FALSE); + nm_assert(!priv->effective_client_id); - if (!priv->config.v6.enforce_duid) - own_client_id = NM_DHCP_CLIENT_GET_CLASS(self)->get_duid(self); + IS_IPv4 = NM_IS_IPv4(priv->config.addr_family); - nm_dhcp_client_set_effective_client_id(self, own_client_id ?: priv->config.client_id); + if (!IS_IPv4) { + if (!priv->config.v6.enforce_duid) + own_client_id = NM_DHCP_CLIENT_GET_CLASS(self)->get_duid(self); - addr = ipv6_lladdr_find(self); - if (!addr) { - _LOGD("waiting for IPv6LL address"); - priv->l3cfg_notify.wait_ll_address = TRUE; - connect_l3cfg_notify(self); - priv->ipv6_lladdr_timeout_source = - nm_g_timeout_add_seconds_source(10, ipv6_lladdr_timeout, self); - return TRUE; + nm_dhcp_client_set_effective_client_id(self, own_client_id ?: priv->config.client_id); + + addr = ipv6_lladdr_find(self); + if (!addr) { + _LOGD("waiting for IPv6LL address"); + priv->l3cfg_notify.wait_ll_address = TRUE; + l3_cfg_notify_check_connected(self); + priv->v6.lladdr_timeout_source = + nm_g_timeout_add_seconds_source(10, ipv6_lladdr_timeout, self); + return TRUE; + } } - schedule_no_lease_timeout(self); + _no_lease_timeout_schedule(self); + + if (IS_IPv4) + return NM_DHCP_CLIENT_GET_CLASS(self)->ip4_start(self, error); return NM_DHCP_CLIENT_GET_CLASS(self)->ip6_start(self, &addr->address, error); } +/*****************************************************************************/ + void nm_dhcp_client_stop_existing(const char *pid_file, const char *binary_name) { @@ -757,9 +921,17 @@ nm_dhcp_client_stop(NMDhcpClient *self, gboolean release) priv->is_stopped = TRUE; + if (NM_IS_IPv4(priv->config.addr_family) && priv->v4.bound.invocation) { + g_dbus_method_invocation_return_error(g_steal_pointer(&priv->v4.bound.invocation), + NM_DEVICE_ERROR, + NM_DEVICE_ERROR_FAILED, + "dhcp stopping"); + } + priv->l3cfg_notify.wait_dhcp_commit = FALSE; priv->l3cfg_notify.wait_ll_address = FALSE; - connect_l3cfg_notify(self); + priv->l3cfg_notify.wait_ipv6_dad = FALSE; + l3_cfg_notify_check_connected(self); /* Kill the DHCP client */ old_pid = priv->pid; @@ -770,7 +942,7 @@ nm_dhcp_client_stop(NMDhcpClient *self, gboolean release) _LOGI("canceled DHCP transaction"); nm_assert(priv->pid == -1); - nm_dhcp_client_set_state(self, NM_DHCP_STATE_TERMINATED, NULL); + _nm_dhcp_client_notify(self, NM_DHCP_CLIENT_EVENT_TYPE_TERMINATED, NULL); } /*****************************************************************************/ @@ -895,16 +1067,17 @@ nm_dhcp_client_emit_ipv6_prefix_delegated(NMDhcpClient *self, const NMPlatformIP } gboolean -nm_dhcp_client_handle_event(gpointer unused, - const char *iface, - int pid, - GVariant *options, - const char *reason, - NMDhcpClient *self) +nm_dhcp_client_handle_event(gpointer unused, + const char *iface, + int pid, + GVariant *options, + const char *reason, + GDBusMethodInvocation *invocation, + NMDhcpClient *self) { NMDhcpClientPrivate *priv; - guint32 new_state; - nm_auto_unref_l3cd_init NML3ConfigData *l3cd = NULL; + nm_auto_unref_l3cd_init NML3ConfigData *l3cd = NULL; + NMDhcpClientEventType client_event_type; NMPlatformIP6Address prefix = { 0, }; @@ -914,6 +1087,7 @@ nm_dhcp_client_handle_event(gpointer unused, g_return_val_if_fail(pid > 0, FALSE); g_return_val_if_fail(g_variant_is_of_type(options, G_VARIANT_TYPE_VARDICT), FALSE); g_return_val_if_fail(reason != NULL, FALSE); + g_return_val_if_fail(G_IS_DBUS_METHOD_INVOCATION(invocation), FALSE); priv = NM_DHCP_CLIENT_GET_PRIVATE(self); @@ -922,17 +1096,29 @@ nm_dhcp_client_handle_event(gpointer unused, if (priv->pid != pid) return FALSE; - new_state = reason_to_state(self, priv->config.iface, reason); - if (new_state == NM_DHCP_STATE_NOOP) - return TRUE; - - _LOGD("DHCP state '%s' -> '%s' (reason: '%s')", - nm_dhcp_state_to_string(priv->state), - nm_dhcp_state_to_string(new_state), - reason); - priv->state = new_state; + _LOGD("DHCP event (reason: '%s')", reason); + + if (NM_IN_STRSET_ASCII_CASE(reason, "preinit")) + goto out_handled; + + if (NM_IN_STRSET_ASCII_CASE(reason, "bound", "bound6", "static")) + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_BOUND; + else if (NM_IN_STRSET_ASCII_CASE(reason, "renew", "renew6", "reboot", "rebind", "rebind6")) + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED; + else if (NM_IN_STRSET_ASCII_CASE(reason, "timeout")) + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT; + else if (NM_IN_STRSET_ASCII_CASE(reason, "nak", "expire", "expire6")) + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_EXPIRE; + else if (NM_IN_STRSET_ASCII_CASE(reason, "end", "stop", "stopped")) + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_TERMINATED; + else if (NM_IN_STRSET_ASCII_CASE(reason, "fail", "abend")) + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_FAIL; + else + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_UNSPECIFIED; - if (NM_IN_SET(new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED)) { + if (NM_IN_SET(client_event_type, + NM_DHCP_CLIENT_EVENT_TYPE_BOUND, + NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED)) { gs_unref_hashtable GHashTable *str_options = NULL; GVariantIter iter; const char *name; @@ -963,8 +1149,7 @@ nm_dhcp_client_handle_event(gpointer unused, str_options, priv->config.v6.info_only); } - } else - g_warn_if_reached(); + } if (l3cd) { nm_l3_config_data_set_dhcp_lease_from_options(l3cd, @@ -978,16 +1163,32 @@ nm_dhcp_client_handle_event(gpointer unused, * of the DHCP client instance. Instead, we just signal the prefix * to the device. */ nm_dhcp_client_emit_ipv6_prefix_delegated(self, &prefix); - return TRUE; + goto out_handled; } - /* Fail if no valid IP config was received */ - if (NM_IN_SET(new_state, NM_DHCP_STATE_BOUND, NM_DHCP_STATE_EXTENDED) && !l3cd) { + if (NM_IN_SET(client_event_type, + NM_DHCP_CLIENT_EVENT_TYPE_BOUND, + NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED) + && !l3cd) { + /* Fail if no valid IP config was received */ _LOGW("client bound but IP config not received"); - new_state = NM_DHCP_STATE_FAIL; + client_event_type = NM_DHCP_CLIENT_EVENT_TYPE_FAIL; } - nm_dhcp_client_set_state(self, new_state, l3cd); + if (priv->v4.bound.invocation) + g_dbus_method_invocation_return_value(g_steal_pointer(&priv->v4.bound.invocation), NULL); + + if (NM_IS_IPv4(priv->config.addr_family) + && NM_IN_SET(client_event_type, + NM_DHCP_CLIENT_EVENT_TYPE_BOUND, + NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED)) + priv->v4.bound.invocation = g_steal_pointer(&invocation); + + _nm_dhcp_client_notify(self, client_event_type, l3cd); + +out_handled: + if (invocation) + g_dbus_method_invocation_return_value(invocation, NULL); return TRUE; } @@ -1023,21 +1224,26 @@ nm_dhcp_client_server_id_is_rejected(NMDhcpClient *self, gconstpointer addr) return FALSE; } +/*****************************************************************************/ + static void config_init(NMDhcpClientConfig *config, const NMDhcpClientConfig *src) { + nm_assert(config); + nm_assert(src); + nm_assert(config != src); + nm_assert_addr_family(src->addr_family); + *config = *src; + /* We must not return before un-aliasing all pointers in @config! */ + g_object_ref(config->l3cfg); - if (config->hwaddr) - g_bytes_ref(config->hwaddr); - if (config->bcast_hwaddr) - g_bytes_ref(config->bcast_hwaddr); - if (config->vendor_class_identifier) - g_bytes_ref(config->vendor_class_identifier); - if (config->client_id) - g_bytes_ref(config->client_id); + nm_g_bytes_ref(config->hwaddr); + nm_g_bytes_ref(config->bcast_hwaddr); + nm_g_bytes_ref(config->vendor_class_identifier); + nm_g_bytes_ref(config->client_id); config->iface = g_strdup(config->iface); config->uuid = g_strdup(config->uuid); @@ -1047,14 +1253,12 @@ config_init(NMDhcpClientConfig *config, const NMDhcpClientConfig *src) config->reject_servers = (const char *const *) nm_strv_dup(config->reject_servers, -1, TRUE); - if (config->addr_family == AF_INET) { + if (NM_IS_IPv4(config->addr_family)) config->v4.last_address = g_strdup(config->v4.last_address); - } else if (config->addr_family == AF_INET6) { + else { config->hwaddr = NULL; config->bcast_hwaddr = NULL; config->use_fqdn = TRUE; - } else { - nm_assert_not_reached(); } if (!config->hostname && config->send_hostname) { @@ -1114,46 +1318,6 @@ config_clear(NMDhcpClientConfig *config) } } -int -nm_dhcp_client_get_addr_family(NMDhcpClient *self) -{ - NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - - return priv->config.addr_family; -} - -const char * -nm_dhcp_client_get_iface(NMDhcpClient *self) -{ - NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - - return priv->config.iface; -} - -NMDedupMultiIndex * -nm_dhcp_client_get_multi_idx(NMDhcpClient *self) -{ - NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - - return nm_l3cfg_get_multi_idx(priv->config.l3cfg); -} - -int -nm_dhcp_client_get_ifindex(NMDhcpClient *self) -{ - NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - - return nm_l3cfg_get_ifindex(priv->config.l3cfg); -} - -GBytes * -nm_dhcp_client_get_effective_client_id(NMDhcpClient *self) -{ - NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE(self); - - return priv->effective_client_id; -} - /*****************************************************************************/ static void @@ -1165,6 +1329,21 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps case PROP_CONFIG: /* construct-only */ config_init(&priv->config, g_value_get_pointer(value)); + + /* I know, this is technically not necessary. It just feels nicer to + * explicitly initialize the respective union member. */ + if (NM_IS_IPv4(priv->config.addr_family)) { + priv->v4 = (typeof(priv->v4)){ + .bound = + { + .invocation = NULL, + }, + }; + } else { + priv->v6 = (typeof(priv->v6)){ + .lladdr_timeout_source = NULL, + }; + } break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); @@ -1196,7 +1375,12 @@ dispose(GObject *object) watch_cleanup(self); nm_clear_g_source_inst(&priv->no_lease_timeout_source); - nm_clear_g_source_inst(&priv->ipv6_lladdr_timeout_source); + + if (!NM_IS_IPv4(priv->config.addr_family)) { + nm_clear_g_source_inst(&priv->v6.lladdr_timeout_source); + nm_clear_g_source_inst(&priv->v6.dad_timeout_source); + } + nm_clear_pointer(&priv->effective_client_id, g_bytes_unref); G_OBJECT_CLASS(nm_dhcp_client_parent_class)->dispose(object); @@ -1223,6 +1407,8 @@ nm_dhcp_client_class_init(NMDhcpClientClass *client_class) object_class->dispose = dispose; object_class->finalize = finalize; object_class->set_property = set_property; + client_class->accept = _accept; + client_class->decline = decline; client_class->stop = stop; client_class->get_duid = get_duid; diff --git a/src/core/dhcp/nm-dhcp-client.h b/src/core/dhcp/nm-dhcp-client.h index 249bd013..e4b99929 100644 --- a/src/core/dhcp/nm-dhcp-client.h +++ b/src/core/dhcp/nm-dhcp-client.h @@ -27,16 +27,16 @@ #define NM_DHCP_CLIENT_NOTIFY "dhcp-notify" typedef enum { - NM_DHCP_STATE_UNKNOWN = 0, - NM_DHCP_STATE_BOUND, /* new lease */ - NM_DHCP_STATE_EXTENDED, /* lease extended */ - NM_DHCP_STATE_TIMEOUT, /* timed out contacting server */ - NM_DHCP_STATE_DONE, /* client reported it's stopping */ - NM_DHCP_STATE_EXPIRE, /* lease expired or NAKed */ - NM_DHCP_STATE_FAIL, /* failed for some reason */ - NM_DHCP_STATE_TERMINATED, /* client is no longer running */ - NM_DHCP_STATE_NOOP, /* state is a non operation for NetworkManager */ -} NMDhcpState; + NM_DHCP_CLIENT_EVENT_TYPE_UNSPECIFIED, + + NM_DHCP_CLIENT_EVENT_TYPE_BOUND, + NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED, + + NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT, + NM_DHCP_CLIENT_EVENT_TYPE_EXPIRE, + NM_DHCP_CLIENT_EVENT_TYPE_FAIL, + NM_DHCP_CLIENT_EVENT_TYPE_TERMINATED, +} NMDhcpClientEventType; typedef enum _nm_packed { NM_DHCP_CLIENT_NOTIFY_TYPE_LEASE_UPDATE, @@ -82,17 +82,8 @@ typedef struct { }; } NMDhcpClientNotifyData; -const char *nm_dhcp_state_to_string(NMDhcpState state); - -/* FIXME(l3cfg:dhcp:config): nm_dhcp_manager_start_ip[46]() has a gazillion of parameters, - * those get passed on as CONSTRUCT_ONLY properties to the NMDhcpClient. Drop - * all these parameters, and let the caller provide one NMDhcpClientConfig - * instance. There will be only one GObject property (NM_DHCP_CLIENT_CONFIG), - * which is CONSTRUCT_ONLY and takes a (mandatory) G_TYPE_POINTER for the - * configuration. - * - * Since NMDhcpClientConfig has an addr_family, we also don't need separate - * nm_dhcp_manager_start_ip[46]() methods. */ +const char *nm_dhcp_client_event_type_to_string(NMDhcpClientEventType client_event_type); + typedef struct { int addr_family; @@ -156,12 +147,13 @@ typedef struct { union { struct { + /* The address from the previous lease */ + const char *last_address; + /* Set BOOTP broadcast flag in request packets, so that servers * will always broadcast replies. */ bool request_broadcast : 1; - /* The address from the previous lease */ - const char *last_address; } v4; struct { /* If set, the DUID from the connection is used; otherwise @@ -208,9 +200,12 @@ typedef struct { gboolean (*ip4_start)(NMDhcpClient *self, GError **error); - gboolean (*accept)(NMDhcpClient *self, GError **error); + gboolean (*accept)(NMDhcpClient *self, const NML3ConfigData *l3cd, GError **error); - gboolean (*decline)(NMDhcpClient *self, const char *error_message, GError **error); + gboolean (*decline)(NMDhcpClient *self, + const NML3ConfigData *l3cd, + const char *error_message, + GError **error); gboolean (*ip6_start)(NMDhcpClient *self, const struct in6_addr *ll_addr, GError **error); @@ -230,8 +225,7 @@ typedef struct { GType nm_dhcp_client_get_type(void); -gboolean nm_dhcp_client_start_ip4(NMDhcpClient *self, GError **error); -gboolean nm_dhcp_client_start_ip6(NMDhcpClient *self, GError **error); +gboolean nm_dhcp_client_start(NMDhcpClient *self, GError **error); const NMDhcpClientConfig *nm_dhcp_client_get_config(NMDhcpClient *self); @@ -250,11 +244,6 @@ nm_dhcp_client_get_lease(NMDhcpClient *self) return NULL; } -gboolean nm_dhcp_client_accept(NMDhcpClient *self, GError **error); -gboolean nm_dhcp_client_can_accept(NMDhcpClient *self); - -gboolean nm_dhcp_client_decline(NMDhcpClient *self, const char *error_message, GError **error); - void nm_dhcp_client_stop(NMDhcpClient *self, gboolean release); /* Backend helpers for subclasses */ @@ -268,15 +257,17 @@ void nm_dhcp_client_watch_child(NMDhcpClient *self, pid_t pid); void nm_dhcp_client_stop_watch_child(NMDhcpClient *self, pid_t pid); -void -nm_dhcp_client_set_state(NMDhcpClient *self, NMDhcpState new_state, const NML3ConfigData *l3cd); - -gboolean nm_dhcp_client_handle_event(gpointer unused, - const char *iface, - int pid, - GVariant *options, - const char *reason, - NMDhcpClient *self); +void _nm_dhcp_client_notify(NMDhcpClient *self, + NMDhcpClientEventType client_event_type, + const NML3ConfigData *l3cd); + +gboolean nm_dhcp_client_handle_event(gpointer unused, + const char *iface, + int pid, + GVariant *options, + const char *reason, + GDBusMethodInvocation *invocation, + NMDhcpClient *self); void nm_dhcp_client_emit_ipv6_prefix_delegated(NMDhcpClient *self, const NMPlatformIP6Address *prefix); diff --git a/src/core/dhcp/nm-dhcp-helper.c b/src/core/dhcp/nm-dhcp-helper.c index 41862f2b..aab658a2 100644 --- a/src/core/dhcp/nm-dhcp-helper.c +++ b/src/core/dhcp/nm-dhcp-helper.c @@ -100,21 +100,6 @@ next:; return g_variant_ref_sink(g_variant_new("(a{sv})", &builder)); } -static void -kill_pid(void) -{ - const char *pid_str; - pid_t pid = 0; - - pid_str = getenv("pid"); - if (pid_str) - pid = strtol(pid_str, NULL, 10); - if (pid) { - _LOGI("a fatal error occurred, kill dhclient instance with pid %d", pid); - kill(pid, SIGTERM); - } -} - int main(int argc, char *argv[]) { @@ -180,7 +165,7 @@ do_notify: parameters, NULL, G_DBUS_CALL_FLAGS_NONE, - 1000, + 60000, NULL, &error); @@ -236,7 +221,5 @@ do_notify: } out: - if (!success) - kill_pid(); return success ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/src/core/dhcp/nm-dhcp-listener.c b/src/core/dhcp/nm-dhcp-listener.c index 2c567593..0854c1dc 100644 --- a/src/core/dhcp/nm-dhcp-listener.c +++ b/src/core/dhcp/nm-dhcp-listener.c @@ -128,7 +128,7 @@ get_option(GVariant *options, const char *key) } static void -_method_call_handle(NMDhcpListener *self, GVariant *parameters) +_method_call_handle(NMDhcpListener *self, GDBusMethodInvocation *invocation, GVariant *parameters) { gs_free char *iface = NULL; gs_free char *pid_str = NULL; @@ -142,23 +142,23 @@ _method_call_handle(NMDhcpListener *self, GVariant *parameters) iface = get_option(options, "interface"); if (iface == NULL) { _LOGW("dhcp-event: didn't have associated interface."); - return; + goto out; } pid_str = get_option(options, "pid"); pid = _nm_utils_ascii_str_to_int64(pid_str, 10, 0, G_MAXINT32, -1); if (pid == -1) { _LOGW("dhcp-event: couldn't convert PID '%s' to an integer", pid_str ?: "(null)"); - return; + goto out; } reason = get_option(options, "reason"); if (reason == NULL) { _LOGW("dhcp-event: (pid %d) DHCP event didn't have a reason", pid); - return; + goto out; } - g_signal_emit(self, signals[EVENT], 0, iface, pid, options, reason, &handled); + g_signal_emit(self, signals[EVENT], 0, iface, pid, options, reason, invocation, &handled); if (!handled) { if (g_ascii_strcasecmp(reason, "RELEASE") == 0) { /* Ignore event when the dhcp client gets killed and we receive its last message */ @@ -166,6 +166,10 @@ _method_call_handle(NMDhcpListener *self, GVariant *parameters) } else _LOGW("dhcp-event: (pid %d) unhandled DHCP event for interface %s", pid, iface); } + +out: + if (!handled) + g_dbus_method_invocation_return_value(invocation, NULL); } static void @@ -190,8 +194,7 @@ _method_call(GDBusConnection *connection, return; } - _method_call_handle(self, parameters); - g_dbus_method_invocation_return_value(invocation, NULL); + _method_call_handle(self, invocation, parameters); } static GDBusInterfaceInfo *const interface_info = NM_DEFINE_GDBUS_INTERFACE_INFO( @@ -311,9 +314,10 @@ nm_dhcp_listener_class_init(NMDhcpListenerClass *listener_class) NULL, NULL, G_TYPE_BOOLEAN, /* listeners return TRUE if handled */ - 4, + 5, G_TYPE_STRING, /* iface */ G_TYPE_INT, /* pid */ G_TYPE_VARIANT, /* options */ - G_TYPE_STRING); /* reason */ + G_TYPE_STRING, /* reason */ + G_TYPE_DBUS_METHOD_INVOCATION /* invocation*/); } diff --git a/src/core/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c index f353e637..9fea1666 100644 --- a/src/core/dhcp/nm-dhcp-manager.c +++ b/src/core/dhcp/nm-dhcp-manager.c @@ -131,8 +131,7 @@ NMDhcpClient * nm_dhcp_manager_start_client(NMDhcpManager *self, NMDhcpClientConfig *config, GError **error) { NMDhcpManagerPrivate *priv; - gs_unref_object NMDhcpClient *client = NULL; - gboolean success = FALSE; + gs_unref_object NMDhcpClient *client = NULL; gsize hwaddr_len; GType gtype; @@ -202,13 +201,7 @@ nm_dhcp_manager_start_client(NMDhcpManager *self, NMDhcpClientConfig *config, GE * default outside of NetworkManager API. */ - if (config->addr_family == AF_INET) { - success = nm_dhcp_client_start_ip4(client, error); - } else { - success = nm_dhcp_client_start_ip6(client, error); - } - - if (!success) + if (!nm_dhcp_client_start(client, error)) return NULL; return g_steal_pointer(&client); diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c index aac18967..2e41cf15 100644 --- a/src/core/dhcp/nm-dhcp-nettools.c +++ b/src/core/dhcp/nm-dhcp-nettools.c @@ -50,9 +50,14 @@ typedef struct _NMDhcpNettoolsClass NMDhcpNettoolsClass; typedef struct { NDhcp4Client *client; NDhcp4ClientProbe *probe; - NDhcp4ClientLease *lease; - GSource *event_source; - char *lease_file; + + struct { + NDhcp4ClientLease *lease; + const NML3ConfigData *lease_l3cd; + } granted; + + GSource *event_source; + char *lease_file; } NMDhcpNettoolsPrivate; struct _NMDhcpNettools { @@ -778,15 +783,19 @@ lease_save(NMDhcpNettools *self, NDhcp4ClientLease *lease, const char *lease_fil } static void -bound4_handle(NMDhcpNettools *self, NDhcp4ClientLease *lease, gboolean extended) +bound4_handle(NMDhcpNettools *self, guint event, NDhcp4ClientLease *lease) { NMDhcpNettoolsPrivate *priv = NM_DHCP_NETTOOLS_GET_PRIVATE(self); NMDhcpClient *client = NM_DHCP_CLIENT(self); const NMDhcpClientConfig *client_config; nm_auto_unref_l3cd_init NML3ConfigData *l3cd = NULL; - GError *error = NULL; + gs_free_error GError *error = NULL; + + nm_assert(NM_IN_SET(event, N_DHCP4_CLIENT_EVENT_GRANTED, N_DHCP4_CLIENT_EVENT_EXTENDED)); + nm_assert(lease); + + _LOGT("lease available (%s)", (event == N_DHCP4_CLIENT_EVENT_GRANTED) ? "granted" : "extended"); - _LOGT("lease available (%s)", extended ? "extended" : "new"); client_config = nm_dhcp_client_get_config(client); l3cd = lease_to_ip4_config(nm_dhcp_client_get_multi_idx(client), client_config->iface, @@ -795,29 +804,51 @@ bound4_handle(NMDhcpNettools *self, NDhcp4ClientLease *lease, gboolean extended) &error); if (!l3cd) { _LOGW("failure to parse lease: %s", error->message); - g_clear_error(&error); - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), NM_DHCP_STATE_FAIL, NULL); + + if (event == N_DHCP4_CLIENT_EVENT_GRANTED) + n_dhcp4_client_lease_decline(lease, "invalid lease"); + + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), NM_DHCP_CLIENT_EVENT_TYPE_FAIL, NULL); return; } - lease_save(self, lease, priv->lease_file); - - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), - extended ? NM_DHCP_STATE_EXTENDED : NM_DHCP_STATE_BOUND, - l3cd); + if (event == N_DHCP4_CLIENT_EVENT_GRANTED) { + priv->granted.lease = n_dhcp4_client_lease_ref(lease); + priv->granted.lease_l3cd = nm_l3_config_data_ref(l3cd); + } else + lease_save(self, lease, priv->lease_file); + + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), + event == N_DHCP4_CLIENT_EVENT_GRANTED + ? NM_DHCP_CLIENT_EVENT_TYPE_BOUND + : NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED, + l3cd); } static void dhcp4_event_handle(NMDhcpNettools *self, NDhcp4ClientEvent *event) { - NMDhcpNettoolsPrivate *priv = NM_DHCP_NETTOOLS_GET_PRIVATE(self); - const NMDhcpClientConfig *client_config; - struct in_addr server_id; - char addr_str[INET_ADDRSTRLEN]; - int r; + NMDhcpNettoolsPrivate *priv = NM_DHCP_NETTOOLS_GET_PRIVATE(self); + struct in_addr server_id; + struct in_addr yiaddr; + char addr_str[INET_ADDRSTRLEN]; + char addr_str2[INET_ADDRSTRLEN]; + int r; - _LOGT("client event %d", event->event); - client_config = nm_dhcp_client_get_config(NM_DHCP_CLIENT(self)); + if (event->event == N_DHCP4_CLIENT_EVENT_LOG) { + _NMLOG(nm_log_level_from_syslog(event->log.level), "event: %s", event->log.message); + return; + } + + if (!NM_IN_SET(event->event, N_DHCP4_CLIENT_EVENT_LOG)) { + /* In almost all events (even those that we don't expect below), we clear + * the currently granted lease. That is, because in GRANTED state we + * expect to follow up with accept/decline, and that only works while + * we are still in the same state. Transitioning away to another state + * (on most events) will invalidate that. */ + nm_clear_pointer(&priv->granted.lease, n_dhcp4_client_lease_unref); + nm_clear_l3cd(&priv->granted.lease_l3cd); + } switch (event->event) { case N_DHCP4_CLIENT_EVENT_OFFER: @@ -827,53 +858,51 @@ dhcp4_event_handle(NMDhcpNettools *self, NDhcp4ClientEvent *event) return; } + n_dhcp4_client_lease_get_yiaddr(event->offer.lease, &yiaddr); + if (yiaddr.s_addr == INADDR_ANY) { + _LOGD("selecting lease failed: no yiaddr address"); + return; + } + if (nm_dhcp_client_server_id_is_rejected(NM_DHCP_CLIENT(self), &server_id)) { _LOGD("server-id %s is in the reject-list, ignoring", nm_utils_inet_ntop(AF_INET, &server_id, addr_str)); return; } + _LOGT("selecting offered lease from %s for %s", + _nm_utils_inet4_ntop(server_id.s_addr, addr_str), + _nm_utils_inet4_ntop(yiaddr.s_addr, addr_str2)); + r = n_dhcp4_client_lease_select(event->offer.lease); if (r) { _LOGW("selecting lease failed: %d", r); return; } - break; + + return; case N_DHCP4_CLIENT_EVENT_RETRACTED: case N_DHCP4_CLIENT_EVENT_EXPIRED: - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), NM_DHCP_STATE_EXPIRE, NULL); - break; + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), NM_DHCP_CLIENT_EVENT_TYPE_EXPIRE, NULL); + return; case N_DHCP4_CLIENT_EVENT_CANCELLED: - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), NM_DHCP_STATE_FAIL, NULL); - break; + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), NM_DHCP_CLIENT_EVENT_TYPE_FAIL, NULL); + return; case N_DHCP4_CLIENT_EVENT_GRANTED: - priv->lease = n_dhcp4_client_lease_ref(event->granted.lease); - bound4_handle(self, event->granted.lease, FALSE); - break; + bound4_handle(self, event->event, event->granted.lease); + return; case N_DHCP4_CLIENT_EVENT_EXTENDED: - bound4_handle(self, event->extended.lease, TRUE); - break; + bound4_handle(self, event->event, event->extended.lease); + return; case N_DHCP4_CLIENT_EVENT_DOWN: /* ignore down events, they are purely informational */ - break; - case N_DHCP4_CLIENT_EVENT_LOG: - { - NMLogLevel nm_level; - - nm_level = nm_log_level_from_syslog(event->log.level); - if (nm_logging_enabled(nm_level, LOGD_DHCP4)) { - nm_log(nm_level, - LOGD_DHCP4, - NULL, - NULL, - "dhcp4 (%s): %s", - client_config->iface, - event->log.message); - } - } break; + _LOGT("event: down (ignore)"); + return; default: - _LOGW("unhandled DHCP event %d", event->event); - break; + _LOGE("unhandled DHCP event %d", event->event); + nm_assert(event->event != N_DHCP4_CLIENT_EVENT_LOG); + nm_assert_not_reached(); + return; } } @@ -896,7 +925,7 @@ dhcp4_event_cb(int fd, GIOCondition condition, gpointer user_data) */ _LOGE("error %d dispatching events", r); nm_clear_g_source_inst(&priv->event_source); - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), NM_DHCP_STATE_FAIL, NULL); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), NM_DHCP_CLIENT_EVENT_TYPE_FAIL, NULL); return G_SOURCE_REMOVE; } @@ -1008,46 +1037,65 @@ nettools_create(NMDhcpNettools *self, GError **error) } static gboolean -_accept(NMDhcpClient *client, GError **error) +_accept(NMDhcpClient *client, const NML3ConfigData *l3cd, GError **error) { NMDhcpNettools *self = NM_DHCP_NETTOOLS(client); NMDhcpNettoolsPrivate *priv = NM_DHCP_NETTOOLS_GET_PRIVATE(self); int r; - g_return_val_if_fail(priv->lease, FALSE); - _LOGT("accept"); - r = n_dhcp4_client_lease_accept(priv->lease); + g_return_val_if_fail(l3cd, FALSE); + + if (priv->granted.lease_l3cd != l3cd) + return TRUE; + + nm_assert(priv->granted.lease); + + r = n_dhcp4_client_lease_accept(priv->granted.lease); + if (!r) + lease_save(self, priv->granted.lease, priv->lease_file); + + nm_clear_pointer(&priv->granted.lease, n_dhcp4_client_lease_unref); + nm_clear_l3cd(&priv->granted.lease_l3cd); + if (r) { set_error_nettools(error, r, "failed to accept lease"); return FALSE; } - priv->lease = n_dhcp4_client_lease_unref(priv->lease); - return TRUE; } static gboolean -decline(NMDhcpClient *client, const char *error_message, GError **error) +decline(NMDhcpClient *client, const NML3ConfigData *l3cd, const char *error_message, GError **error) { NMDhcpNettools *self = NM_DHCP_NETTOOLS(client); NMDhcpNettoolsPrivate *priv = NM_DHCP_NETTOOLS_GET_PRIVATE(self); int r; + nm_auto(n_dhcp4_client_lease_unrefp) NDhcp4ClientLease *lease = NULL; - g_return_val_if_fail(priv->lease, FALSE); + _LOGT("decline (%s)", error_message); - _LOGT("dhcp4-client: decline (%s)", error_message); + g_return_val_if_fail(l3cd, FALSE); + + if (priv->granted.lease_l3cd != l3cd) { + nm_utils_error_set(error, NM_UTILS_ERROR_UNKNOWN, "calling decline in unexpected state"); + return FALSE; + } + + nm_assert(priv->granted.lease); + + lease = g_steal_pointer(&priv->granted.lease); + nm_clear_l3cd(&priv->granted.lease_l3cd); + + r = n_dhcp4_client_lease_decline(lease, error_message); - r = n_dhcp4_client_lease_decline(priv->lease, error_message); if (r) { set_error_nettools(error, r, "failed to decline lease"); return FALSE; } - priv->lease = n_dhcp4_client_lease_unref(priv->lease); - return TRUE; } @@ -1256,7 +1304,8 @@ dispose(GObject *object) nm_clear_g_free(&priv->lease_file); nm_clear_g_source_inst(&priv->event_source); - nm_clear_pointer(&priv->lease, n_dhcp4_client_lease_unref); + nm_clear_pointer(&priv->granted.lease, n_dhcp4_client_lease_unref); + nm_clear_l3cd(&priv->granted.lease_l3cd); nm_clear_pointer(&priv->probe, n_dhcp4_client_probe_free); nm_clear_pointer(&priv->client, n_dhcp4_client_unref); diff --git a/src/core/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c index 4a718de9..f2dd1823 100644 --- a/src/core/dhcp/nm-dhcp-systemd.c +++ b/src/core/dhcp/nm-dhcp-systemd.c @@ -459,7 +459,7 @@ bound4_handle(NMDhcpSystemd *self, gboolean extended) if (sd_dhcp_client_get_lease(priv->client4, &lease) < 0 || !lease) { _LOGW("no lease!"); - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), NM_DHCP_STATE_FAIL, NULL); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), NM_DHCP_CLIENT_EVENT_TYPE_FAIL, NULL); return; } @@ -473,15 +473,16 @@ bound4_handle(NMDhcpSystemd *self, gboolean extended) if (!l3cd) { _LOGW("%s", error->message); g_clear_error(&error); - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), NM_DHCP_STATE_FAIL, NULL); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), NM_DHCP_CLIENT_EVENT_TYPE_FAIL, NULL); return; } dhcp_lease_save(lease, priv->lease_file); - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), - extended ? NM_DHCP_STATE_EXTENDED : NM_DHCP_STATE_BOUND, - l3cd); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), + extended ? NM_DHCP_CLIENT_EVENT_TYPE_EXTENDED + : NM_DHCP_CLIENT_EVENT_TYPE_BOUND, + l3cd); } static int @@ -500,10 +501,10 @@ dhcp_event_cb(sd_dhcp_client *client, int event, gpointer user_data) switch (event) { case SD_DHCP_CLIENT_EVENT_EXPIRED: - nm_dhcp_client_set_state(NM_DHCP_CLIENT(user_data), NM_DHCP_STATE_EXPIRE, NULL); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(user_data), NM_DHCP_CLIENT_EVENT_TYPE_EXPIRE, NULL); break; case SD_DHCP_CLIENT_EVENT_STOP: - nm_dhcp_client_set_state(NM_DHCP_CLIENT(user_data), NM_DHCP_STATE_FAIL, NULL); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(user_data), NM_DHCP_CLIENT_EVENT_TYPE_FAIL, NULL); break; case SD_DHCP_CLIENT_EVENT_RENEW: case SD_DHCP_CLIENT_EVENT_IP_CHANGE: @@ -876,7 +877,7 @@ bound6_handle(NMDhcpSystemd *self) if (sd_dhcp6_client_get_lease(priv->client6, &lease) < 0 || !lease) { _LOGW(" no lease!"); - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), NM_DHCP_STATE_FAIL, NULL); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), NM_DHCP_CLIENT_EVENT_TYPE_FAIL, NULL); return; } @@ -892,11 +893,11 @@ bound6_handle(NMDhcpSystemd *self) if (!l3cd) { _LOGW("%s", error->message); - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), NM_DHCP_STATE_FAIL, NULL); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), NM_DHCP_CLIENT_EVENT_TYPE_FAIL, NULL); return; } - nm_dhcp_client_set_state(NM_DHCP_CLIENT(self), NM_DHCP_STATE_BOUND, l3cd); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(self), NM_DHCP_CLIENT_EVENT_TYPE_BOUND, l3cd); sd_dhcp6_lease_reset_pd_prefix_iter(lease); while (!sd_dhcp6_lease_get_pd(lease, @@ -921,11 +922,11 @@ dhcp6_event_cb(sd_dhcp6_client *client, int event, gpointer user_data) switch (event) { case SD_DHCP6_CLIENT_EVENT_RETRANS_MAX: - nm_dhcp_client_set_state(NM_DHCP_CLIENT(user_data), NM_DHCP_STATE_TIMEOUT, NULL); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(user_data), NM_DHCP_CLIENT_EVENT_TYPE_TIMEOUT, NULL); break; case SD_DHCP6_CLIENT_EVENT_RESEND_EXPIRE: case SD_DHCP6_CLIENT_EVENT_STOP: - nm_dhcp_client_set_state(NM_DHCP_CLIENT(user_data), NM_DHCP_STATE_FAIL, NULL); + _nm_dhcp_client_notify(NM_DHCP_CLIENT(user_data), NM_DHCP_CLIENT_EVENT_TYPE_FAIL, NULL); break; case SD_DHCP6_CLIENT_EVENT_IP_ACQUIRE: case SD_DHCP6_CLIENT_EVENT_INFORMATION_REQUEST: diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c index 081e2841..88fe83f3 100644 --- a/src/core/dhcp/nm-dhcp-utils.c +++ b/src/core/dhcp/nm-dhcp-utils.c @@ -855,8 +855,7 @@ nm_dhcp_utils_merge_new_dhcp6_lease(const NML3ConfigData *l3cd_old, const char *start; const char *iaid; - nm_assert(out_l3cd_merged); - nm_assert(!*out_l3cd_merged); + nm_assert(out_l3cd_merged && !*out_l3cd_merged); if (!l3cd_old) return FALSE; diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c index c8b789b3..60c286ee 100644 --- a/src/core/nm-core-utils.c +++ b/src/core/nm-core-utils.c @@ -2815,7 +2815,10 @@ _host_id_read(guint8 **out_host_id, gsize *out_host_id_len) int base64_save = 0; gsize len; - success = nm_utils_random_bytes(rnd_buf, sizeof(rnd_buf)); + if (nm_random_get_crypto_bytes(rnd_buf, sizeof(rnd_buf)) < 0) + nm_random_get_bytes_full(rnd_buf, sizeof(rnd_buf), &success); + else + success = TRUE; /* Our key is really binary data. But since we anyway generate a random seed * (with 32 random bytes), don't write it in binary, but instead create @@ -3313,7 +3316,7 @@ nm_utils_stable_id_random(void) { char buf[15]; - nm_utils_random_bytes(buf, sizeof(buf)); + nm_random_get_bytes(buf, sizeof(buf)); return g_base64_encode((guchar *) buf, sizeof(buf)); } @@ -3684,7 +3687,7 @@ nm_utils_hw_addr_gen_random_eth(const char *current_mac_address, { struct ether_addr bin_addr; - nm_utils_random_bytes(&bin_addr, ETH_ALEN); + nm_random_get_bytes(&bin_addr, ETH_ALEN); _hw_addr_eth_complete(&bin_addr, current_mac_address, generate_mac_address_mask); return nm_utils_hwaddr_ntoa(&bin_addr, ETH_ALEN); } diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c index 2d47772d..1a824fa4 100644 --- a/src/core/nm-policy.c +++ b/src/core/nm-policy.c @@ -2153,19 +2153,14 @@ device_l3cd_changed(NMDevice *device, nm_dns_manager_begin_updates(priv->dns_manager, __func__); - /* We catch already all the IP events registering on the device state changes but - * the ones where the IP changes with a stable state (i.e., activated): - * ignore IP config changes but when the device is in activated state. - * Prevents unnecessary changes to DNS information. - * FIXME(l3cfg): check why ^^^ this is needed and implement it. Note that - * this function is not always called when the device becomes ACTIVATED. - * Previously, we would also update the DNS manager's IP config in - * device_state_change(ACTIVATED). There we would also special-case - * pseudo-VPNs like wireguard. I don't see the code where this is handled - * now. + /* FIXME(l3cfg): Note that this function is not always called when the + * device becomes ACTIVATED. Previously, we would also update the DNS + * manager's IP config in device_state_change(ACTIVATED). There we would + * also special-case pseudo-VPNs like wireguard. I don't see the code where + * this is handled now. */ state = nm_device_get_state(device); - if (l3cd_new && state > NM_DEVICE_STATE_IP_CONFIG && state < NM_DEVICE_STATE_DEACTIVATING) { + if (l3cd_new && state >= NM_DEVICE_STATE_IP_CONFIG && state < NM_DEVICE_STATE_DEACTIVATING) { nm_dns_manager_set_ip_config(priv->dns_manager, AF_UNSPEC, device, diff --git a/src/core/platform/tests/test-route.c b/src/core/platform/tests/test-route.c index 2d39cb37..85838267 100644 --- a/src/core/platform/tests/test-route.c +++ b/src/core/platform/tests/test-route.c @@ -1390,12 +1390,17 @@ again_table: rr->protocol = _rr_rand_choose_u8(nmtst_get_rand_uint32()); #define IPTOS_TOS_MASK 0x1E +#define INET_DSCP_MASK 0xFC again_tos: rr->tos = _rr_rand_choose_u8(nmtst_get_rand_uint32()); + if (rr->addr_family == AF_INET && rr->tos & ~IPTOS_TOS_MASK) goto again_tos; + if (rr->tos & ~INET_DSCP_MASK) + goto again_tos; + if (_rule_check_kernel_support(platform, FRA_IP_PROTO)) rr->ip_proto = _rr_rand_choose_u8(nmtst_get_rand_uint32()); diff --git a/src/core/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c index 5c2b7681..003a9806 100644 --- a/src/core/ppp/nm-ppp-manager.c +++ b/src/core/ppp/nm-ppp-manager.c @@ -545,7 +545,6 @@ impl_ppp_manager_set_ip4_config(NMDBusObject *obj, NM_IP_CONFIG_SOURCE_PPP); nm_l3_config_data_set_mtu(l3cd, mtu); - nm_l3_config_data_set_dns_priority(l3cd, AF_INET, 0); address = (NMPlatformIP4Address){ .plen = 32, @@ -661,7 +660,6 @@ impl_ppp_manager_set_ip6_config(NMDBusObject *obj, NM_IP_CONFIG_SOURCE_PPP); nm_l3_config_data_set_mtu(l3cd, mtu); - nm_l3_config_data_set_dns_priority(l3cd, AF_INET6, 0); address = (NMPlatformIP6Address){ .plen = 64, diff --git a/src/core/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c index a4e5cc4d..22c422a2 100644 --- a/src/core/supplicant/nm-supplicant-config.c +++ b/src/core/supplicant/nm-supplicant-config.c @@ -1088,6 +1088,14 @@ nm_supplicant_config_add_setting_wireless_security(NMSupplicantConfig error)) return FALSE; } + + /* In case the connection is saved as OWE / Enhanced Open, prevent + * unencrypted downgrade + */ + if (nm_streq(key_mgmt, "owe")) { + if (!nm_supplicant_config_add_option(self, "owe_only", "1", -1, NULL, error)) + return FALSE; + } } /* WEP keys if required */ diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c index e502ae85..e7ac0e58 100644 --- a/src/core/supplicant/nm-supplicant-interface.c +++ b/src/core/supplicant/nm-supplicant-interface.c @@ -21,6 +21,7 @@ #include "nm-supplicant-manager.h" #define DBUS_TIMEOUT_MSEC 20000 +#define PMK_LIFETIME_SEC (3600 * 24 * 7) /*****************************************************************************/ @@ -1249,6 +1250,7 @@ parse_capabilities(NMSupplicantInterface *self, GVariant *capabilities) break; } } + g_free(array); } priv->iface_capabilities = NM_SUPPL_CAP_MASK_SET(priv->iface_capabilities, @@ -2451,6 +2453,32 @@ assoc_set_ap_scan_cb(GVariant *ret, GError *error, gpointer user_data) add_network(self); } +static void +assoc_set_pmk_lifetime(GVariant *ret, GError *error, gpointer user_data) +{ + NMSupplicantInterface *self; + NMSupplicantInterfacePrivate *priv; + + if (nm_utils_error_is_cancelled(error)) + return; + + self = NM_SUPPLICANT_INTERFACE(user_data); + priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self); + + if (error) { + assoc_return(self, error, "failure to set PMK lifetime"); + return; + } + + _LOGT("assoc[" NM_HASH_OBFUSCATE_PTR_FMT "]: interface PMK lifetime set to %u", + NM_HASH_OBFUSCATE_PTR(priv->assoc_data), + PMK_LIFETIME_SEC); + + nm_assert(priv->assoc_data->calls_left > 0); + if (--priv->assoc_data->calls_left == 0) + add_network(self); +} + static gboolean assoc_fail_on_idle_cb(gpointer user_data) { @@ -2534,6 +2562,21 @@ nm_supplicant_interface_assoc(NMSupplicantInterface *self, assoc_set_ap_scan_cb, self); + /* Set the PMK lifetime to a longer interval (1 week) instead of + * the default one (12 hours) that would trigger a WPA-EAP + * reauthentication after only 8:24 hours (70% of the lifetime). */ + assoc_data->calls_left++; + nm_dbus_connection_call_set(priv->dbus_connection, + priv->name_owner->str, + priv->object_path->str, + NM_WPAS_DBUS_IFACE_INTERFACE, + "Dot11RSNAConfigPMKLifetime", + g_variant_new_take_string(g_strdup_printf("%u", PMK_LIFETIME_SEC)), + DBUS_TIMEOUT_MSEC, + assoc_data->cancellable, + assoc_set_pmk_lifetime, + self); + ap_isolation = nm_supplicant_config_get_ap_isolation(priv->assoc_data->cfg); if (!priv->ap_isolate_supported) { if (ap_isolation) { diff --git a/src/core/supplicant/nm-supplicant-settings-verify.c b/src/core/supplicant/nm-supplicant-settings-verify.c index 566173af..9881c552 100644 --- a/src/core/supplicant/nm-supplicant-settings-verify.c +++ b/src/core/supplicant/nm-supplicant-settings-verify.c @@ -92,6 +92,7 @@ static const struct Opt opt_table[] = { OPT_BYTES("mka_cak", 65536), OPT_BYTES("mka_ckn", 65536), OPT_BYTES("nai", 0), + OPT_INT("owe_only", 0, 1), OPT_BYTES("pac_file", 0), OPT_KEYWORD("pairwise", NM_MAKE_STRV("CCMP", "TKIP", "GCMP-256", "NONE", )), OPT_UTF8("password", 0), diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c index b18f47be..8476679b 100644 --- a/src/libnm-client-impl/nm-client.c +++ b/src/libnm-client-impl/nm-client.c @@ -531,7 +531,6 @@ _nm_client_dbus_call_simple(NMClient *self, nm_assert(object_path); nm_assert(interface_name); nm_assert(method_name); - nm_assert(parameters); nm_assert(reply_type); dbus_context = nm_g_main_context_push_thread_default_if_necessary(priv->dbus_context); @@ -592,20 +591,21 @@ _nm_client_dbus_call(NMClient *self, nm_assert(object_path); nm_assert(interface_name); nm_assert(method_name); - nm_assert(parameters); nm_assert(reply_type); task = nm_g_task_new(source_obj, cancellable, source_tag, user_callback, user_callback_data); if (!self) { - nm_g_variant_unref_floating(parameters); + if (parameters) + nm_g_variant_unref_floating(parameters); g_task_return_error(task, _nm_client_new_error_nm_not_cached()); return; } priv = NM_CLIENT_GET_PRIVATE(self); if (!priv->name_owner) { - nm_g_variant_unref_floating(parameters); + if (parameters) + nm_g_variant_unref_floating(parameters); g_task_return_error(task, _nm_client_new_error_nm_not_running()); return; } diff --git a/src/libnm-client-impl/nm-libnm-utils.c b/src/libnm-client-impl/nm-libnm-utils.c index 951db1bc..6a7c155e 100644 --- a/src/libnm-client-impl/nm-libnm-utils.c +++ b/src/libnm-client-impl/nm-libnm-utils.c @@ -99,14 +99,14 @@ _nml_dbus_log(NMLDBusLogLevel level, gboolean use_stdout, const char *fmt, ...) (long long) pid, prefix, ts / NM_UTILS_NSEC_PER_SEC, - (ts / (NM_UTILS_NSEC_PER_SEC / 10000)) % 10000, + (ts / (NM_UTILS_NSEC_PER_SEC / 100000)) % 100000, msg); } else { g_printerr("libnm-dbus[%lld]: %s[%" G_GINT64_FORMAT ".%05" G_GINT64_FORMAT "] %s\n", (long long) pid, prefix, ts / NM_UTILS_NSEC_PER_SEC, - (ts / (NM_UTILS_NSEC_PER_SEC / 10000)) % 10000, + (ts / (NM_UTILS_NSEC_PER_SEC / 100000)) % 100000, msg); } } diff --git a/src/libnm-core-impl/nm-setting-wireless.c b/src/libnm-core-impl/nm-setting-wireless.c index 8f57f69b..68cc0e13 100644 --- a/src/libnm-core-impl/nm-setting-wireless.c +++ b/src/libnm-core-impl/nm-setting-wireless.c @@ -141,6 +141,10 @@ nm_setting_wireless_ap_security_compatible(NMSettingWireless *s_wireless g_return_val_if_fail(NM_IS_SETTING_WIRELESS(s_wireless), FALSE); if (!s_wireless_sec) { + /* A OWE-TM network can be used w/o security */ + if (ap_wpa == NM_802_11_AP_SEC_KEY_MGMT_OWE_TM + || (ap_rsn == NM_802_11_AP_SEC_KEY_MGMT_OWE_TM)) + return TRUE; if ((ap_flags & NM_802_11_AP_FLAGS_PRIVACY) || (ap_wpa != NM_802_11_AP_SEC_NONE) || (ap_rsn != NM_802_11_AP_SEC_NONE)) return FALSE; diff --git a/src/libnm-core-impl/tests/certs/test-aes-128-ec-key.pem b/src/libnm-core-impl/tests/certs/test-aes-128-ec-key.pem new file mode 100644 index 00000000..86989642 --- /dev/null +++ b/src/libnm-core-impl/tests/certs/test-aes-128-ec-key.pem @@ -0,0 +1,8 @@ +-----BEGIN EC PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: AES-128-CBC,D6E024FACA9CFFE6B0296EBC848BC80C + +vOzvGfSmNKRGMxIlB474A3ZHYqNj0NEuJQxEYV2roY+kAWN4+zdk7I+dbGRbjlgz +lS0NBIrTEmyPugYEWnaccxKfTTJz5U1OxT/AZVVmJuD/5lh2H2qZUkFs6d10X5zd +0gsn6OwV+2j9rrWyEcgH8WOwqgiN+LaWihLhGMKaWI0= +-----END EC PRIVATE KEY----- diff --git a/src/libnm-core-impl/tests/certs/test-aes-256-ec-key.pem b/src/libnm-core-impl/tests/certs/test-aes-256-ec-key.pem new file mode 100644 index 00000000..1baf51d3 --- /dev/null +++ b/src/libnm-core-impl/tests/certs/test-aes-256-ec-key.pem @@ -0,0 +1,8 @@ +-----BEGIN EC PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: AES-256-CBC,8337BC213C3280DC1884C61562719552 + +Kcdf9l8gAMkN1fb0PGpFRD1VQIGQbB55yCBLMwRBbG1XQ9rVjnP+Zl0CdDzncKXt +yLFpAAgNUahsaVJyc8/suKl8pj2VfJK8m0NUIrWWQu/KyaFTS6I30hwLJ0WATBMm +GMb2CiAqlk6U+EqtZxNmgf6SCEGUV/oTCF0AqNFKiXM= +-----END EC PRIVATE KEY----- diff --git a/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.der b/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.der new file mode 100644 index 00000000..e8d0765a Binary files /dev/null and b/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.der differ diff --git a/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.pem b/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.pem new file mode 100644 index 00000000..c40e293b --- /dev/null +++ b/src/libnm-core-impl/tests/certs/test-ec-key-only-decrypted.pem @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIPw/e9RgNcs2cMrKn+KnxNCGC1UrcOH9S0xm5e1GxJqRoAoGCCqGSM49 +AwEHoUQDQgAEbA5LlfyjMwuyuIcBr+fk1l71EKC6NttJCGjXGexUOTGsjhVgXHjT +cc2EohzF94Zs4EjYce3aQe4YsA11YMuRaQ== +-----END EC PRIVATE KEY----- diff --git a/src/libnm-core-impl/tests/test-crypto.c b/src/libnm-core-impl/tests/test-crypto.c index 896c3c2e..fb4c213f 100644 --- a/src/libnm-core-impl/tests/test-crypto.c +++ b/src/libnm-core-impl/tests/test-crypto.c @@ -111,7 +111,7 @@ test_load_private_key(const char *path, array = nmtst_crypto_decrypt_openssl_private_key(path, password, &key_type, &error); /* Even if the password is wrong, we should determine the key type */ - g_assert_cmpint(key_type, ==, NM_CRYPTO_KEY_TYPE_RSA); + g_assert_cmpint(key_type, !=, NM_CRYPTO_KEY_TYPE_UNKNOWN); if (expected_error != -1) { g_assert(array == NULL); @@ -226,7 +226,7 @@ test_encrypt_private_key(const char *path, const char *password) array = nmtst_crypto_decrypt_openssl_private_key(path, password, &key_type, &error); nmtst_assert_success(array, error); - g_assert_cmpint(key_type, ==, NM_CRYPTO_KEY_TYPE_RSA); + g_assert_cmpint(key_type, !=, NM_CRYPTO_KEY_TYPE_UNKNOWN); /* Now re-encrypt the private key */ encrypted = nmtst_crypto_rsa_key_encrypt(g_bytes_get_data(array, NULL), @@ -244,7 +244,7 @@ test_encrypt_private_key(const char *path, const char *password) &key_type, &error); nmtst_assert_success(re_decrypted, error); - g_assert_cmpint(key_type, ==, NM_CRYPTO_KEY_TYPE_RSA); + g_assert_cmpint(key_type, !=, NM_CRYPTO_KEY_TYPE_UNKNOWN); /* Compare the original decrypted key with the re-decrypted key */ g_assert(g_bytes_equal(array, re_decrypted)); @@ -452,12 +452,21 @@ main(int argc, char **argv) g_test_add_data_func("/libnm/crypto/key/aes-128", "test-aes-128-key.pem, test-aes-password", test_key); + g_test_add_data_func("/libnm/crypto/key/aes-128-ec", + "test-aes-128-ec-key.pem, test-aes-password", + test_key); g_test_add_data_func("/libnm/crypto/key/aes-256", "test-aes-256-key.pem, test-aes-password", test_key); + g_test_add_data_func("/libnm/crypto/key/aes-256-ec", + "test-aes-256-ec-key.pem, test-aes-password", + test_key); g_test_add_data_func("/libnm/crypto/key/decrypted", "test-key-only-decrypted.pem", test_key_decrypted); + g_test_add_data_func("/libnm/crypto/key/decrypted-ec", + "test-ec-key-only-decrypted.pem", + test_key_decrypted); g_test_add_data_func("/libnm/crypto/PKCS#12/1", "test-cert.p12, test", test_pkcs12); g_test_add_data_func("/libnm/crypto/PKCS#12/2", "test2-cert.p12, 12345testing", test_pkcs12); diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h index fc66382e..dc226441 100644 --- a/src/libnm-core-public/nm-version-macros.h +++ b/src/libnm-core-public/nm-version-macros.h @@ -30,7 +30,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (2) +#define NM_MICRO_VERSION (4) /** * NM_CHECK_VERSION: diff --git a/src/libnm-crypto/nm-crypto.c b/src/libnm-crypto/nm-crypto.c index 69d2b53f..8cf66336 100644 --- a/src/libnm-crypto/nm-crypto.c +++ b/src/libnm-crypto/nm-crypto.c @@ -25,6 +25,9 @@ #define PEM_DSA_KEY_BEGIN "-----BEGIN DSA PRIVATE KEY-----" #define PEM_DSA_KEY_END "-----END DSA PRIVATE KEY-----" +#define PEM_EC_KEY_BEGIN "-----BEGIN EC PRIVATE KEY-----" +#define PEM_EC_KEY_END "-----END EC PRIVATE KEY-----" + #define PEM_CERT_BEGIN "-----BEGIN CERTIFICATE-----" #define PEM_CERT_END "-----END CERTIFICATE-----" @@ -201,6 +204,10 @@ parse_old_openssl_key_file(const guint8 *data, key_type = NM_CRYPTO_KEY_TYPE_DSA; start_tag = PEM_DSA_KEY_BEGIN; end_tag = PEM_DSA_KEY_END; + } else if (find_tag(PEM_EC_KEY_BEGIN, data, data_len, 0, &start)) { + key_type = NM_CRYPTO_KEY_TYPE_EC; + start_tag = PEM_EC_KEY_BEGIN; + end_tag = PEM_EC_KEY_END; } else { g_set_error(error, _NM_CRYPTO_ERROR, diff --git a/src/libnm-crypto/nm-crypto.h b/src/libnm-crypto/nm-crypto.h index 48c7c6b7..289549c6 100644 --- a/src/libnm-crypto/nm-crypto.h +++ b/src/libnm-crypto/nm-crypto.h @@ -29,7 +29,8 @@ const NMCryptoCipherInfo *nm_crypto_cipher_get_info_by_name(const char *cipher_n typedef enum { NM_CRYPTO_KEY_TYPE_UNKNOWN = 0, NM_CRYPTO_KEY_TYPE_RSA, - NM_CRYPTO_KEY_TYPE_DSA + NM_CRYPTO_KEY_TYPE_DSA, + NM_CRYPTO_KEY_TYPE_EC, } NMCryptoKeyType; typedef enum { diff --git a/src/libnm-glib-aux/nm-hash-utils.c b/src/libnm-glib-aux/nm-hash-utils.c index 68b33998..941aba01 100644 --- a/src/libnm-glib-aux/nm-hash-utils.c +++ b/src/libnm-glib-aux/nm-hash-utils.c @@ -45,7 +45,7 @@ again: guint8 _extra_entropy[3 * HASH_KEY_SIZE]; } t_arr; - nm_utils_random_bytes(&t_arr, sizeof(t_arr)); + nm_random_get_bytes(&t_arr, sizeof(t_arr)); /* We only initialize one random hash key. So we can spend some effort * of getting this right. For one, we collect more random bytes than diff --git a/src/libnm-glib-aux/nm-random-utils.c b/src/libnm-glib-aux/nm-random-utils.c index 3a8ba64f..93eee7c4 100644 --- a/src/libnm-glib-aux/nm-random-utils.c +++ b/src/libnm-glib-aux/nm-random-utils.c @@ -10,6 +10,7 @@ #include #include #include +#include #if USE_SYS_RANDOM_H #include @@ -34,18 +35,121 @@ #define GRND_INSECURE 0x04 #endif -#if !HAVE_GETRANDOM && defined(SYS_getrandom) -static int +#if !HAVE_GETRANDOM +static ssize_t getrandom(void *buf, size_t buflen, unsigned flags) { +#if defined(SYS_getrandom) return syscall(SYS_getrandom, buf, buflen, flags); +#else + errno = ENOSYS; + return -1; +#endif } -#undef HAVE_GETRANDOM -#define HAVE_GETRANDOM 1 #endif /*****************************************************************************/ +static ssize_t +_getrandom(void *buf, size_t buflen, unsigned flags) +{ + static int have_getrandom = TRUE; + ssize_t l; + int errsv; + + nm_assert(buflen > 0); + + /* This calls getrandom() and either returns the positive + * success or an negative errno. ENOSYS means getrandom() + * call is not supported. That result is cached and we don't retry. */ + + if (!have_getrandom) + return -ENOSYS; + + l = getrandom(buf, buflen, flags); + if (l > 0) + return l; + if (l == 0) + return -EIO; + errsv = errno; + if (errsv == ENOSYS) + have_getrandom = FALSE; + return -errsv; +} + +static ssize_t +_getrandom_insecure(void *buf, size_t buflen) +{ + static int have_grnd_insecure = TRUE; + ssize_t l; + + /* GRND_INSECURE was added recently. We catch EINVAL + * if kernel does not support the flag (and cache it). */ + + if (!have_grnd_insecure) + return -EINVAL; + + l = _getrandom(buf, buflen, GRND_INSECURE); + + if (l == -EINVAL) + have_grnd_insecure = FALSE; + + return l; +} + +static ssize_t +_getrandom_best_effort(void *buf, size_t buflen) +{ + ssize_t l; + + /* To get best-effort bytes, we would use GRND_INSECURE (and we try that + * first). However, not all kernel versions support that, so we fallback + * to GRND_NONBLOCK. + * + * Granted, this is called from a fallback path where we have no entropy + * already, it's unlikely that GRND_NONBLOCK would succeed. Still... */ + l = _getrandom_insecure(buf, buflen); + if (l != -EINVAL) + return l; + + return _getrandom(buf, buflen, GRND_NONBLOCK); +} + +static int +_random_check_entropy(gboolean block) +{ + static gboolean seen_high_quality = FALSE; + nm_auto_close int fd = -1; + int r; + + /* We come here because getrandom() gave ENOSYS. We will fallback to /dev/urandom, + * but the caller wants to know whether we have high quality numbers. Poll + * /dev/random to find out. */ + + if (seen_high_quality) { + /* We cache the positive result. Once kernel has entropy, we will get + * good random numbers. */ + return 1; + } + + fd = open("/dev/random", O_RDONLY | O_CLOEXEC | O_NOCTTY); + if (fd < 0) + return -errno; + + r = nm_utils_fd_wait_for_event(fd, POLLIN, block ? -1 : 0); + + if (r <= 0) { + nm_assert(r < 0 || !block); + return r; + } + + nm_assert(r == 1); + seen_high_quality = TRUE; + return 1; +} + +/*****************************************************************************/ + typedef struct _nm_packed { uintptr_t heap_ptr; uintptr_t stack_ptr; @@ -72,7 +176,8 @@ typedef struct _nm_packed { guint8 u8[NM_UTILS_CHECKSUM_LENGTH_SHA256 / 2]; guint32 u32[((NM_UTILS_CHECKSUM_LENGTH_SHA256 / 2) + 3) / 4]; } rand_vals; - GRand *rand; + guint8 rand_vals_getrandom[16]; + gint64 rand_vals_timestamp; } BadRandState; static void @@ -106,18 +211,7 @@ _bad_random_init_seed(BadRandSeed *seed) memcpy(&seed->auxval, p_at_random, 16); } -#if HAVE_GETRANDOM - { - ssize_t r; - - /* This is likely to fail, because we already failed a moment earlier. Still, give - * it a try. */ - r = getrandom(seed->getrandom_buf, - sizeof(seed->getrandom_buf), - GRND_INSECURE | GRND_NONBLOCK); - (void) r; - } -#endif + _getrandom_best_effort(seed->getrandom_buf, sizeof(seed->getrandom_buf)); seed->now_bootime = nm_utils_clock_gettime_nsec(CLOCK_BOOTTIME); seed->now_real = g_get_real_time(); @@ -168,6 +262,10 @@ _bad_random_bytes(guint8 *buf, gsize n) nm_utils_checksum_get_digest(sum, gl_state.sha_digest.full); } + _getrandom_best_effort(gl_state.rand_vals_getrandom, sizeof(gl_state.rand_vals_getrandom)); + + gl_state.rand_vals_timestamp = nm_utils_clock_gettime_nsec(CLOCK_BOOTTIME); + while (TRUE) { int i; @@ -197,103 +295,155 @@ _bad_random_bytes(guint8 *buf, gsize n) } } +/*****************************************************************************/ + /** - * nm_utils_random_bytes: + * nm_random_get_bytes_full: * @p: the buffer to fill * @n: the number of bytes to write to @p. + * @out_high_quality: (allow-none) (out): whether the returned + * random bytes are of high quality. * - * Uses getrandom() or reads /dev/urandom to fill the buffer - * with random data. If all fails, as last fallback it uses - * GRand to fill the buffer with pseudo random numbers. - * The function always succeeds in writing some random numbers - * to the buffer. The return value of FALSE indicates that the - * obtained bytes are probably not of good randomness. - * - * Returns: whether the written bytes are good. If you - * don't require good randomness, you can ignore the return - * value. - * - * Note that if calling getrandom() fails because there is not enough - * entropy (at early boot), the function will read /dev/urandom. - * Which of course, still has low entropy, and cause kernel to log - * a warning. + * - will never block + * - will always produce some numbers, but they may not + * be of high quality. + * - Whether they are of high quality, you can know via @out_high_quality. + * - will always try hard to produce high quality numbers, and on success + * they are as good as nm_random_get_crypto_bytes(). */ -gboolean -nm_utils_random_bytes(void *p, size_t n) +void +nm_random_get_bytes_full(void *p, size_t n, gboolean *out_high_quality) { int fd; int r; - gboolean has_high_quality = TRUE; - guint8 *buf = p; + gboolean has_high_quality; + ssize_t l; - g_return_val_if_fail(p, FALSE); - g_return_val_if_fail(n > 0, FALSE); + if (n == 0) { + NM_SET_OUT(out_high_quality, TRUE); + return; + } -#if HAVE_GETRANDOM - { - static gboolean have_syscall = TRUE; - - if (have_syscall) { - ssize_t r2; - int errsv; - - r2 = getrandom(buf, n, GRND_NONBLOCK); - if (r2 >= 0) { - if ((size_t) r2 == n) - return TRUE; - - /* no or partial read. There is not enough entropy. - * Fill the rest reading with the fallback code and remember - * that some bits are not high quality. */ - nm_assert((size_t) r2 < n); - buf += r2; - n -= r2; - - /* At this point, we don't want to read /dev/urandom, because - * the entropy pool is low (early boot?), and asking for more - * entropy causes kernel messages to be logged. - * - * Note that we fall back to _bad_random_bytes(), which (among others) seeds - * itself with g_rand_new(). That also will read /dev/urandom, but as - * we do that only once, we don't care. But in general, we are here in - * a situation where we want to avoid reading /dev/urandom too much. */ - goto out_bad_random; - } - errsv = errno; - if (errsv == ENOSYS) { - /* no support for getrandom(). We don't know whether - * we /dev/urandom will give us good quality. Assume yes. */ - have_syscall = FALSE; - } else if (errsv == EAGAIN) { - /* No entropy. We avoid reading /dev/urandom. */ - goto out_bad_random; - } else { - /* Unknown error, likely no entropy. We'll read /dev/urandom below, but we don't - * have high-quality randomness. */ - has_high_quality = FALSE; + g_return_if_fail(p); + +again_getrandom: + l = _getrandom(p, n, GRND_NONBLOCK); + if (l > 0) { + if ((size_t) l == n) { + NM_SET_OUT(out_high_quality, TRUE); + return; + } + p = ((uint8_t *) p) + l; + n -= l; + goto again_getrandom; + } + + /* getrandom() failed. Fallback to read /dev/urandom. */ + + if (l == -ENOSYS) { + /* no support for getrandom(). */ + if (out_high_quality) { + /* The caller wants to know whether we have high quality. Poll /dev/random + * to find out. */ + has_high_quality = (_random_check_entropy(FALSE) > 0); + } else { + /* The value doesn't matter in this case. It will be unused. */ + has_high_quality = FALSE; + } + } else { + /* Any other failure of getrandom() means we don't have high quality. */ + has_high_quality = FALSE; + if (l == -EAGAIN) { + /* getrandom(GRND_NONBLOCK) failed because lack of entropy. Retry with GRND_INSECURE. */ + for (;;) { + l = _getrandom_insecure(p, n); + if (l > 0) { + if ((size_t) l == n) { + NM_SET_OUT(out_high_quality, FALSE); + return; + } + p = ((uint8_t *) p) + l; + n -= l; + continue; + } + /* Any error. Fallback to /dev/urandom. */ + break; } } } -#endif -fd_open: +again_open: fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC | O_NOCTTY); if (fd < 0) { if (errno == EINTR) - goto fd_open; - goto out_bad_random; + goto again_open; + } else { + r = nm_utils_fd_read_loop_exact(fd, p, n, TRUE); + nm_close(fd); + if (r >= 0) { + NM_SET_OUT(out_high_quality, has_high_quality); + return; + } } - r = nm_utils_fd_read_loop_exact(fd, buf, n, TRUE); - nm_close(fd); - if (r >= 0) - return has_high_quality; -out_bad_random: /* we failed to fill the bytes reading from /dev/urandom. - * Fill the bits using our pseudo random numbers. - * - * We don't have good quality. + * Fill the bits using our fallback approach (which obviously + * cannot give high quality random). */ - _bad_random_bytes(buf, n); - return FALSE; + _bad_random_bytes(p, n); + NM_SET_OUT(out_high_quality, FALSE); +} + +/*****************************************************************************/ + +/** + * nm_random_get_crypto_bytes: + * @p: the buffer to fill + * @n: the number of bytes to fill + * + * - can fail (in which case a negative number is returned + * and the output buffer is undefined). + * - will block trying to get high quality random numbers. + */ +int +nm_random_get_crypto_bytes(void *p, size_t n) +{ + nm_auto_close int fd = -1; + ssize_t l; + int r; + + if (n == 0) + return 0; + + nm_assert(p); + +again_getrandom: + l = _getrandom(p, n, 0); + if (l > 0) { + if ((size_t) l == n) + return 0; + p = (uint8_t *) p + l; + n -= l; + goto again_getrandom; + } + + if (l != -ENOSYS) { + /* We got a failure, but getrandom seems to be working in principle. We + * won't get good numbers. Fail. */ + return l; + } + + /* getrandom() failed with ENOSYS. Fallback to reading /dev/urandom. */ + + r = _random_check_entropy(TRUE); + if (r < 0) + return r; + if (r == 0) + return nm_assert_unreachable_val(-EIO); + + fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC | O_NOCTTY); + if (fd < 0) + return -errno; + + return nm_utils_fd_read_loop_exact(fd, p, n, FALSE); } diff --git a/src/libnm-glib-aux/nm-random-utils.h b/src/libnm-glib-aux/nm-random-utils.h index d0eae103..ab8aee1b 100644 --- a/src/libnm-glib-aux/nm-random-utils.h +++ b/src/libnm-glib-aux/nm-random-utils.h @@ -6,6 +6,14 @@ #ifndef __NM_RANDOM_UTILS_H__ #define __NM_RANDOM_UTILS_H__ -gboolean nm_utils_random_bytes(void *p, size_t n); +void nm_random_get_bytes_full(void *p, size_t n, gboolean *out_high_quality); + +static inline void +nm_random_get_bytes(void *p, size_t n) +{ + nm_random_get_bytes_full(p, n, NULL); +} + +int nm_random_get_crypto_bytes(void *p, size_t n); #endif /* __NM_RANDOM_UTILS_H__ */ diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c index e6ee04d7..f770b96d 100644 --- a/src/libnm-glib-aux/nm-shared-utils.c +++ b/src/libnm-glib-aux/nm-shared-utils.c @@ -3347,6 +3347,8 @@ nm_utils_fd_wait_for_event(int fd, int event, gint64 timeout_nsec) struct timespec ts, *pts; int r; + nm_assert(fd >= 0); + if (timeout_nsec < 0) pts = NULL; else { @@ -3360,6 +3362,13 @@ nm_utils_fd_wait_for_event(int fd, int event, gint64 timeout_nsec) return -NM_ERRNO_NATIVE(errno); if (r == 0) return 0; + + nm_assert(r == 1); + nm_assert(pollfd.revents > 0); + + if (pollfd.revents & POLLNVAL) + return nm_assert_unreachable_val(-EBADF); + return pollfd.revents; } diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h index 52cf1d4c..0589eeac 100644 --- a/src/libnm-glib-aux/nm-shared-utils.h +++ b/src/libnm-glib-aux/nm-shared-utils.h @@ -623,6 +623,16 @@ nm_utils_is_separator(const char c) /*****************************************************************************/ +static inline GBytes * +nm_g_bytes_ref(GBytes *b) +{ + if (b) + g_bytes_ref(b); + return b; +} + +/*****************************************************************************/ + GBytes *nm_g_bytes_get_empty(void); GBytes *nm_g_bytes_new_from_str(const char *str); @@ -2311,6 +2321,25 @@ nm_g_hash_table_contains(GHashTable *hash, gconstpointer key) return hash ? g_hash_table_contains(hash, key) : FALSE; } +#define nm_g_hash_table_contains_any(hash, ...) \ + ({ \ + GHashTable *const _hash = (hash); \ + gconstpointer const _keys[] = {__VA_ARGS__}; \ + int _i_key; \ + gboolean _contains = FALSE; \ + \ + if (_hash) { \ + for (_i_key = 0; _i_key < (int) G_N_ELEMENTS(_keys); _i_key++) { \ + if (g_hash_table_contains(_hash, _keys[_i_key])) { \ + _contains = TRUE; \ + break; \ + } \ + } \ + } \ + \ + _contains; \ + }) + static inline gboolean nm_g_hash_table_remove(GHashTable *hash, gconstpointer key) { diff --git a/src/libnm-glib-aux/nm-uuid.c b/src/libnm-glib-aux/nm-uuid.c index ff0649d0..464bbf58 100644 --- a/src/libnm-glib-aux/nm-uuid.c +++ b/src/libnm-glib-aux/nm-uuid.c @@ -115,12 +115,12 @@ nm_uuid_generate_random(NMUuid *out_uuid) /* See also, systemd's id128_make_v4_uuid() */ - /* nm_utils_random_bytes() is supposed to try hard to give good + /* nm_random_get_bytes() is supposed to try hard to give good * randomness. If it fails, it still makes an effort to fill * random data into the buffer. There is not much we can do about * that case, except making sure that it does not happen in the * first place. */ - nm_utils_random_bytes(out_uuid, sizeof(*out_uuid)); + nm_random_get_bytes(out_uuid, sizeof(*out_uuid)); /* Set the four most significant bits (bits 12 through 15) of the * time_hi_and_version field to the 4-bit version number from diff --git a/src/libnm-glib-aux/tests/test-shared-general.c b/src/libnm-glib-aux/tests/test-shared-general.c index e7fd2b6b..9acd535d 100644 --- a/src/libnm-glib-aux/tests/test-shared-general.c +++ b/src/libnm-glib-aux/tests/test-shared-general.c @@ -93,7 +93,7 @@ test_nmhash(void) { int rnd; - nm_utils_random_bytes(&rnd, sizeof(rnd)); + nm_random_get_bytes(&rnd, sizeof(rnd)); g_assert(nm_hash_val(555, 4) != 0); } diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c index 6fce9de7..be51731f 100644 --- a/src/nmcli/devices.c +++ b/src/nmcli/devices.c @@ -1343,9 +1343,10 @@ fill_output_access_point(NMAccessPoint *ap, const APInfo *info) if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) { g_string_append(security_str, "WPA3 "); } - if (NM_FLAGS_ANY(rsn_flags, - NM_802_11_AP_SEC_KEY_MGMT_OWE | NM_802_11_AP_SEC_KEY_MGMT_OWE_TM)) { + if (NM_FLAGS_ANY(rsn_flags, NM_802_11_AP_SEC_KEY_MGMT_OWE)) { g_string_append(security_str, "OWE "); + } else if (NM_FLAGS_ANY(rsn_flags, NM_802_11_AP_SEC_KEY_MGMT_OWE_TM)) { + g_string_append(security_str, "OWE-TM "); } if ((wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) { diff --git a/src/nmcli/nmcli-completion b/src/nmcli/nmcli-completion index 83ec1e3c..f2de7b67 100644 --- a/src/nmcli/nmcli-completion +++ b/src/nmcli/nmcli-completion @@ -84,7 +84,7 @@ _nmcli() # no quotes in front, escaping _everything_ # [ ]bla'bla"bla\bla bla --> [ ]bla\'bla\"bla\\bla\ bla entry="${entry//\\/\\\\}" - entry="${entry//\'/\'}" + entry="${entry//\'/\\\'}" entry="${entry//\"/\\\"}" entry="${entry// /\\ }" entry="${entry//\(/\\(}" -- cgit 1.3.0-6-gf8a5