[meego-commits] 5695: Changes to Trunk:Testing/connman
Anas Nashif
nashif at linux.intel.com
Wed Jul 14 22:41:24 UTC 2010
On 2010-07-14, at 5:26 AM, Martin Xu wrote:
> Hi,
> I have made the following changes to connman in project Trunk:Testing. Please review and accept ASAP.
>
> Thank You,
> Martin Xu
>
> [This message was auto-generated]
>
> ---
>
> Request #5695:
>
> submit: home:martin:branches:Trunk:Testing/connman(r2)(cleanup) -> Trunk:Testing/connman
>
>
> Message:
> None
>
> State: new 2010-07-13T21:21:09 martin
> Comment: None
>
>
>
> changes files:
> --------------
> --- connman.changes
> +++ connman.changes
> @@ -0,0 +1,4 @@
> +* Wed Jul 14 2010 Martin Xu <martin.xu at intel.com> - 0.54.2
> +- upgrade to 0.54.2
> +- to fix BMC #3787
> +
>
> old:
> ----
> connman-0.54.tar.bz2
>
> new:
> ----
> connman-0.54.2.tar.bz2
>
> spec files:
> -----------
> --- connman.spec
> +++ connman.spec
> @@ -1,13 +1,13 @@
> #
> # Do not Edit! Generated by:
> -# spectacle version 0.17
> +# spectacle version 0.15
> #
> # >> macros
> # << macros
>
> Name: connman
> Summary: Connection Manager
> -Version: 0.54
> +Version: 0.54.2
> Release: 1
> Group: System/Networking
> License: GPLv2
> @@ -28,7 +28,6 @@
> BuildRequires: dhclient
> BuildRequires: openconnect
>
> -
> %description
> Connection Manager provides a daemon for managing Internet connections
> within embedded devices running the Linux operating system.
>
> other changes:
> --------------
>
Those changes to the ChangeLog are wrong for sure, why are you removing all the changes up to 0.54?
Do we need this fix for 1.0 as well? Since we have 0.54 there as well.
> ++++++ connman-0.54.tar.bz2 -> connman-0.54.2.tar.bz2
> --- ChangeLog
> +++ ChangeLog
> @@ -1,417 +1,31 @@
> -ver 0.54:
> - Fix issue with root requests and EDNS0 OPT records.
> - Fix issue with default gateway when route deletion fails.
> - Fix issue with group identifiers for cellular networks.
> - Fix issue with fixed IP settings from cellular networks.
> - Fix issue with nameserver settings and manual configuration.
> - Add support for cellular network name changes.
> - Add support for cellular signal strength changes.
> - Add support for actively scanning for hidden networks.
> - Add support for ASCII based WEP keys.
> - Add support for NTP timeserver updates.
> - Add support for PPP default route settings.
> +ver 0.54.1:
> + ConnMan 0.54 code merge
>
> -ver 0.53:
> - Fix issue with supplicant and device scanning state cleaning.
> - Fix issue with Bluetooth PAN networks stay in connected state.
> - Fix issue with reference counting and connected state.
> - Fix issue with technology disabling on device removal.
> - Fix issue with two default gateways when using VPN.
> - Fix issue with static IPv4 configuration and signals.
> - Add support for splitting DHCP provided nameserver results.
> - Add support multiple nameservers in /etc/resolv.conf.
> - Add support for setting manual DNS server configuration.
> - Add support for exporting IPv4 gateway information.
> - Add support for newer versions of oFono API.
> +ver 0.52.1:
> + Remove supplicant and device scanning state cleaning
> + ofono API refactoring: Rename netreg Operator property to Name
> + ConnMan 0.52 code merge
> +
> +ver 0.50.4:
> + Remove erroneous DHCP method setting from bluetooth plugin
> + Load ipconfig setting from __connman_service_create_ipconfig()
> + Reset ipconfig index
> + Add __connman_ipconfig_set_index() helper
> + Reference PAN network before disconnecting
> + Reset connman_network device pointer when it is no longer referenced
> + Do not set network index from PAN disconnect reply
> + ONLINE and LOGIN are also "connected" states
> + Use psk for building hidden WPA SSID group
> +
> +ver 0.50.3:
> + Enable/Disable device when toggling the powered state
> + Use udev_device_get_devtype before __connman_inet_get_device_type
> + Set network->device as NULL when the device is removed
> +
> +ver 0.50.2:
> + Handle the case that MobileNetworkCodeLength is not provided.
> + Correct the modem properties key name.
> + Fix convert_wifi_security for psk string.
>
> -ver 0.52:
> - Fix issue with new "connected" states.
> - Fix issue with hidden networks and PSK.
> - Fix issue with DHCP and Bluetooth PAN.
> - Fix issue when disconnecting PAN networks.
> - Add support for application sessions.
> - Add plugin for hh2serial GPS support.
> -
> -ver 0.51:
> - Fix issue with missing device power toggling.
> - Fix issue with D-Bus object path on device removal.
> - Add support for WiFi portal detection.
> - Add support for configuring static gateways.
> - Remove unneeded plugin for Option HSO support.
> - Remove unneeded plugin for Ericsson MBM support.
> -
> -ver 0.50:
> - Fix configuration loading for unknown services.
> - Fix IP method setting of Ethernet plugin.
> -
> -ver 0.49:
> - Fix issue with WiFi power changes.
> - Fix issue with Bluetooth device startup.
> - Fix issue with host route settings for VPN.
> - Fix issue with processing of RFKILL events.
> - Fix some WPA Enterprise privacy issues.
> - Add support for basic Ethernet information.
> - Add support for static IP settings.
> -
> -ver 0.48:
> - Fix signal strength calculation when quality is not provided.
> - Fix issues with wpa_supplicant state tracking.
> - Fix faulty removal of IP address from interface.
> - Fix permissions of newly created /etc/resolv.conf file.
> - Fix DNS proxy handling when in offline mode.
> - Add support for EDNS0 resolver option.
> - Add workaround for large EDNS0 queries.
> - Add workaround for DHCP startup failures with WiFi networks.
> - Add support for handling hostnames and domainnames.
> - Add support for IPv4 configuration via service interface.
> - Add support for fixed and manual IPv4 configuration.
> - Add support for default service changed notifier.
> - Add support for clearing failure state via service removal.
> - Add support for OpenConnect VPN connections.
> - Add support for IEEE 802.1x WiFi networks.
> - Add support for roaming between WPA and WPA2 networks.
> - Add various generic D-Bus helpers and use them.
> - Remove special handling of Ethernet devices.
> -
> -ver 0.47:
> - Fix segmentation fault on resolver shutdown.
> - Fix issue with adding nameserver that doesn't exist.
> - Fix issue when no broadcast address is given.
> - Fix issue with missing property changed signal.
> - Add checks for invalid supplicant state transitions.
> - Add initial version of oFono GPRS support.
> - Add support for dynamic debug framework.
> -
> -ver 0.46:
> - Fix reconnect issue when power off or disabling the device.
> - Remove problematic retry on failure code path.
> -
> -ver 0.45:
> - Fix crash with connect timeout and second connect attempt.
> - Fix reconnect issues after suspend or roaming attempt.
> -
> -ver 0.44:
> - Fix command line options for device filtering.
> - Fix issue with network reference in MBM support.
> - Fix handling when losing network access in MBM plugin.
> - Fix broken libiWmxSDK callback parameter handling.
> - Add work around Intel WiMAX SDK API breakage.
> -
> -ver 0.43:
> - Fix issue with missing scanning after power up.
> - Fix issue with udev versus /dev/rfkill event processing.
> - Fix issue with powered down device on connection attempt.
> - Add support for multiple connection attempts.
> - Add support for tracking the operation state.
> - Add full support for Ericsson MBM cellular devices.
> -
> -ver 0.42:
> - Fix issue with switching between hidden WiFi networks.
> - Fix issue with missing scanning after disconnect.
> - Fix issue with not triggering auto-connect in some cases.
> -
> -ver 0.41:
> - Fix race condition with WiFi devices and RFKILL.
> - Fix issue with WiFi connect/disconnect and some drivers.
> - Fix issue with WEP encryption and staging drivers.
> - Fix issue with wrong setup of loopback interfaces.
> -
> -ver 0.40:
> - Fix issue with wrong setting of initial AutoConnect value.
> - Fix issue with IP configuration and loopback devices.
> - Fix issue with build system and include directory.
> - Fix wrong variable for dhclient-script location.
> - Fix disconnect race condition with Bluetooth service.
> - Add support for ignoring bonding Ethernet interfaces.
> -
> -ver 0.39:
> - Fix file permissions for profile storage.
> - Fix service resorting when they are in different states.
> - Fix support for handling Bluetooth PAN devices.
> - Add support for AutoConnect property of services.
> - Add support for creating, modifying and removing profiles.
> - Add support for fully flexible task handling framework.
> - Add support for more generic RTNL handling and notifications.
> - Add support for full non-recursive build.
> -
> -ver 0.38:
> - Fix broken check for security modes.
> - Fix requirement of inotify when loopback support is disabled.
> -
> -ver 0.37:
> - Fix missing update of signal strength from scan results.
> - Fix error handling in case when passphrase is required.
> - Add support for PassphraseRequired property.
> - Add missing check for WiFi security modes.
> -
> -ver 0.36:
> - Fix missing reset of network reference when disconnecting.
> - Fix wrong variable reference when sending technology replies.
> - Fix wrong identifiers of D-Bus error names.
> -
> -ver 0.35:
> - Fix missing auto-connect trigger on Ethernet device removal.
> - Fix availability listing for devices without attached drivers.
> - Fix signals for connected and default technologies.
> - Fix notification to use service types instead of device types.
> - Fix potential pending scan result reply messages after removal.
> - Add support for blocking enable and disable technology changes.
> -
> -ver 0.34:
> - Fix setup of udev context before loading any plugins.
> - Fix rearming the scan trigger if a device got disabled.
> - Fix device power state changes tracking with RFKILL notifications.
> - Fix wrong usage of device types instead of service types.
> - Fix connect method to handle non-WiFi services.
> -
> -ver 0.33:
> - Add support for RFKILL changes of the WiFi subsystem.
> - Fix state value of Network Manager compatibility support.
> -
> -ver 0.32:
> - Fix broken device unregistration on removal.
> - Fix WiMAX device detection handling.
> -
> -ver 0.31:
> - Fix missing enforcement of offline mode for new devices.
> - Add support for persistent storage of offline mode.
> - Add support for persistent storage of device power state.
> - Remove deprecated and unused network storage callbacks.
> -
> -ver 0.30:
> - Fix issue where hidden network could show up in service list.
> - Fix issue with asynchronous notification of scan requests.
> - Fix message reference leak when adding interface fails.
> - Fix problem when removing network during inactive state.
> - Remove broken and unused callback for joining networks.
> - Remove deprecated device and network interface methods.
> - Remove test scripts for deprecated interface methods.
> -
> -ver 0.29:
> - Fix missing signal emission for offline mode changes.
> - Fix signal emission for changes in technology properties.
> - Rename Technologies property to AvailableTechnologies.
> -
> -ver 0.28:
> - Fix another reference counting imbalance when adding networks.
> - Revert supplicant change to always reset scanning after results.
> -
> -ver 0.27:
> - Fix missing disarming of the connection timeout.
> - Fix handling of multiple supplicant disconnect attempts.
> - Fix simultaneous connects from different technologies limitation.
> -
> -ver 0.26:
> - Fix broken handling of auto-connect logic.
> - Fix handling of out-of-range access points.
> - Fix support for connecting to hidden networks.
> - Fix reference counting for networks with same SSID.
> - Fix issue with WiFi interfaces not getting switched off.
> - Fix problems with delayed service list updates.
> - Fix disconnect/abort of connection attempts.
> -
> -ver 0.25:
> - Fix showing of WiFi networks with less than 25% signal strength.
> - Fix potential segmentation fault with network passphrases.
> -
> -ver 0.24:
> - Fix handling of initial device powered state.
> - Fix missing Powered property changed signals.
> - Fix canceling of a network connection attempt.
> - Fix stalled configuration issue with supplicant.
> - Fix detection of association errors from supplicant.
> - Fix issue with wrong scanning state information.
> - Fix hidden SSID detection routines.
> - Fix visible Ethernet services even without carrier.
> - Add global method call to request scanning.
> - Add support for global technologies list.
> - Add support for delaying service list updates.
> - Update the overall D-Bus API documentation.
> -
> -ver 0.23:
> - Fix dhclient probe/remove race condition.
> - Fix handling of disconnected services during auto-connect.
> - Add support for proper group name of hidden networks.
> - Add support for storing SSID details of hidden networks.
> -
> -ver 0.22:
> - Fix wrong auto-connect procedure after user connection.
> - Fix invalid update of already connected network.
> - Fix idle state handling after disconnecting device.
> - Fix disconnect race condition in WiFi supplicant.
> - Fix WiFi signal strength reporting.
> -
> -ver 0.21:
> - Add udev based network device detection.
> - Add support for global auto-connect feature.
> - Add support for basic service drag and drop.
> - Fix missing passphrase cleanup on service removal.
> - Fix potential duplicate network creation.
> - Fix handling of WEP shared keys.
> -
> -ver 0.20:
> - Add plugin for Intel WiMAX SDK support.
> - Add special handling for default vendor SSIDs.
> - Add support for default gateway in different network.
> - Add support for automatic switching of default gateway.
> - Add support for asynchronous handling of Powered property.
> - Add support for connecting/disconnecting Ethernet services.
> - Add support for more detailed error states of services.
> - Add support for clearing error state via ClearProperty.
> - Fix error code for invalid or unknown properties.
> - Fix various timeout handling issues.
> - Remove Policy and Priority device and network properties.
> -
> -ver 0.19:
> - Add hidden networks to the service list.
> - Add support for storing the service name.
> - Fix service list sorting for connected services.
> - Fix missing cancel command when operation times out.
> - Fix various issues with service favorite handling.
> - Remove Available and Remember network properties.
> -
> -ver 0.18:
> - Add support for asynchronous service connect method.
> - Fix broken storage of service favorite details.
> -
> -ver 0.17:
> - Add AT chat library implementation.
> - Fix service lookup for WiFi and WiMAX devices.
> - Fix service state signal emission and error handling.
> - Fix storing and loading of configured passphrases for services.
> -
> -ver 0.16:
> - Update Intel OSPM support to latest specification.
> - Add initial support for new service interface.
> - Add support for builtin plugins.
> - Add extra warning if no nameserver is defined.
> - Add error reporting for state and storage directory creation.
> - Add error message for network and device storing failures
> - Fix stale entry in gateway list after connection changes.
> - Fix handling of DHCP results with no nameserver.
> - Fix infinite loop for service lookup.
> - Fix various format string warnings.
> -
> -ver 0.15:
> - Detect VMware network interface and ignore them.
> - Fix setting of scan_ssid for hidden networks.
> - Fix empty network name property.
> -
> -ver 0.14:
> - Add support for detecting DHCP failures.
> - Add support for joining hidden WiFi networks.
> - Add support for device and network address property.
> - Add support for default /etc/resolv.conf generation.
> - Fix issue with wrong address setting for loopback.
> - Fix detection of WiFi access point changes.
> - Fix crash with blob properties.
> -
> -ver 0.13:
> - Add support for notification infrastructure.
> - Add fully dynamic property storage capabilities.
> - Fix broken loading of last network on bootup.
> - Fix crash when unplugging WiFi devices.
> - Rename OSPM plugin to Intel OSPM plugin.
> - Rename WiMAX plugin to Intel WiMAX SDK plugin.
> -
> -ver 0.12:
> - Fix connection state change handling.
> - Fix network list enumeration.
> - Fix broken driver matching for devices.
> - Fix issue with network identifier lookup.
> -
> -ver 0.11:
> - Add plugin priority handling.
> - Add network type for WiMAX.
> - Fix network protocol selection for Bluetooth PAN.
> - Fix parameters for Bluetooth PAN disconnect method.
> -
> -ver 0.10:
> - Fix races with connection signals.
> - Fix automatic switching of default connection.
> -
> -ver 0.9:
> - Rename FlightMode to OfflineMode.
> - Add static IPv4 setting support for Ethernet devices.
> - Add extra options to exclude devices and plugins.
> - Add support for toggling debug output.
> - Add support for ScanInterval property.
> - Fix handling of disconnect commands from applications.
> - Fix detection of networks that are out of range.
> - Fix setting network remember status.
> - Fix argument type checking of properties.
> -
> -ver 0.8:
> - Add Device and Network property to connection interface.
> - Add option to disable installation of data files.
> - Add command line option to show version number.
> - Fix signal emission for network changes.
> -
> -ver 0.7:
> - Add basic support for flight mode.
> - Add support for multiple storage drivers.
> - Add support for RTNL newlink watch API.
> - Add support for different security privileges.
> - Add support for device and network priorities.
> - Add functions for setting network properties.
> - Fix issue with listing devices without a driver.
> - Fix issue with WiFi scanning indication.
> - Fix detection of WiFi security changes.
> - Update WiFi driver to use new network helpers.
> - Install different D-Bus configuration for PolicyKit.
> -
> -ver 0.6:
> - Add CONNMAN_API_SUBJECT_TO_CHANGE definition.
> - Add detailed configuration options.
> - Add various D-Bus helper functions.
> - Add generic device driver infrastructure.
> - Add generic network driver infrastructure.
> - Add property for WiFi network mode.
> - Add property for network interface name.
> - Add property for global connection policy.
> - Add support for verbose compiler warnings.
> - Add support for device detection via udev.
> - Add support for systems with udhcpc.
> - Add support for Bluetooth PAN networks.
> - Fix WiFi issue with DHCP restart after handshake.
> - Fix exported symbols list creation.
> - Remove deprecated and unused plugins.
> -
> -ver 0.5:
> - Add support for handling Bluetooth adapters.
> - Add support for activating wpa_supplicant on demand.
> - Add Device property to network objects.
> - Add Scanning property to device objects.
> - Fix Name property of device objects.
> - Fix WiFi SSID to object path conversion.
> - Fix duplicate wireless scan results.
> - Fix built issue with libudev and uClibc.
> - Fix issues with element registration failures.
> -
> -ver 0.4:
> - Add DNS proxy resolver plugin.
> - Add support for default connections.
> - Add support for gateway change notifications.
> - Add signal strength property for connections.
> - Add property for connection type.
> - Fix issue with carrier detection.
> - Fix broken resolvconf plugin.
> -
> -ver 0.3:
> - Add support for automatically connecting known networks.
> - Add improved framework for handling resolver details.
> - Add generic signal strength property.
> - Fix bridge and WiMAX device detection.
> - Fix network listing for Ethernet devices.
> -
> -ver 0.2:
> - Add support for indicating network changes.
> - Add support for signal strength property.
> - Add support for unique device names.
> - Fix broken device enumeration.
> - Fix issue with device removal callback.
> - Fix issue with wpa_supplicant disconnecting.
> - Fix D-Bus access policy configuration.
> -
> -ver 0.1:
> - Initial public release.
> +ver 0.50.1:
> + Export MCC and MNC for cellular services.
> --- Makefile.in
> +++ Makefile.in
> @@ -1,4 +1,4 @@
> -# Makefile.in generated by automake 1.11.1 from Makefile.am.
> +# Makefile.in generated by automake 1.11 from Makefile.am.
> # @configure_input@
>
> # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
> @@ -643,6 +643,7 @@
> PACKAGE_NAME = @PACKAGE_NAME@
> PACKAGE_STRING = @PACKAGE_STRING@
> PACKAGE_TARNAME = @PACKAGE_TARNAME@
> +PACKAGE_URL = @PACKAGE_URL@
> PACKAGE_VERSION = @PACKAGE_VERSION@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> PKG_CONFIG = @PKG_CONFIG@
> @@ -2107,8 +2108,7 @@
> fi; \
> done
> -test -n "$(am__skip_mode_fix)" \
> - || find "$(distdir)" -type d ! -perm -755 \
> - -exec chmod u+rwx,go+rx {} \; -o \
> + || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
> ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
> ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
> ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
> @@ -2152,17 +2152,17 @@
> distcheck: dist
> case '$(DIST_ARCHIVES)' in \
> *.tar.gz*) \
> - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
> + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
> *.tar.bz2*) \
> - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
> + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
> *.tar.lzma*) \
> - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
> + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
> *.tar.xz*) \
> xz -dc $(distdir).tar.xz | $(am__untar) ;;\
> *.tar.Z*) \
> uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
> *.shar.gz*) \
> - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
> + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
> *.zip*) \
> unzip $(distdir).zip ;;\
> esac
> --- aclocal.m4
> +++ aclocal.m4
> @@ -1,4 +1,4 @@
> -# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
> +# generated automatically by aclocal 1.11 -*- Autoconf -*-
>
> # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
> # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
> @@ -13,8 +13,8 @@
>
> m4_ifndef([AC_AUTOCONF_VERSION],
> [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
> -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
> -[m4_warning([this file was generated for autoconf 2.63.
> +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
> +[m4_warning([this file was generated for autoconf 2.64.
> 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'.])])
> @@ -2485,13 +2485,10 @@
> # before this can be enabled.
> hardcode_into_libs=yes
>
> - # Add ABI-specific directories to the system library path.
> - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
> -
> # Append ld.so.conf contents to the search path
> if test -f /etc/ld.so.conf; then
> lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
> - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
> + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
> fi
>
> # We used to test for /lib/ld.so.1 and disable shared libraries on
> @@ -7862,15 +7859,15 @@
>
> # Generated from ltversion.in.
>
> -# serial 3017 ltversion.m4
> +# serial 3012 ltversion.m4
> # This file is part of GNU Libtool
>
> -m4_define([LT_PACKAGE_VERSION], [2.2.6b])
> -m4_define([LT_PACKAGE_REVISION], [1.3017])
> +m4_define([LT_PACKAGE_VERSION], [2.2.6])
> +m4_define([LT_PACKAGE_REVISION], [1.3012])
>
> AC_DEFUN([LTVERSION_VERSION],
> -[macro_version='2.2.6b'
> -macro_revision='1.3017'
> +[macro_version='2.2.6'
> +macro_revision='1.3012'
> _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
> _LT_DECL(, macro_revision, 0)
> ])
> @@ -8139,7 +8136,7 @@
> [am__api_version='1.11'
> 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.11.1], [],
> +m4_if([$1], [1.11], [],
> [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
> ])
>
> @@ -8155,7 +8152,7 @@
> # 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.11.1])dnl
> +[AM_AUTOMAKE_VERSION([1.11])dnl
> m4_ifndef([AC_AUTOCONF_VERSION],
> [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
> _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
> --- compile
> +++ compile
> @@ -1,7 +1,7 @@
> #! /bin/sh
> # Wrapper for compilers which do not understand `-c -o'.
>
> -scriptversion=2009-10-06.20; # UTC
> +scriptversion=2009-04-28.21; # UTC
>
> # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
> # Foundation, Inc.
> @@ -124,9 +124,9 @@
> ret=$?
>
> if test -f "$cofile"; then
> - test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
> + mv "$cofile" "$ofile"
> elif test -f "${cofile}bj"; then
> - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
> + mv "${cofile}bj" "$ofile"
> fi
>
> rmdir "$lockdir"
> --- config.guess
> +++ config.guess
> @@ -1,10 +1,10 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
> -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
> +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
> # Free Software Foundation, Inc.
>
> -timestamp='2009-11-20'
> +timestamp='2009-04-27'
>
> # 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
> @@ -27,16 +27,16 @@
> # the same distribution terms that you use for the rest of that program.
>
>
> -# Originally written by Per Bothner. Please send patches (context
> -# diff format) to <config-patches at gnu.org> and include a ChangeLog
> -# entry.
> +# Originally written by Per Bothner <per at bothner.com>.
> +# Please send patches to <config-patches at gnu.org>. Submit a context
> +# diff and a properly formatted ChangeLog entry.
> #
> # This script attempts to guess a canonical system name similar to
> # config.sub. If it succeeds, it prints the system name on stdout, and
> # exits with 0. Otherwise, it exits with 1.
> #
> -# You can get the latest version of this script from:
> -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
> +# The plan is that this can be called by configure scripts if you
> +# don't specify an explicit build system type.
>
> me=`echo "$0" | sed -e 's,.*/,,'`
>
> @@ -170,7 +170,7 @@
> arm*|i386|m68k|ns32k|sh3*|sparc|vax)
> eval $set_cc_for_build
> if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
> - | grep -q __ELF__
> + | grep __ELF__ >/dev/null
> then
> # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
> # Return netbsd for either. FIX?
> @@ -333,9 +333,6 @@
> sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
> echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
> exit ;;
> - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
> - echo i386-pc-auroraux${UNAME_RELEASE}
> - exit ;;
> i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
> eval $set_cc_for_build
> SUN_ARCH="i386"
> @@ -659,7 +656,7 @@
> # => hppa64-hp-hpux11.23
>
> if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
> - grep -q __LP64__
> + grep __LP64__ >/dev/null
> then
> HP_ARCH="hppa2.0w"
> else
> @@ -810,12 +807,12 @@
> i*:PW*:*)
> echo ${UNAME_MACHINE}-pc-pw32
> exit ;;
> - *:Interix*:*)
> + *:Interix*:[3456]*)
> case ${UNAME_MACHINE} in
> x86)
> echo i586-pc-interix${UNAME_RELEASE}
> exit ;;
> - authenticamd | genuineintel | EM64T)
> + EM64T | authenticamd | genuineintel)
> echo x86_64-unknown-interix${UNAME_RELEASE}
> exit ;;
> IA64)
> @@ -825,9 +822,6 @@
> [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
> echo i${UNAME_MACHINE}-pc-mks
> exit ;;
> - 8664:Windows_NT:*)
> - echo x86_64-pc-mks
> - exit ;;
> i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
> # How do we know it's Interix rather than the generic POSIX subsystem?
> # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
> @@ -857,20 +851,6 @@
> i*86:Minix:*:*)
> echo ${UNAME_MACHINE}-pc-minix
> exit ;;
> - alpha:Linux:*:*)
> - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
> - EV5) UNAME_MACHINE=alphaev5 ;;
> - EV56) UNAME_MACHINE=alphaev56 ;;
> - PCA56) UNAME_MACHINE=alphapca56 ;;
> - PCA57) UNAME_MACHINE=alphapca56 ;;
> - EV6) UNAME_MACHINE=alphaev6 ;;
> - EV67) UNAME_MACHINE=alphaev67 ;;
> - EV68*) UNAME_MACHINE=alphaev68 ;;
> - esac
> - objdump --private-headers /bin/sh | grep -q ld.so.1
> - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
> - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
> - exit ;;
> arm*:Linux:*:*)
> eval $set_cc_for_build
> if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
> @@ -893,17 +873,6 @@
> frv:Linux:*:*)
> echo frv-unknown-linux-gnu
> exit ;;
> - i*86:Linux:*:*)
> - LIBC=gnu
> - eval $set_cc_for_build
> - sed 's/^ //' << EOF >$dummy.c
> - #ifdef __dietlibc__
> - LIBC=dietlibc
> - #endif
> -EOF
> - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
> - echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
> - exit ;;
> ia64:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-gnu
> exit ;;
> @@ -913,34 +882,78 @@
> m68*:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-gnu
> exit ;;
> - mips:Linux:*:* | mips64:Linux:*:*)
> + mips:Linux:*:*)
> + eval $set_cc_for_build
> + sed 's/^ //' << EOF >$dummy.c
> + #undef CPU
> + #undef mips
> + #undef mipsel
> + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
> + CPU=mipsel
> + #else
> + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
> + CPU=mips
> + #else
> + CPU=
> + #endif
> + #endif
> +EOF
> + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
> + /^CPU/{
> + s: ::g
> + p
> + }'`"
> + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> + ;;
> + mips64:Linux:*:*)
> eval $set_cc_for_build
> sed 's/^ //' << EOF >$dummy.c
> #undef CPU
> - #undef ${UNAME_MACHINE}
> - #undef ${UNAME_MACHINE}el
> + #undef mips64
> + #undef mips64el
> #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
> - CPU=${UNAME_MACHINE}el
> + CPU=mips64el
> #else
> #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
> - CPU=${UNAME_MACHINE}
> + CPU=mips64
> #else
> CPU=
> #endif
> #endif
> EOF
> - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
> + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
> + /^CPU/{
> + s: ::g
> + p
> + }'`"
> test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
> ;;
> or32:Linux:*:*)
> echo or32-unknown-linux-gnu
> exit ;;
> + ppc:Linux:*:*)
> + echo powerpc-unknown-linux-gnu
> + exit ;;
> + ppc64:Linux:*:*)
> + echo powerpc64-unknown-linux-gnu
> + exit ;;
> + alpha:Linux:*:*)
> + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
> + EV5) UNAME_MACHINE=alphaev5 ;;
> + EV56) UNAME_MACHINE=alphaev56 ;;
> + PCA56) UNAME_MACHINE=alphapca56 ;;
> + PCA57) UNAME_MACHINE=alphapca56 ;;
> + EV6) UNAME_MACHINE=alphaev6 ;;
> + EV67) UNAME_MACHINE=alphaev67 ;;
> + EV68*) UNAME_MACHINE=alphaev68 ;;
> + esac
> + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
> + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
> + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
> + exit ;;
> padre:Linux:*:*)
> echo sparc-unknown-linux-gnu
> exit ;;
> - parisc64:Linux:*:* | hppa64:Linux:*:*)
> - echo hppa64-unknown-linux-gnu
> - exit ;;
> parisc:Linux:*:* | hppa:Linux:*:*)
> # Look for CPU level
> case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
> @@ -949,11 +962,8 @@
> *) echo hppa-unknown-linux-gnu ;;
> esac
> exit ;;
> - ppc64:Linux:*:*)
> - echo powerpc64-unknown-linux-gnu
> - exit ;;
> - ppc:Linux:*:*)
> - echo powerpc-unknown-linux-gnu
> + parisc64:Linux:*:* | hppa64:Linux:*:*)
> + echo hppa64-unknown-linux-gnu
> exit ;;
> s390:Linux:*:* | s390x:Linux:*:*)
> echo ${UNAME_MACHINE}-ibm-linux
> @@ -976,6 +986,66 @@
> xtensa*:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-gnu
> exit ;;
> + i*86:Linux:*:*)
> + # The BFD linker knows what the default object file format is, so
> + # first see if it will tell us. cd to the root directory to prevent
> + # problems with other programs or directories called `ld' in the path.
> + # Set LC_ALL=C to ensure ld outputs messages in English.
> + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
> + | sed -ne '/supported targets:/!d
> + s/[ ][ ]*/ /g
> + s/.*supported targets: *//
> + s/ .*//
> + p'`
> + case "$ld_supported_targets" in
> + elf32-i386)
> + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
> + ;;
> + a.out-i386-linux)
> + echo "${UNAME_MACHINE}-pc-linux-gnuaout"
> + exit ;;
> + "")
> + # Either a pre-BFD a.out linker (linux-gnuoldld) or
> + # one that does not give us useful --help.
> + echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
> + exit ;;
> + esac
> + # Determine whether the default compiler is a.out or elf
> + eval $set_cc_for_build
> + sed 's/^ //' << EOF >$dummy.c
> + #include <features.h>
> + #ifdef __ELF__
> + # ifdef __GLIBC__
> + # if __GLIBC__ >= 2
> + LIBC=gnu
> + # else
> + LIBC=gnulibc1
> + # endif
> + # else
> + LIBC=gnulibc1
> + # endif
> + #else
> + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
> + LIBC=gnu
> + #else
> + LIBC=gnuaout
> + #endif
> + #endif
> + #ifdef __dietlibc__
> + LIBC=dietlibc
> + #endif
> +EOF
> + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
> + /^LIBC/{
> + s: ::g
> + p
> + }'`"
> + test x"${LIBC}" != x && {
> + echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
> + exit
> + }
> + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
> + ;;
> 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
> @@ -1004,7 +1074,7 @@
> i*86:syllable:*:*)
> echo ${UNAME_MACHINE}-pc-syllable
> exit ;;
> - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
> + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
> echo i386-unknown-lynxos${UNAME_RELEASE}
> exit ;;
> i*86:*DOS:*:*)
> @@ -1112,7 +1182,7 @@
> rs6000:LynxOS:2.*:*)
> echo rs6000-unknown-lynxos${UNAME_RELEASE}
> exit ;;
> - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
> + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
> echo powerpc-unknown-lynxos${UNAME_RELEASE}
> exit ;;
> SM[BE]S:UNIX_SV:*:*)
> @@ -1205,16 +1275,6 @@
> *:Darwin:*:*)
> UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
> case $UNAME_PROCESSOR in
> - i386)
> - eval $set_cc_for_build
> - 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
> - UNAME_PROCESSOR="x86_64"
> - fi
> - fi ;;
> unknown) UNAME_PROCESSOR=powerpc ;;
> esac
> echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
> --- config.h.in
> +++ config.h.in
> @@ -85,6 +85,9 @@
> /* Define to the one symbol short name of this package. */
> #undef PACKAGE_TARNAME
>
> +/* Define to the home page for this package. */
> +#undef PACKAGE_URL
> +
> /* Define to the version of this package. */
> #undef PACKAGE_VERSION
>
> --- config.sub
> +++ config.sub
> @@ -1,10 +1,10 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
> -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
> +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
> # Free Software Foundation, Inc.
>
> -timestamp='2009-11-20'
> +timestamp='2009-04-17'
>
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
> @@ -32,16 +32,13 @@
>
>
> # Please send patches to <config-patches at gnu.org>. Submit a context
> -# diff and a properly formatted GNU ChangeLog entry.
> +# diff and a properly formatted ChangeLog entry.
> #
> # Configuration subroutine to validate and canonicalize a configuration type.
> # Supply the specified configuration type as an argument.
> # If it is invalid, we print an error message on stderr and exit with code 1.
> # Otherwise, we print the canonical config type on stdout and succeed.
>
> -# You can get the latest version of this script from:
> -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
> -
> # This file is supposed to be the same for all GNU packages
> # and recognize all the CPU types, system types and aliases
> # that are meaningful with *any* GNU software.
> @@ -152,13 +149,10 @@
> -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
> -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
> -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
> - -apple | -axis | -knuth | -cray | -microblaze)
> + -apple | -axis | -knuth | -cray)
> os=
> basic_machine=$1
> ;;
> - -bluegene*)
> - os=-cnk
> - ;;
> -sim | -cisco | -oki | -wec | -winbond)
> os=
> basic_machine=$1
> @@ -287,7 +281,6 @@
> | pdp10 | pdp11 | pj | pjl \
> | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
> | pyramid \
> - | rx \
> | score \
> | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
> | sh64 | sh64le \
> @@ -295,14 +288,13 @@
> | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
> | spu | strongarm \
> | tahoe | thumb | tic4x | tic80 | tron \
> - | ubicom32 \
> | v850 | v850e \
> | we32k \
> | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
> | z8k | z80)
> basic_machine=$basic_machine-unknown
> ;;
> - m6811 | m68hc11 | m6812 | m68hc12 | picochip)
> + m6811 | m68hc11 | m6812 | m68hc12)
> # Motorola 68HC11/12.
> basic_machine=$basic_machine-unknown
> os=-none
> @@ -345,7 +337,7 @@
> | lm32-* \
> | m32c-* | m32r-* | m32rle-* \
> | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
> - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
> + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
> | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
> | mips16-* \
> | mips64-* | mips64el-* \
> @@ -373,7 +365,7 @@
> | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
> | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
> | pyramid-* \
> - | romp-* | rs6000-* | rx-* \
> + | romp-* | rs6000-* \
> | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
> | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
> | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
> @@ -382,7 +374,6 @@
> | tahoe-* | thumb-* \
> | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
> | tron-* \
> - | ubicom32-* \
> | v850-* | v850e-* | vax-* \
> | we32k-* \
> | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
> @@ -476,10 +467,6 @@
> basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
> os=-linux
> ;;
> - bluegene*)
> - basic_machine=powerpc-ibm
> - os=-cnk
> - ;;
> c90)
> basic_machine=c90-cray
> os=-unicos
> @@ -732,9 +719,6 @@
> basic_machine=ns32k-utek
> os=-sysv
> ;;
> - microblaze)
> - basic_machine=microblaze-xilinx
> - ;;
> mingw32)
> basic_machine=i386-pc
> os=-mingw32
> @@ -1256,9 +1240,6 @@
> # First match some system type aliases
> # that might get confused with valid system types.
> # -solaris* is a basic system type, with this one exception.
> - -auroraux)
> - os=-auroraux
> - ;;
> -solaris1 | -solaris1.*)
> os=`echo $os | sed -e 's|solaris1|sunos4|'`
> ;;
> @@ -1279,9 +1260,9 @@
> # Each alternative MUST END IN A *, to match a version number.
> # -sysv* is not here because it comes later, after sysvr4.
> -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
> - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
> - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
> - | -sym* | -kopensolaris* \
> + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
> + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
> + | -kopensolaris* \
> | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
> | -aos* | -aros* \
> | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
> @@ -1302,7 +1283,7 @@
> | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
> | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
> | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
> - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
> + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
> # Remember, each alternative MUST END IN *, to match a version number.
> ;;
> -qnx*)
> @@ -1632,7 +1613,7 @@
> -sunos*)
> vendor=sun
> ;;
> - -cnk*|-aix*)
> + -aix*)
> vendor=ibm
> ;;
> -beos*)
> --- configure
> +++ configure
> @@ -1,18 +1,20 @@
> #! /bin/sh
> # Guess values for system-dependent variables and create Makefiles.
> -# Generated by GNU Autoconf 2.63 for connman 0.54.
> +# Generated by GNU Autoconf 2.64 for connman 0.54.2.
> #
> # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
> -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
> +# Foundation, Inc.
> +#
> # This configure script is free software; the Free Software Foundation
> # gives unlimited permission to copy, distribute and modify it.
> -## --------------------- ##
> -## M4sh Initialization. ##
> -## --------------------- ##
> +## -------------------- ##
> +## M4sh Initialization. ##
> +## -------------------- ##
>
> # Be more Bourne compatible
> DUALCASE=1; export DUALCASE # for MKS sh
> -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
> +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
> emulate sh
> NULLCMD=:
> # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
> @@ -20,23 +22,15 @@
> alias -g '${1+"$@"}'='"$@"'
> setopt NO_GLOB_SUBST
> else
> - case `(set -o) 2>/dev/null` in
> - *posix*) set -o posix ;;
> + case `(set -o) 2>/dev/null` in #(
> + *posix*) :
> + set -o posix ;; #(
> + *) :
> + ;;
> esac
> -
> fi
>
>
> -
> -
> -# PATH needs CR
> -# Avoid depending upon Character Ranges.
> -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
> -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
> -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
> -as_cr_digits='0123456789'
> -as_cr_alnum=$as_cr_Letters$as_cr_digits
> -
> as_nl='
> '
> export as_nl
> @@ -44,7 +38,13 @@
> 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
> -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
> +# 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
> @@ -55,7 +55,7 @@
> as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
> as_echo_n_body='eval
> arg=$1;
> - case $arg in
> + case $arg in #(
> *"$as_nl"*)
> expr "X$arg" : "X\\(.*\\)$as_nl";
> arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
> @@ -78,13 +78,6 @@
> }
> fi
>
> -# Support unset when possible.
> -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
> - as_unset=unset
> -else
> - as_unset=false
> -fi
> -
>
> # IFS
> # We need space, tab and new line, in precisely that order. Quoting is
> @@ -94,15 +87,15 @@
> IFS=" "" $as_nl"
>
> # Find who we are. Look in the path if we contain no directory separator.
> -case $0 in
> +case $0 in #((
> *[\\/]* ) as_myself=$0 ;;
> *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> 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
> -done
> + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -114,12 +107,16 @@
> fi
> if test ! -f "$as_myself"; then
> $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
> - { (exit 1); exit 1; }
> + exit 1
> fi
>
> -# Work around bugs in pre-3.0 UWIN ksh.
> -for as_var in ENV MAIL MAILPATH
> -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
> +# 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='> '
> @@ -131,330 +128,299 @@
> LANGUAGE=C
> export LANGUAGE
>
> -# Required to use basename.
> -if expr a : '\(a\)' >/dev/null 2>&1 &&
> - test "X`expr 00001 : '.*\(...\)'`" = X001; then
> - as_expr=expr
> -else
> - as_expr=false
> -fi
> -
> -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
> - as_basename=basename
> -else
> - as_basename=false
> -fi
> -
> -
> -# Name of the executable.
> -as_me=`$as_basename -- "$0" ||
> -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
> - X"$0" : 'X\(//\)$' \| \
> - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
> -$as_echo X/"$0" |
> - sed '/^.*\/\([^/][^/]*\)\/*$/{
> - s//\1/
> - q
> - }
> - /^X\/\(\/\/\)$/{
> - s//\1/
> - q
> - }
> - /^X\/\(\/\).*/{
> - s//\1/
> - q
> - }
> - s/.*/./; q'`
> -
> # CDPATH.
> -$as_unset CDPATH
> -
> +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
>
> if test "x$CONFIG_SHELL" = x; then
> - if (eval ":") 2>/dev/null; then
> - as_have_required=yes
> + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (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
> - as_have_required=no
> + case \`(set -o) 2>/dev/null\` in #(
> + *posix*) :
> + set -o posix ;; #(
> + *) :
> + ;;
> +esac
> fi
> -
> - if test $as_have_required = yes && (eval ":
> -(as_func_return () {
> - (exit \$1)
> -}
> -as_func_success () {
> - as_func_return 0
> -}
> -as_func_failure () {
> - as_func_return 1
> -}
> -as_func_ret_success () {
> - return 0
> -}
> -as_func_ret_failure () {
> - return 1
> -}
> +"
> + as_required="as_fn_return () { (exit \$1); }
> +as_fn_success () { as_fn_return 0; }
> +as_fn_failure () { as_fn_return 1; }
> +as_fn_ret_success () { return 0; }
> +as_fn_ret_failure () { return 1; }
>
> exitcode=0
> -if as_func_success; then
> - :
> -else
> - exitcode=1
> - echo as_func_success failed.
> -fi
> -
> -if as_func_failure; then
> - exitcode=1
> - echo as_func_failure succeeded.
> -fi
> -
> -if as_func_ret_success; then
> - :
> -else
> - exitcode=1
> - echo as_func_ret_success failed.
> -fi
> -
> -if as_func_ret_failure; then
> - exitcode=1
> - echo as_func_ret_failure succeeded.
> -fi
> -
> -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
> - :
> +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 :
> +
> +else
> + exitcode=1; echo positional parameters were not saved.
> +fi
> +test x\$exitcode = x0 || 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"
> + if (eval "$as_required") 2>/dev/null; then :
> + as_have_required=yes
> else
> - exitcode=1
> - echo positional parameters were not saved.
> + as_have_required=no
> fi
> + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
>
> -test \$exitcode = 0) || { (exit 1); exit 1; }
> -
> -(
> - as_lineno_1=\$LINENO
> - as_lineno_2=\$LINENO
> - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
> - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
> -") 2> /dev/null; then
> - :
> else
> - as_candidate_shells=
> - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> + 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_found=:
> + case $as_dir in #(
> /*)
> for as_base in sh bash ksh sh5; do
> - as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
> + # Try only shells that exist, to save several forks.
> + 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 :
> + 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 :
> + break 2
> +fi
> +fi
> done;;
> 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
>
>
> - for as_shell in $as_candidate_shells $SHELL; do
> - # Try only shells that exist, to save several forks.
> - if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
> - { ("$as_shell") 2> /dev/null <<\_ASEOF
> -if test -n "${ZSH_VERSION+set}" && (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
> - case `(set -o) 2>/dev/null` in
> - *posix*) set -o posix ;;
> -esac
> -
> -fi
> -
> -
> -:
> -_ASEOF
> -}; then
> - CONFIG_SHELL=$as_shell
> - as_have_required=yes
> - if { "$as_shell" 2> /dev/null <<\_ASEOF
> -if test -n "${ZSH_VERSION+set}" && (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
> - case `(set -o) 2>/dev/null` in
> - *posix*) set -o posix ;;
> -esac
> -
> -fi
> -
> -
> -:
> -(as_func_return () {
> - (exit $1)
> -}
> -as_func_success () {
> - as_func_return 0
> -}
> -as_func_failure () {
> - as_func_return 1
> -}
> -as_func_ret_success () {
> - return 0
> -}
> -as_func_ret_failure () {
> - return 1
> -}
> -
> -exitcode=0
> -if as_func_success; then
> - :
> -else
> - exitcode=1
> - echo as_func_success failed.
> -fi
> -
> -if as_func_failure; then
> - exitcode=1
> - echo as_func_failure succeeded.
> -fi
> -
> -if as_func_ret_success; then
> - :
> -else
> - exitcode=1
> - echo as_func_ret_success failed.
> -fi
> -
> -if as_func_ret_failure; then
> - exitcode=1
> - echo as_func_ret_failure succeeded.
> -fi
> -
> -if ( set x; as_func_ret_success y && test x = "$1" ); then
> - :
> -else
> - exitcode=1
> - echo positional parameters were not saved.
> -fi
> -
> -test $exitcode = 0) || { (exit 1); exit 1; }
> -
> -(
> - as_lineno_1=$LINENO
> - as_lineno_2=$LINENO
> - test "x$as_lineno_1" != "x$as_lineno_2" &&
> - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
> -
> -_ASEOF
> -}; then
> - break
> -fi
> -
> -fi
> -
> - done
> -
> - if test "x$CONFIG_SHELL" != x; then
> - for as_var in BASH_ENV ENV
> - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
> - done
> + if test "x$CONFIG_SHELL" != x; then :
> + # We cannot yet assume a decent shell, so we have to provide a
> + # neutralization value for shells without unset; and this also
> + # works around shells that cannot unset nonexistent variables.
> + BASH_ENV=/dev/null
> + ENV=/dev/null
> + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
> export CONFIG_SHELL
> exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
> fi
>
> -
> - if test $as_have_required = no; then
> - echo This script requires a shell more modern than all the
> - echo shells that I found on your system. Please install a
> - echo modern shell, or manually run the script under such a
> - echo shell if you do have one.
> - { (exit 1); exit 1; }
> + 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."
> + else
> + $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
> +$0: including any error possibly output before this
> +$0: message. Then install a modern shell, or manually run
> +$0: the script under such a shell if you do have one."
> + fi
> + exit 1
> fi
> -
> -
> fi
> -
> fi
> +SHELL=${CONFIG_SHELL-/bin/sh}
> +export SHELL
> +# Unset more variables known to interfere with behavior of common tools.
> +CLICOLOR_FORCE= GREP_OPTIONS=
> +unset CLICOLOR_FORCE GREP_OPTIONS
> +
> +## --------------------- ##
> +## M4sh Shell Functions. ##
> +## --------------------- ##
> +# as_fn_unset VAR
> +# ---------------
> +# Portably unset VAR.
> +as_fn_unset ()
> +{
> + { eval $1=; unset $1;}
> +}
> +as_unset=as_fn_unset
> +
> +# as_fn_set_status STATUS
> +# -----------------------
> +# Set $? to STATUS, without forking.
> +as_fn_set_status ()
> +{
> + return $1
> +} # as_fn_set_status
> +
> +# as_fn_exit STATUS
> +# -----------------
> +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
> +as_fn_exit ()
> +{
> + set +e
> + as_fn_set_status $1
> + exit $1
> +} # as_fn_exit
> +
> +# as_fn_mkdir_p
> +# -------------
> +# Create "$as_dir" as a directory, including parents if necessary.
> +as_fn_mkdir_p ()
> +{
>
> + case $as_dir in #(
> + -*) as_dir=./$as_dir;;
> + esac
> + test -d "$as_dir" || eval $as_mkdir_p || {
> + as_dirs=
> + while :; do
> + case $as_dir in #(
> + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
> + *) as_qdir=$as_dir;;
> + esac
> + as_dirs="'$as_qdir' $as_dirs"
> + as_dir=`$as_dirname -- "$as_dir" ||
> +$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" |
> + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
> + s//\1/
> + q
> + }
> + /^X\(\/\/\)[^/].*/{
> + s//\1/
> + q
> + }
> + /^X\(\/\/\)$/{
> + s//\1/
> + q
> + }
> + /^X\(\/\).*/{
> + s//\1/
> + q
> + }
> + s/.*/./; q'`
> + test -d "$as_dir" && break
> + done
> + test -z "$as_dirs" || eval "mkdir $as_dirs"
> + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
>
>
> -(eval "as_func_return () {
> - (exit \$1)
> -}
> -as_func_success () {
> - as_func_return 0
> -}
> -as_func_failure () {
> - as_func_return 1
> -}
> -as_func_ret_success () {
> - return 0
> -}
> -as_func_ret_failure () {
> - return 1
> -}
> +} # as_fn_mkdir_p
> +# 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 :
> + eval 'as_fn_append ()
> + {
> + eval $1+=\$2
> + }'
> +else
> + as_fn_append ()
> + {
> + eval $1=\$$1\$2
> + }
> +fi # as_fn_append
>
> -exitcode=0
> -if as_func_success; then
> - :
> +# as_fn_arith ARG...
> +# ------------------
> +# 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 :
> + eval 'as_fn_arith ()
> + {
> + as_val=$(( $* ))
> + }'
> else
> - exitcode=1
> - echo as_func_success failed.
> -fi
> + as_fn_arith ()
> + {
> + as_val=`expr "$@" || test $? -eq 1`
> + }
> +fi # as_fn_arith
>
> -if as_func_failure; then
> - exitcode=1
> - echo as_func_failure succeeded.
> -fi
>
> -if as_func_ret_success; then
> - :
> +# as_fn_error ERROR [LINENO LOG_FD]
> +# ---------------------------------
> +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
> +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
> +# script with status $?, using 1 if that was 0.
> +as_fn_error ()
> +{
> + as_status=$?; test $as_status -eq 0 && as_status=1
> + if test "$3"; then
> + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
> + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
> + fi
> + $as_echo "$as_me: error: $1" >&2
> + as_fn_exit $as_status
> +} # as_fn_error
> +
> +if expr a : '\(a\)' >/dev/null 2>&1 &&
> + test "X`expr 00001 : '.*\(...\)'`" = X001; then
> + as_expr=expr
> else
> - exitcode=1
> - echo as_func_ret_success failed.
> + as_expr=false
> fi
>
> -if as_func_ret_failure; then
> - exitcode=1
> - echo as_func_ret_failure succeeded.
> +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
> + as_basename=basename
> +else
> + as_basename=false
> fi
>
> -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
> - :
> +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
> + as_dirname=dirname
> else
> - exitcode=1
> - echo positional parameters were not saved.
> + as_dirname=false
> fi
>
> -test \$exitcode = 0") || {
> - echo No shell found that supports shell functions.
> - echo Please tell bug-autoconf at gnu.org about your system,
> - echo including any error possibly output before this message.
> - echo This can help us improve future autoconf versions.
> - echo Configuration will now proceed without shell functions.
> -}
> +as_me=`$as_basename -- "$0" ||
> +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
> + X"$0" : 'X\(//\)$' \| \
> + X"$0" : 'X\(/\)' \| . 2>/dev/null ||
> +$as_echo X/"$0" |
> + sed '/^.*\/\([^/][^/]*\)\/*$/{
> + s//\1/
> + q
> + }
> + /^X\/\(\/\/\)$/{
> + s//\1/
> + q
> + }
> + /^X\/\(\/\).*/{
> + s//\1/
> + q
> + }
> + s/.*/./; q'`
>
> +# Avoid depending upon Character Ranges.
> +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
> +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
> +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
> +as_cr_digits='0123456789'
> +as_cr_alnum=$as_cr_Letters$as_cr_digits
>
>
> - as_lineno_1=$LINENO
> - as_lineno_2=$LINENO
> - test "x$as_lineno_1" != "x$as_lineno_2" &&
> - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
> -
> - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
> - # uniformly replaced by the line number. The first 'sed' inserts a
> - # line-number line after each line using $LINENO; the second 'sed'
> - # does the real work. The second script uses 'N' to pair each
> - # line-number line with the line containing $LINENO, and appends
> - # trailing '-' during substitution so that $LINENO is not a special
> - # case at line end.
> - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
> - # scripts with optimization help from Paolo Bonzini. Blame Lee
> - # E. McMahon (1931-1989) for sed's syntax. :-)
> + as_lineno_1=$LINENO as_lineno_1a=$LINENO
> + as_lineno_2=$LINENO 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'"' || {
> + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
> sed -n '
> p
> /[$]LINENO/=
> @@ -471,8 +437,7 @@
> 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
> - { (exit 1); exit 1; }; }
> + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
>
> # Don't try to exec as it changes $[0], causing all sort of problems
> # (the dirname of $[0] is not the place where we might find the
> @@ -482,29 +447,18 @@
> exit
> }
>
> -
> -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
> - as_dirname=dirname
> -else
> - as_dirname=false
> -fi
> -
> ECHO_C= ECHO_N= ECHO_T=
> -case `echo -n x` in
> +case `echo -n x` in #(((((
> -n*)
> - case `echo 'x\c'` in
> + case `echo 'xy\c'` in
> *c*) ECHO_T=' ';; # ECHO_T is single tab character.
> - *) ECHO_C='\c';;
> + xy) ECHO_C='\c';;
> + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
> + ECHO_T=' ';;
> esac;;
> *)
> ECHO_N='-n';;
> esac
> -if expr a : '\(a\)' >/dev/null 2>&1 &&
> - test "X`expr 00001 : '.*\(...\)'`" = X001; then
> - as_expr=expr
> -else
> - as_expr=false
> -fi
>
> rm -f conf$$ conf$$.exe conf$$.file
> if test -d conf$$.dir; then
> @@ -534,7 +488,7 @@
> rmdir conf$$.dir 2>/dev/null
>
> if mkdir -p . 2>/dev/null; then
> - as_mkdir_p=:
> + as_mkdir_p='mkdir -p "$as_dir"'
> else
> test -d ./-p && rmdir ./-p
> as_mkdir_p=false
> @@ -553,10 +507,10 @@
> if test -d "$1"; then
> test -d "$1/.";
> else
> - case $1 in
> + case $1 in #(
> -*)set "./$1";;
> esac;
> - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
> + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
> ???[sx]*):;;*)false;;esac;fi
> '\'' sh
> '
> @@ -571,7 +525,6 @@
>
>
>
> -
> # Check that we are running under the correct shell.
> SHELL=${CONFIG_SHELL-/bin/sh}
>
> @@ -738,14 +691,14 @@
> subdirs=
> MFLAGS=
> MAKEFLAGS=
> -SHELL=${CONFIG_SHELL-/bin/sh}
>
> # Identity of this package.
> PACKAGE_NAME='connman'
> PACKAGE_TARNAME='connman'
> -PACKAGE_VERSION='0.54'
> -PACKAGE_STRING='connman 0.54'
> +PACKAGE_VERSION='0.54.2'
> +PACKAGE_STRING='connman 0.54.2'
> PACKAGE_BUGREPORT=''
> +PACKAGE_URL=''
>
> ac_default_prefix=/usr/local
> # Factoring default headers for most tests.
> @@ -1004,6 +957,7 @@
> program_transform_name
> prefix
> exec_prefix
> +PACKAGE_URL
> PACKAGE_BUGREPORT
> PACKAGE_STRING
> PACKAGE_VERSION
> @@ -1196,8 +1150,7 @@
> 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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
> - { (exit 1); exit 1; }; }
> + as_fn_error "invalid feature name: $ac_useropt"
> ac_useropt_orig=$ac_useropt
> ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
> case $ac_user_opts in
> @@ -1223,8 +1176,7 @@
> 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_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
> - { (exit 1); exit 1; }; }
> + as_fn_error "invalid feature name: $ac_useropt"
> ac_useropt_orig=$ac_useropt
> ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
> case $ac_user_opts in
> @@ -1428,8 +1380,7 @@
> 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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
> - { (exit 1); exit 1; }; }
> + as_fn_error "invalid package name: $ac_useropt"
> ac_useropt_orig=$ac_useropt
> ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
> case $ac_user_opts in
> @@ -1445,8 +1396,7 @@
> 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_echo "$as_me: error: invalid package name: $ac_useropt" >&2
> - { (exit 1); exit 1; }; }
> + as_fn_error "invalid package name: $ac_useropt"
> ac_useropt_orig=$ac_useropt
> ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
> case $ac_user_opts in
> @@ -1476,17 +1426,17 @@
> | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
> x_libraries=$ac_optarg ;;
>
> - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
> -Try \`$0 --help' for more information." >&2
> - { (exit 1); exit 1; }; }
> + -*) as_fn_error "unrecognized option: \`$ac_option'
> +Try \`$0 --help' for more information."
> ;;
>
> *=*)
> ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
> # Reject names that are not valid shell variable names.
> - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
> - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
> - { (exit 1); exit 1; }; }
> + case $ac_envvar in #(
> + '' | [0-9]* | *[!_$as_cr_alnum]* )
> + as_fn_error "invalid variable name: \`$ac_envvar'" ;;
> + esac
> eval $ac_envvar=\$ac_optarg
> export $ac_envvar ;;
>
> @@ -1503,15 +1453,13 @@
>
> if test -n "$ac_prev"; then
> ac_option=--`echo $ac_prev | sed 's/_/-/g'`
> - { $as_echo "$as_me: error: missing argument to $ac_option" >&2
> - { (exit 1); exit 1; }; }
> + as_fn_error "missing argument to $ac_option"
> fi
>
> if test -n "$ac_unrecognized_opts"; then
> case $enable_option_checking in
> no) ;;
> - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
> - { (exit 1); exit 1; }; } ;;
> + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
> *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
> esac
> fi
> @@ -1534,8 +1482,7 @@
> [\\/$]* | ?:[\\/]* ) continue;;
> NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
> esac
> - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
> - { (exit 1); exit 1; }; }
> + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
> done
>
> # There might be people who depend on the old broken behavior: `$host'
> @@ -1565,11 +1512,9 @@
> ac_pwd=`pwd` && test -n "$ac_pwd" &&
> ac_ls_di=`ls -di .` &&
> ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
> - { $as_echo "$as_me: error: working directory cannot be determined" >&2
> - { (exit 1); exit 1; }; }
> + as_fn_error "working directory cannot be determined"
> test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
> - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
> - { (exit 1); exit 1; }; }
> + as_fn_error "pwd does not report name of working directory"
>
>
> # Find the source files, if location was not specified.
> @@ -1608,13 +1553,11 @@
> fi
> if test ! -r "$srcdir/$ac_unique_file"; then
> test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
> - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
> - { (exit 1); exit 1; }; }
> + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
> fi
> ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
> ac_abs_confdir=`(
> - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
> - { (exit 1); exit 1; }; }
> + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
> pwd)`
> # When building in place, set srcdir=.
> if test "$ac_abs_confdir" = "$ac_pwd"; then
> @@ -1640,7 +1583,7 @@
> # 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 connman 0.54 to adapt to many kinds of systems.
> +\`configure' configures connman 0.54.2 to adapt to many kinds of systems.
>
> Usage: $0 [OPTION]... [VAR=VALUE]...
>
> @@ -1710,7 +1653,7 @@
>
> if test -n "$ac_init_help"; then
> case $ac_init_help in
> - short | recursive ) echo "Configuration of connman 0.54:";;
> + short | recursive ) echo "Configuration of connman 0.54.2:";;
> esac
> cat <<\_ACEOF
>
> @@ -1815,6 +1758,7 @@
> Use these variables to override the choices made by `configure' or to help
> it to find libraries and programs with nonstandard names/locations.
>
> +Report bugs to the package provider.
> _ACEOF
> ac_status=$?
> fi
> @@ -1877,22 +1821,466 @@
> test -n "$ac_init_help" && exit $ac_status
> if $ac_init_version; then
> cat <<\_ACEOF
> -connman configure 0.54
> -generated by GNU Autoconf 2.63
> +connman configure 0.54.2
> +generated by GNU Autoconf 2.64
>
> -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
> -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
> +Copyright (C) 2009 Free Software Foundation, Inc.
> This configure script is free software; the Free Software Foundation
> gives unlimited permission to copy, distribute and modify it.
> _ACEOF
> exit
> fi
> +
> +## ------------------------ ##
> +## Autoconf initialization. ##
> +## ------------------------ ##
> +
> +# ac_fn_c_try_compile LINENO
> +# --------------------------
> +# Try to compile conftest.$ac_ext, and return whether this succeeded.
> +ac_fn_c_try_compile ()
> +{
> + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
> + rm -f conftest.$ac_objext
> + 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
> + (eval "$ac_compile") 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; } && {
> + test -z "$ac_c_werror_flag" ||
> + test ! -s conftest.err
> + } && test -s conftest.$ac_objext; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
> + return $ac_retval
> +
> +} # ac_fn_c_try_compile
> +
> +# ac_fn_c_try_link LINENO
> +# -----------------------
> +# Try to link conftest.$ac_ext, and return whether this succeeded.
> +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
> + 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>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; } && {
> + test -z "$ac_c_werror_flag" ||
> + test ! -s conftest.err
> + } && test -s conftest$ac_exeext && {
> + test "$cross_compiling" = yes ||
> + $as_test_x conftest$ac_exeext
> + }; then :
> + ac_retval=0
> +else
> + $as_echo "$as_me: failed program was:" >&5
> +sed 's/^/| /' conftest.$ac_ext >&5
> +
> + ac_retval=1
> +fi
> + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
> + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
> + # interfere with the next link command; also delete a directory that is
> + # left behind by Apple's compiler. We do this before executing the actions.
> + rm -rf conftest.dSYM conftest_ipa8_conftest.oo
> + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
> + return $ac_retval
> +
> +} # ac_fn_c_try_link
> +
> +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
> +# -------------------------------------------------------
> +# Tests whether HEADER exists and can be compiled using the include files in
> +# INCLUDES, setting the cache variable VAR accordingly.
> +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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
> + $as_echo_n "(cached) " >&6
> +else
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h. */
> +$4
> +#include <$2>
> +_ACEOF
> +if ac_fn_c_try_compile "$LINENO"; then :
> + eval "$3=yes"
> +else
> + eval "$3=no"
> +fi
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +fi
> +eval ac_res=\$$3
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
> +$as_echo "$ac_res" >&6; }
> + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
> +
> +} # ac_fn_c_check_header_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; } >/dev/null && {
> + 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
> + return $ac_retval
> +
> +} # ac_fn_c_try_cpp
> +
> +# 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
> + return $ac_retval
> +
> +} # ac_fn_c_try_run
> +
> +# ac_fn_c_check_func LINENO FUNC VAR
> +# ----------------------------------
> +# Tests whether FUNC exists, setting the cache variable VAR accordingly
> +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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
> + $as_echo_n "(cached) " >&6
> +else
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h. */
> +/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
> + For example, HP-UX 11i <limits.h> declares gettimeofday. */
> +#define $2 innocuous_$2
> +
> +/* System header to define __stub macros and hopefully few prototypes,
> + which can conflict with char $2 (); below.
> + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> + <limits.h> exists even on freestanding compilers. */
> +
> +#ifdef __STDC__
> +# include <limits.h>
> +#else
> +# include <assert.h>
> +#endif
> +
> +#undef $2
> +
> +/* 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 $2 ();
> +/* The GNU C library defines this for functions which it implements
> + to always fail with ENOSYS. Some functions are actually named
> + something starting with __ and the normal name is an alias. */
> +#if defined __stub_$2 || defined __stub___$2
> +choke me
> +#endif
> +
> +int
> +main ()
> +{
> +return $2 ();
> + ;
> + return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_link "$LINENO"; then :
> + eval "$3=yes"
> +else
> + eval "$3=no"
> +fi
> +rm -f core conftest.err conftest.$ac_objext \
> + 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; }
> + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
> +
> +} # ac_fn_c_check_func
> +
> +# 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
> +$as_echo_n "checking for $2... " >&6; }
> +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; 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.$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;}
> + ;;
> +esac
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
> +$as_echo_n "checking for $2... " >&6; }
> +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
> +
> +} # ac_fn_c_check_header_mongrel
> +
> +# ac_fn_c_check_decl LINENO SYMBOL VAR
> +# ------------------------------------
> +# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
> +ac_fn_c_check_decl ()
> +{
> + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
> +$as_echo_n "checking whether $2 is declared... " >&6; }
> +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
> + $as_echo_n "(cached) " >&6
> +else
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h. */
> +$4
> +int
> +main ()
> +{
> +#ifndef $2
> + (void) $2;
> +#endif
> +
> + ;
> + return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_compile "$LINENO"; then :
> + eval "$3=yes"
> +else
> + eval "$3=no"
> +fi
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +fi
> +eval ac_res=\$$3
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
> +$as_echo "$ac_res" >&6; }
> + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
> +
> +} # ac_fn_c_check_decl
> +
> +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
> +# -------------------------------------------
> +# Tests whether TYPE exists after having included INCLUDES, setting cache
> +# variable VAR accordingly.
> +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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
> + $as_echo_n "(cached) " >&6
> +else
> + eval "$3=no"
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h. */
> +$4
> +int
> +main ()
> +{
> +if (sizeof ($2))
> + return 0;
> + ;
> + return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_compile "$LINENO"; then :
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h. */
> +$4
> +int
> +main ()
> +{
> +if (sizeof (($2)))
> + return 0;
> + ;
> + return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_compile "$LINENO"; then :
> +
> +else
> + eval "$3=yes"
> +fi
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +fi
> +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +fi
> +eval ac_res=\$$3
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
> +$as_echo "$ac_res" >&6; }
> + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
> +
> +} # ac_fn_c_check_type
> 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 connman $as_me 0.54, which was
> -generated by GNU Autoconf 2.63. Invocation command line was
> +It was created by connman $as_me 0.54.2, which was
> +generated by GNU Autoconf 2.64. Invocation command line was
>
> $ $0 $@
>
> @@ -1928,8 +2316,8 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - $as_echo "PATH: $as_dir"
> -done
> + $as_echo "PATH: $as_dir"
> + done
> IFS=$as_save_IFS
>
> } >&5
> @@ -1966,9 +2354,9 @@
> ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
> esac
> case $ac_pass in
> - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
> + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
> 2)
> - ac_configure_args1="$ac_configure_args1 '$ac_arg'"
> + as_fn_append ac_configure_args1 " '$ac_arg'"
> if test $ac_must_keep_next = true; then
> ac_must_keep_next=false # Got value, back to normal.
> else
> @@ -1984,13 +2372,13 @@
> -* ) ac_must_keep_next=true ;;
> esac
> fi
> - ac_configure_args="$ac_configure_args '$ac_arg'"
> + as_fn_append ac_configure_args " '$ac_arg'"
> ;;
> esac
> done
> done
> -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
> -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
> +{ ac_configure_args0=; unset ac_configure_args0;}
> +{ ac_configure_args1=; unset ac_configure_args1;}
>
> # When interrupted or exit'd, cleanup temporary files, and complete
> # config.log. We remove comments because anyway the quotes in there
> @@ -2015,13 +2403,13 @@
> case $ac_val in #(
> *${as_nl}*)
> case $ac_var in #(
> - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
> + *_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;} ;;
> esac
> case $ac_var in #(
> _ | IFS | as_nl) ;; #(
> BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
> - *) $as_unset $ac_var ;;
> + *) { eval $ac_var=; unset $ac_var;} ;;
> esac ;;
> esac
> done
> @@ -2093,39 +2481,41 @@
> exit $exit_status
> ' 0
> for ac_signal in 1 2 13 15; do
> - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
> + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
> done
> 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
> +
> # Predefined preprocessor variables.
>
> cat >>confdefs.h <<_ACEOF
> #define PACKAGE_NAME "$PACKAGE_NAME"
> _ACEOF
>
> -
> cat >>confdefs.h <<_ACEOF
> #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
> _ACEOF
>
> -
> cat >>confdefs.h <<_ACEOF
> #define PACKAGE_VERSION "$PACKAGE_VERSION"
> _ACEOF
>
> -
> cat >>confdefs.h <<_ACEOF
> #define PACKAGE_STRING "$PACKAGE_STRING"
> _ACEOF
>
> -
> cat >>confdefs.h <<_ACEOF
> #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
> _ACEOF
>
> +cat >>confdefs.h <<_ACEOF
> +#define PACKAGE_URL "$PACKAGE_URL"
> +_ACEOF
> +
>
> # Let the site file select an alternate cache file if it wants to.
> # Prefer an explicitly selected file to automatically selected ones.
> @@ -2144,7 +2534,7 @@
> do
> test "x$ac_site_file" = xNONE && continue
> if test -r "$ac_site_file"; then
> - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
> + { $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;}
> sed 's/^/| /' "$ac_site_file" >&5
> . "$ac_site_file"
> @@ -2155,7 +2545,7 @@
> # Some versions of bash will fail to source /dev/null (special
> # files actually), so we avoid doing that.
> if test -f "$cache_file"; then
> - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
> $as_echo "$as_me: loading cache $cache_file" >&6;}
> case $cache_file in
> [\\/]* | ?:[\\/]* ) . "$cache_file";;
> @@ -2163,7 +2553,7 @@
> esac
> fi
> else
> - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
> $as_echo "$as_me: creating cache $cache_file" >&6;}
>> $cache_file
> fi
> @@ -2178,11 +2568,11 @@
> eval ac_new_val=\$ac_env_${ac_var}_value
> case $ac_old_set,$ac_new_set in
> set,)
> - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
> + { $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:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
> + { $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=: ;;
> ,);;
> @@ -2192,17 +2582,17 @@
> 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:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
> + { $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:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
> + { $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:$LINENO: former value: \`$ac_old_val'" >&5
> + { $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:$LINENO: current value: \`$ac_new_val'" >&5
> + { $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
> @@ -2214,43 +2604,20 @@
> esac
> case " $ac_configure_args " in
> *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
> - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
> + *) as_fn_append ac_configure_args " '$ac_arg'" ;;
> esac
> fi
> done
> if $ac_cache_corrupted; then
> - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
> + { $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:$LINENO: error: changes in the environment can compromise the build" >&5
> + { $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_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
> -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
> fi
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> -
> +## -------------------- ##
> +## Main body of script. ##
> +## -------------------- ##
>
> ac_ext=c
> ac_cpp='$CPP $CPPFLAGS'
> @@ -2264,24 +2631,16 @@
>
> ac_aux_dir=
> for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; 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
> + for ac_t in install-sh install.sh shtool; do
> + if test -f "$ac_dir/$ac_t"; then
> + ac_aux_dir=$ac_dir
> + ac_install_sh="$ac_aux_dir/$ac_t -c"
> + break 2
> + fi
> + done
> done
> if test -z "$ac_aux_dir"; then
> - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
> -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
> fi
>
> # These three variables are undocumented and unsupported,
> @@ -2307,10 +2666,10 @@
> # 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:$LINENO: checking for a BSD-compatible install" >&5
> +{ $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 test "${ac_cv_path_install+set}" = set; then
> +if test "${ac_cv_path_install+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> @@ -2318,11 +2677,11 @@
> 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/* | \
> + # 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\\/* | \
> + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
> /usr/ucb/* ) ;;
> *)
> # OSF1 and SCO ODT 3.0 have their own names for install.
> @@ -2359,7 +2718,7 @@
> ;;
> esac
>
> -done
> + done
> IFS=$as_save_IFS
>
> rm -rf conftest.one conftest.two conftest.dir
> @@ -2375,7 +2734,7 @@
> INSTALL=$ac_install_sh
> fi
> fi
> -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
> $as_echo "$INSTALL" >&6; }
>
> # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
> @@ -2386,7 +2745,7 @@
>
> test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
>
> -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
> $as_echo_n "checking whether build environment is sane... " >&6; }
> # Just in case
> sleep 1
> @@ -2397,15 +2756,11 @@
> '
> case `pwd` in
> *[\\\"\#\$\&\'\`$am_lf]*)
> - { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
> -$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
> - { (exit 1); exit 1; }; };;
> + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
> esac
> case $srcdir in
> *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
> - { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
> -$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
> - { (exit 1); exit 1; }; };;
> + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
> esac
>
> # Do `set' in a subshell so we don't clobber the current shell's
> @@ -2427,11 +2782,8 @@
> # if, for instance, CONFIG_SHELL is bash and it inherits a
> # broken ls alias from the environment. This has actually
> # happened. Such a system could not be considered "sane".
> - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
> -alias in your environment" >&5
> -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
> -alias in your environment" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "ls -t appears to fail. Make sure there is not a broken
> +alias in your environment" "$LINENO" 5
> fi
>
> test "$2" = conftest.file
> @@ -2440,13 +2792,10 @@
> # Ok.
> :
> else
> - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
> -Check your system clock" >&5
> -$as_echo "$as_me: error: newly created file is older than distributed files!
> -Check your system clock" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "newly created file is older than distributed files!
> +Check your system clock" "$LINENO" 5
> fi
> -{ $as_echo "$as_me:$LINENO: result: yes" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> test "$program_prefix" != NONE &&
> program_transform_name="s&^&$program_prefix&;$program_transform_name"
> @@ -2474,7 +2823,7 @@
> am_missing_run="$MISSING --run "
> else
> am_missing_run=
> - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
> + { $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;}
> fi
>
> @@ -2495,9 +2844,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_STRIP+set}" = set; then
> +if test "${ac_cv_prog_STRIP+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$STRIP"; then
> @@ -2508,24 +2857,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_STRIP="${ac_tool_prefix}strip"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> STRIP=$ac_cv_prog_STRIP
> if test -n "$STRIP"; then
> - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
> $as_echo "$STRIP" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -2535,9 +2884,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_STRIP"; then
> @@ -2548,24 +2897,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_STRIP="strip"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
> if test -n "$ac_ct_STRIP"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
> $as_echo "$ac_ct_STRIP" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -2574,7 +2923,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -2587,10 +2936,10 @@
> fi
> INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
>
> -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
> +{ $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; }
> if test -z "$MKDIR_P"; then
> - if test "${ac_cv_path_mkdir+set}" = set; then
> + if test "${ac_cv_path_mkdir+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> @@ -2598,7 +2947,7 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_prog in mkdir gmkdir; do
> + for ac_prog in mkdir gmkdir; do
> for ac_exec_ext in '' $ac_executable_extensions; do
> { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
> case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
> @@ -2610,7 +2959,7 @@
> esac
> done
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> @@ -2626,7 +2975,7 @@
> MKDIR_P="$ac_install_sh -d"
> fi
> fi
> -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
> $as_echo "$MKDIR_P" >&6; }
>
> mkdir_p="$MKDIR_P"
> @@ -2639,9 +2988,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_AWK+set}" = set; then
> +if test "${ac_cv_prog_AWK+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$AWK"; then
> @@ -2652,24 +3001,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_AWK="$ac_prog"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> AWK=$ac_cv_prog_AWK
> if test -n "$AWK"; then
> - { $as_echo "$as_me:$LINENO: result: $AWK" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
> $as_echo "$AWK" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -2677,11 +3026,11 @@
> test -n "$AWK" && break
> done
>
> -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
> $as_echo_n "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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
> +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
> $as_echo_n "(cached) " >&6
> else
> cat >conftest.make <<\_ACEOF
> @@ -2699,11 +3048,11 @@
> rm -f conftest.make
> fi
> if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> SET_MAKE=
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> SET_MAKE="MAKE=${MAKE-make}"
> fi
> @@ -2723,9 +3072,7 @@
> am__isrc=' -I$(srcdir)'
> # test to see if srcdir already configured
> if test -f $srcdir/config.status; then
> - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
> -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
> fi
> fi
>
> @@ -2741,7 +3088,7 @@
>
> # Define the identity of the package.
> PACKAGE='connman'
> - VERSION='0.54'
> + VERSION='0.54.2'
>
>
> cat >>confdefs.h <<_ACEOF
> @@ -2785,7 +3132,7 @@
>
>
> # Check whether --enable-silent-rules was given.
> -if test "${enable_silent_rules+set}" = set; then
> +if test "${enable_silent_rules+set}" = set; then :
> enableval=$enable_silent_rules;
> fi
>
> @@ -2798,16 +3145,16 @@
>
>
>
> -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
> +{ $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; }
> # Check whether --enable-maintainer-mode was given.
> -if test "${enable_maintainer_mode+set}" = set; then
> +if test "${enable_maintainer_mode+set}" = set; then :
> enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
> else
> USE_MAINTAINER_MODE=no
> fi
>
> - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
> $as_echo "$USE_MAINTAINER_MODE" >&6; }
> if test $USE_MAINTAINER_MODE = yes; then
> MAINTAINER_MODE_TRUE=
> @@ -2829,9 +3176,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
> +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $PKG_CONFIG in
> @@ -2844,14 +3191,14 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -2859,10 +3206,10 @@
> fi
> PKG_CONFIG=$ac_cv_path_PKG_CONFIG
> if test -n "$PKG_CONFIG"; then
> - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
> $as_echo "$PKG_CONFIG" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -2872,9 +3219,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
> +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $ac_pt_PKG_CONFIG in
> @@ -2887,14 +3234,14 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -2902,10 +3249,10 @@
> fi
> ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
> if test -n "$ac_pt_PKG_CONFIG"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
> $as_echo "$ac_pt_PKG_CONFIG" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -2914,7 +3261,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -2927,13 +3274,13 @@
> fi
> if test -n "$PKG_CONFIG"; then
> _pkg_min_version=0.9.0
> - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
> $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
> if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> PKG_CONFIG=""
> fi
> @@ -2973,9 +3320,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_CC+set}" = set; then
> +if test "${ac_cv_prog_CC+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$CC"; then
> @@ -2986,24 +3333,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_CC="${ac_tool_prefix}gcc"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> CC=$ac_cv_prog_CC
> if test -n "$CC"; then
> - { $as_echo "$as_me:$LINENO: result: $CC" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> $as_echo "$CC" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -3013,9 +3360,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_CC"; then
> @@ -3026,24 +3373,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_CC="gcc"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_CC=$ac_cv_prog_ac_ct_CC
> if test -n "$ac_ct_CC"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
> $as_echo "$ac_ct_CC" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -3052,7 +3399,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -3066,9 +3413,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_CC+set}" = set; then
> +if test "${ac_cv_prog_CC+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$CC"; then
> @@ -3079,24 +3426,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_CC="${ac_tool_prefix}cc"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> CC=$ac_cv_prog_CC
> if test -n "$CC"; then
> - { $as_echo "$as_me:$LINENO: result: $CC" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> $as_echo "$CC" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -3106,9 +3453,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_CC+set}" = set; then
> +if test "${ac_cv_prog_CC+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$CC"; then
> @@ -3120,18 +3467,18 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> 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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> if test $ac_prog_rejected = yes; then
> @@ -3150,10 +3497,10 @@
> fi
> CC=$ac_cv_prog_CC
> if test -n "$CC"; then
> - { $as_echo "$as_me:$LINENO: result: $CC" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> $as_echo "$CC" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -3165,9 +3512,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_CC+set}" = set; then
> +if test "${ac_cv_prog_CC+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$CC"; then
> @@ -3178,24 +3525,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> CC=$ac_cv_prog_CC
> if test -n "$CC"; then
> - { $as_echo "$as_me:$LINENO: result: $CC" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
> $as_echo "$CC" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -3209,9 +3556,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_CC"; then
> @@ -3222,24 +3569,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_CC="$ac_prog"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_CC=$ac_cv_prog_ac_ct_CC
> if test -n "$ac_ct_CC"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
> $as_echo "$ac_ct_CC" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -3252,7 +3599,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -3263,73 +3610,55 @@
> fi
>
>
> -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
> +test -z "$CC" && { { $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:$LINENO: error: no acceptable C compiler found in \$PATH
> -See \`config.log' for more details." >&5
> -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
> -See \`config.log' for more details." >&2;}
> - { (exit 1); exit 1; }; }; }
> +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:$LINENO: checking for C compiler version" >&5
> +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
> set X $ac_compile
> ac_compiler=$2
> -{ (ac_try="$ac_compiler --version >&5"
> -case "(($ac_try" in
> - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> - *) ac_try_echo=$ac_try;;
> -esac
> -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compiler --version >&5") 2>&5
> - ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }
> -{ (ac_try="$ac_compiler -v >&5"
> -case "(($ac_try" in
> - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> - *) ac_try_echo=$ac_try;;
> -esac
> -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compiler -v >&5") 2>&5
> - ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }
> -{ (ac_try="$ac_compiler -V >&5"
> +for ac_option in --version -v -V -qversion; 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compiler -V >&5") 2>&5
> +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> +$as_echo "$ac_try_echo"; } >&5
> + (eval "$ac_compiler $ac_option >&5") 2>conftest.err
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }
> + if test -s conftest.err; then
> + sed '10a\
> +... rest of stderr output deleted ...
> + 10q' conftest.err >conftest.er1
> + cat conftest.er1 >&5
> + rm -f conftest.er1 conftest.err
> + fi
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }
> +done
>
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> -
> +#include <stdio.h>
> int
> main ()
> {
> +FILE *f = fopen ("conftest.out", "w");
> + return ferror (f) || fclose (f) != 0;
>
> ;
> return 0;
> }
> _ACEOF
> ac_clean_files_save=$ac_clean_files
> -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
> +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.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:$LINENO: checking for C compiler default output file name" >&5
> +{ $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; }
> ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
>
> @@ -3346,17 +3675,17 @@
> done
> rm -f $ac_rmfiles
>
> -if { (ac_try="$ac_link_default"
> +if { { ac_try="$ac_link_default"
> case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> +$as_echo "$ac_try_echo"; } >&5
> (eval "$ac_link_default") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$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,
> @@ -3373,7 +3702,7 @@
> # certainly right.
> break;;
> *.* )
> - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
> + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
> then :; else
> ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
> fi
> @@ -3392,84 +3721,75 @@
> else
> ac_file=''
> fi
> -
> -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
> $as_echo "$ac_file" >&6; }
> -if test -z "$ac_file"; then
> +if test -z "$ac_file"; then :
> $as_echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
>
> -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
> +{ { $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:$LINENO: error: C compiler cannot create executables
> -See \`config.log' for more details." >&5
> -$as_echo "$as_me: error: C compiler cannot create executables
> -See \`config.log' for more details." >&2;}
> - { (exit 77); exit 77; }; }; }
> +{ as_fn_set_status 77
> +as_fn_error "C compiler cannot create executables
> +See \`config.log' for more details." "$LINENO" 5; }; }
> fi
> -
> ac_exeext=$ac_cv_exeext
>
> # Check that the compiler produces executables we can run. If not, either
> # the compiler is broken, or we cross compile.
> -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
> $as_echo_n "checking whether the C compiler works... " >&6; }
> -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
> # If not cross compiling, check that we can run a simple program.
> if test "$cross_compiling" != yes; then
> if { ac_try='./$ac_file'
> - { (case "(($ac_try" in
> + { { case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> +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:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; }; then
> + $as_echo "$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:$LINENO: error: in \`$ac_pwd':" >&5
> + { { $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:$LINENO: error: cannot run C compiled programs.
> -If you meant to cross compile, use \`--host'.
> -See \`config.log' for more details." >&5
> -$as_echo "$as_me: error: cannot run C compiled programs.
> +as_fn_error "cannot run C compiled programs.
> If you meant to cross compile, use \`--host'.
> -See \`config.log' for more details." >&2;}
> - { (exit 1); exit 1; }; }; }
> +See \`config.log' for more details." "$LINENO" 5; }
> fi
> fi
> fi
> -{ $as_echo "$as_me:$LINENO: result: yes" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
>
> -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
> +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
> ac_clean_files=$ac_clean_files_save
> # Check that the compiler produces executables we can run. If not, either
> # the compiler is broken, or we cross compile.
> -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
> $as_echo_n "checking whether we are cross compiling... " >&6; }
> -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
> $as_echo "$cross_compiling" >&6; }
>
> -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
> $as_echo_n "checking for suffix of executables... " >&6; }
> -if { (ac_try="$ac_link"
> +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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> +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:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$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
> @@ -3484,32 +3804,24 @@
> esac
> done
> else
> - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
> + { { $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:$LINENO: error: cannot compute suffix of executables: cannot compile and link
> -See \`config.log' for more details." >&5
> -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
> -See \`config.log' for more details." >&2;}
> - { (exit 1); exit 1; }; }; }
> +as_fn_error "cannot compute suffix of executables: cannot compile and link
> +See \`config.log' for more details." "$LINENO" 5; }
> fi
> -
> rm -f conftest$ac_cv_exeext
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
> $as_echo "$ac_cv_exeext" >&6; }
>
> rm -f conftest.$ac_ext
> EXEEXT=$ac_cv_exeext
> ac_exeext=$EXEEXT
> -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
> +{ $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 test "${ac_cv_objext+set}" = set; then
> +if test "${ac_cv_objext+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -3521,17 +3833,17 @@
> }
> _ACEOF
> rm -f conftest.o conftest.obj
> -if { (ac_try="$ac_compile"
> +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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
> +$as_echo "$ac_try_echo"; } >&5
> (eval "$ac_compile") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$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
> @@ -3544,31 +3856,23 @@
> $as_echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
>
> -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
> +{ { $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:$LINENO: error: cannot compute suffix of object files: cannot compile
> -See \`config.log' for more details." >&5
> -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
> -See \`config.log' for more details." >&2;}
> - { (exit 1); exit 1; }; }; }
> +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:$LINENO: result: $ac_cv_objext" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
> $as_echo "$ac_cv_objext" >&6; }
> OBJEXT=$ac_cv_objext
> ac_objext=$OBJEXT
> -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
> +{ $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 test "${ac_cv_c_compiler_gnu+set}" = set; then
> +if test "${ac_cv_c_compiler_gnu+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -3582,37 +3886,16 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> +if ac_fn_c_try_compile "$LINENO"; then :
> ac_compiler_gnu=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_compiler_gnu=no
> + ac_compiler_gnu=no
> fi
> -
> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> ac_cv_c_compiler_gnu=$ac_compiler_gnu
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
> $as_echo "$ac_cv_c_compiler_gnu" >&6; }
> if test $ac_compiler_gnu = yes; then
> GCC=yes
> @@ -3621,20 +3904,16 @@
> fi
> ac_test_CFLAGS=${CFLAGS+set}
> ac_save_CFLAGS=$CFLAGS
> -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
> $as_echo_n "checking whether $CC accepts -g... " >&6; }
> -if test "${ac_cv_prog_cc_g+set}" = set; then
> +if test "${ac_cv_prog_cc_g+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_save_c_werror_flag=$ac_c_werror_flag
> ac_c_werror_flag=yes
> ac_cv_prog_cc_g=no
> CFLAGS="-g"
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -3645,35 +3924,11 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> +if ac_fn_c_try_compile "$LINENO"; then :
> ac_cv_prog_cc_g=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - CFLAGS=""
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + CFLAGS=""
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -3684,36 +3939,12 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - :
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> +if ac_fn_c_try_compile "$LINENO"; then :
>
> - ac_c_werror_flag=$ac_save_c_werror_flag
> +else
> + ac_c_werror_flag=$ac_save_c_werror_flag
> CFLAGS="-g"
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -3724,42 +3955,17 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> +if ac_fn_c_try_compile "$LINENO"; then :
> ac_cv_prog_cc_g=yes
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> -
> fi
> -
> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> fi
> -
> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> fi
> -
> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> ac_c_werror_flag=$ac_save_c_werror_flag
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
> +{ $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
> CFLAGS=$ac_save_CFLAGS
> @@ -3776,18 +3982,14 @@
> CFLAGS=
> fi
> fi
> -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
> +{ $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 test "${ac_cv_prog_cc_c89+set}" = set; then
> +if test "${ac_cv_prog_cc_c89+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_cv_prog_cc_c89=no
> ac_save_CC=$CC
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> #include <stdarg.h>
> #include <stdio.h>
> @@ -3844,32 +4046,9 @@
> -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
> do
> CC="$ac_save_CC $ac_arg"
> - rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> + if ac_fn_c_try_compile "$LINENO"; then :
> ac_cv_prog_cc_c89=$ac_arg
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> -
> fi
> -
> rm -f core conftest.err conftest.$ac_objext
> test "x$ac_cv_prog_cc_c89" != "xno" && break
> done
> @@ -3880,17 +4059,19 @@
> # AC_CACHE_VAL
> case "x$ac_cv_prog_cc_c89" in
> x)
> - { $as_echo "$as_me:$LINENO: result: none needed" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
> $as_echo "none needed" >&6; } ;;
> xno)
> - { $as_echo "$as_me:$LINENO: result: unsupported" >&5
> + { $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:$LINENO: result: $ac_cv_prog_cc_c89" >&5
> + { $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 :
>
> +fi
>
> ac_ext=c
> ac_cpp='$CPP $CPPFLAGS'
> @@ -3909,7 +4090,7 @@
> .PHONY: am__doit
> END
> # If we don't find an include directive, just comment out the code.
> -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
> $as_echo_n "checking for style of include used by $am_make... " >&6; }
> am__include="#"
> am__quote=
> @@ -3937,12 +4118,12 @@
> fi
>
>
> -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
> $as_echo "$_am_result" >&6; }
> rm -f confinc confmf
>
> # Check whether --enable-dependency-tracking was given.
> -if test "${enable_dependency_tracking+set}" = set; then
> +if test "${enable_dependency_tracking+set}" = set; then :
> enableval=$enable_dependency_tracking;
> fi
>
> @@ -3962,9 +4143,9 @@
>
> depcc="$CC" am_compiler_list=
>
> -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
> $as_echo_n "checking dependency style of $depcc... " >&6; }
> -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
> +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
> @@ -4072,7 +4253,7 @@
> fi
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
> $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
> CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
>
> @@ -4088,22 +4269,18 @@
>
>
> if test "x$CC" != xcc; then
> - { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
> $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
> else
> - { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
> + { $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; }
> fi
> set dummy $CC; ac_cc=`$as_echo "$2" |
> sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
> -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
> +if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
> $as_echo_n "(cached) " >&6
> else
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -4119,63 +4296,63 @@
> # existing .o file with -o, though they will create one.
> ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
> rm -f conftest2.*
> -if { (case "(($ac_try" in
> +if { { case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> +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:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } &&
> - test -f conftest2.$ac_objext && { (case "(($ac_try" in
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; } &&
> + test -f conftest2.$ac_objext && { { case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> +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:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); };
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; };
> then
> eval ac_cv_prog_cc_${ac_cc}_c_o=yes
> if test "x$CC" != xcc; then
> # Test first that cc exists at all.
> if { ac_try='cc -c conftest.$ac_ext >&5'
> - { (case "(($ac_try" in
> + { { case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> +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:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; }; then
> ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
> rm -f conftest2.*
> - if { (case "(($ac_try" in
> + if { { case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> +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:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } &&
> - test -f conftest2.$ac_objext && { (case "(($ac_try" in
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; } &&
> + test -f conftest2.$ac_objext && { { case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> +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:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); };
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; };
> then
> # cc works too.
> :
> @@ -4192,15 +4369,13 @@
>
> fi
> if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
>
> -cat >>confdefs.h <<\_ACEOF
> -#define NO_MINUS_C_MINUS_O 1
> -_ACEOF
> +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
>
> fi
>
> @@ -4220,9 +4395,9 @@
>
>
>
> - { $as_echo "$as_me:$LINENO: checking whether ${CC-cc} accepts -fPIE" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC-cc} accepts -fPIE" >&5
> $as_echo_n "checking whether ${CC-cc} accepts -fPIE... " >&6; }
> -if test "${ac_cv_prog_cc_pie+set}" = set; then
> +if test "${ac_cv_prog_cc_pie+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
>
> @@ -4235,105 +4410,13 @@
> rm -rf conftest*
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_pie" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_pie" >&5
> $as_echo "$ac_cv_prog_cc_pie" >&6; }
>
> -# 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:$LINENO: checking for a BSD-compatible install" >&5
> -$as_echo_n "checking for a BSD-compatible install... " >&6; }
> -if test -z "$INSTALL"; then
> -if test "${ac_cv_path_install+set}" = set; 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 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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+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:$LINENO: result: $INSTALL" >&5
> -$as_echo "$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'
>
> -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
> +{ $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 test "${ac_cv_path_SED+set}" = set; then
> +if test "${ac_cv_path_SED+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
> @@ -4341,7 +4424,7 @@
> ac_script="$ac_script$as_nl$ac_script"
> done
> echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
> - $as_unset ac_script || ac_script=
> + { ac_script=; unset ac_script;}
> if test -z "$SED"; then
> ac_path_SED_found=false
> # Loop through the user's path and test for each of PROGNAME-LIST
> @@ -4350,7 +4433,7 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_prog in sed gsed; do
> + 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"
> { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
> @@ -4370,7 +4453,7 @@
> $as_echo '' >> "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
> - ac_count=`expr $ac_count + 1`
> + as_fn_arith $ac_count + 1 && ac_count=$as_val
> if test $ac_count -gt ${ac_path_SED_max-0}; then
> # Best one so far, save it but keep looking for a better one
> ac_cv_path_SED="$ac_path_SED"
> @@ -4385,19 +4468,17 @@
> $ac_path_SED_found && break 3
> done
> done
> -done
> + done
> IFS=$as_save_IFS
> if test -z "$ac_cv_path_SED"; then
> - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
> -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
> fi
> else
> ac_cv_path_SED=$SED
> fi
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
> $as_echo "$ac_cv_path_SED" >&6; }
> SED="$ac_cv_path_SED"
> rm -f conftest.sed
> @@ -4406,9 +4487,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_AWK+set}" = set; then
> +if test "${ac_cv_prog_AWK+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$AWK"; then
> @@ -4419,24 +4500,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_AWK="$ac_prog"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> AWK=$ac_cv_prog_AWK
> if test -n "$AWK"; then
> - { $as_echo "$as_me:$LINENO: result: $AWK" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
> $as_echo "$AWK" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -4455,7 +4536,7 @@
>
>
> # Check whether --enable-static was given.
> -if test "${enable_static+set}" = set; then
> +if test "${enable_static+set}" = set; then :
> enableval=$enable_static; p=${PACKAGE-default}
> case $enableval in
> yes) enable_static=yes ;;
> @@ -4487,14 +4568,14 @@
>
> case `pwd` in
> *\ * | *\ *)
> - { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
> + { $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;} ;;
> esac
>
>
>
> -macro_version='2.2.6b'
> -macro_revision='1.3017'
> +macro_version='2.2.6'
> +macro_revision='1.3012'
>
>
>
> @@ -4512,35 +4593,27 @@
>
> # Make sure we can run config.sub.
> $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
> - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
> -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
>
> -{ $as_echo "$as_me:$LINENO: checking build system type" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
> $as_echo_n "checking build system type... " >&6; }
> -if test "${ac_cv_build+set}" = set; then
> +if test "${ac_cv_build+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_build_alias=$build_alias
> test "x$ac_build_alias" = x &&
> ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
> test "x$ac_build_alias" = x &&
> - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
> -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
> - { (exit 1); exit 1; }; }
> + 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_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
> -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
> $as_echo "$ac_cv_build" >&6; }
> case $ac_cv_build in
> *-*-*) ;;
> -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
> -$as_echo "$as_me: error: invalid value of canonical build" >&2;}
> - { (exit 1); exit 1; }; };;
> +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
> esac
> build=$ac_cv_build
> ac_save_IFS=$IFS; IFS='-'
> @@ -4556,28 +4629,24 @@
> case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
>
>
> -{ $as_echo "$as_me:$LINENO: checking host system type" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
> $as_echo_n "checking host system type... " >&6; }
> -if test "${ac_cv_host+set}" = set; then
> +if test "${ac_cv_host+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> 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_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
> -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
> fi
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
> $as_echo "$ac_cv_host" >&6; }
> case $ac_cv_host in
> *-*-*) ;;
> -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
> -$as_echo "$as_me: error: invalid value of canonical host" >&2;}
> - { (exit 1); exit 1; }; };;
> +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
> esac
> host=$ac_cv_host
> ac_save_IFS=$IFS; IFS='-'
> @@ -4593,9 +4662,9 @@
> case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
>
>
> -{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
> +{ $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 test "${ac_cv_path_SED+set}" = set; then
> +if test "${ac_cv_path_SED+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
> @@ -4603,7 +4672,7 @@
> ac_script="$ac_script$as_nl$ac_script"
> done
> echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
> - $as_unset ac_script || ac_script=
> + { ac_script=; unset ac_script;}
> if test -z "$SED"; then
> ac_path_SED_found=false
> # Loop through the user's path and test for each of PROGNAME-LIST
> @@ -4612,7 +4681,7 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_prog in sed gsed; do
> + 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"
> { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
> @@ -4632,7 +4701,7 @@
> $as_echo '' >> "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
> - ac_count=`expr $ac_count + 1`
> + as_fn_arith $ac_count + 1 && ac_count=$as_val
> if test $ac_count -gt ${ac_path_SED_max-0}; then
> # Best one so far, save it but keep looking for a better one
> ac_cv_path_SED="$ac_path_SED"
> @@ -4647,19 +4716,17 @@
> $ac_path_SED_found && break 3
> done
> done
> -done
> + done
> IFS=$as_save_IFS
> if test -z "$ac_cv_path_SED"; then
> - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
> -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
> fi
> else
> ac_cv_path_SED=$SED
> fi
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
> $as_echo "$ac_cv_path_SED" >&6; }
> SED="$ac_cv_path_SED"
> rm -f conftest.sed
> @@ -4677,9 +4744,9 @@
>
>
>
> -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
> +{ $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 test "${ac_cv_path_GREP+set}" = set; then
> +if test "${ac_cv_path_GREP+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -z "$GREP"; then
> @@ -4690,7 +4757,7 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_prog in grep ggrep; do
> + 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"
> { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
> @@ -4710,7 +4777,7 @@
> $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
> - ac_count=`expr $ac_count + 1`
> + 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"
> @@ -4725,26 +4792,24 @@
> $ac_path_GREP_found && break 3
> done
> done
> -done
> + done
> IFS=$as_save_IFS
> if test -z "$ac_cv_path_GREP"; then
> - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
> -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
> - { (exit 1); exit 1; }; }
> + 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
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
> +{ $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:$LINENO: checking for egrep" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
> $as_echo_n "checking for egrep... " >&6; }
> -if test "${ac_cv_path_EGREP+set}" = set; then
> +if test "${ac_cv_path_EGREP+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
> @@ -4758,7 +4823,7 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_prog in egrep; do
> + 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"
> { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
> @@ -4778,7 +4843,7 @@
> $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
> - ac_count=`expr $ac_count + 1`
> + 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"
> @@ -4793,12 +4858,10 @@
> $ac_path_EGREP_found && break 3
> done
> done
> -done
> + done
> IFS=$as_save_IFS
> if test -z "$ac_cv_path_EGREP"; then
> - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
> -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
> - { (exit 1); exit 1; }; }
> + 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
> @@ -4806,14 +4869,14 @@
>
> fi
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
> +{ $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:$LINENO: checking for fgrep" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
> $as_echo_n "checking for fgrep... " >&6; }
> -if test "${ac_cv_path_FGREP+set}" = set; then
> +if test "${ac_cv_path_FGREP+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
> @@ -4827,7 +4890,7 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_prog in fgrep; do
> + 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"
> { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
> @@ -4847,7 +4910,7 @@
> $as_echo '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
> - ac_count=`expr $ac_count + 1`
> + as_fn_arith $ac_count + 1 && ac_count=$as_val
> if test $ac_count -gt ${ac_path_FGREP_max-0}; then
> # Best one so far, save it but keep looking for a better one
> ac_cv_path_FGREP="$ac_path_FGREP"
> @@ -4862,12 +4925,10 @@
> $ac_path_FGREP_found && break 3
> done
> done
> -done
> + done
> IFS=$as_save_IFS
> if test -z "$ac_cv_path_FGREP"; then
> - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
> -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
> fi
> else
> ac_cv_path_FGREP=$FGREP
> @@ -4875,7 +4936,7 @@
>
> fi
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
> $as_echo "$ac_cv_path_FGREP" >&6; }
> FGREP="$ac_cv_path_FGREP"
>
> @@ -4901,7 +4962,7 @@
>
>
> # Check whether --with-gnu-ld was given.
> -if test "${with_gnu_ld+set}" = set; then
> +if test "${with_gnu_ld+set}" = set; then :
> withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
> else
> with_gnu_ld=no
> @@ -4910,7 +4971,7 @@
> ac_prog=ld
> if test "$GCC" = yes; then
> # Check if gcc -print-prog-name=ld gives a path.
> - { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
> $as_echo_n "checking for ld used by $CC... " >&6; }
> case $host in
> *-*-mingw*)
> @@ -4940,13 +5001,13 @@
> ;;
> esac
> elif test "$with_gnu_ld" = yes; then
> - { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
> $as_echo_n "checking for GNU ld... " >&6; }
> else
> - { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
> $as_echo_n "checking for non-GNU ld... " >&6; }
> fi
> -if test "${lt_cv_path_LD+set}" = set; then
> +if test "${lt_cv_path_LD+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -z "$LD"; then
> @@ -4977,18 +5038,16 @@
>
> LD="$lt_cv_path_LD"
> if test -n "$LD"; then
> - { $as_echo "$as_me:$LINENO: result: $LD" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
> $as_echo "$LD" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
> -test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
> -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
> - { (exit 1); exit 1; }; }
> -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
> +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 test "${lt_cv_prog_gnu_ld+set}" = set; then
> +if test "${lt_cv_prog_gnu_ld+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> # I'd rather use --version here, but apparently some GNU lds only accept -v.
> @@ -5001,7 +5060,7 @@
> ;;
> esac
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
> $as_echo "$lt_cv_prog_gnu_ld" >&6; }
> with_gnu_ld=$lt_cv_prog_gnu_ld
>
> @@ -5013,9 +5072,9 @@
>
>
>
> -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
> +{ $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 test "${lt_cv_path_NM+set}" = set; then
> +if test "${lt_cv_path_NM+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$NM"; then
> @@ -5062,7 +5121,7 @@
> : ${lt_cv_path_NM=no}
> fi
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
> $as_echo "$lt_cv_path_NM" >&6; }
> if test "$lt_cv_path_NM" != "no"; then
> NM="$lt_cv_path_NM"
> @@ -5073,9 +5132,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_DUMPBIN+set}" = set; then
> +if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$DUMPBIN"; then
> @@ -5086,24 +5145,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> DUMPBIN=$ac_cv_prog_DUMPBIN
> if test -n "$DUMPBIN"; then
> - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
> $as_echo "$DUMPBIN" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -5117,9 +5176,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_DUMPBIN"; then
> @@ -5130,24 +5189,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
> if test -n "$ac_ct_DUMPBIN"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
> $as_echo "$ac_ct_DUMPBIN" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -5160,7 +5219,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -5180,44 +5239,44 @@
>
>
>
> -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
> +{ $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 test "${lt_cv_nm_interface+set}" = set; then
> +if test "${lt_cv_nm_interface+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_nm_interface="BSD nm"
> echo "int some_variable = 0;" > conftest.$ac_ext
> - (eval echo "\"\$as_me:5190: $ac_compile\"" >&5)
> + (eval echo "\"\$as_me:5249: $ac_compile\"" >&5)
> (eval "$ac_compile" 2>conftest.err)
> cat conftest.err >&5
> - (eval echo "\"\$as_me:5193: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
> + (eval echo "\"\$as_me:5252: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
> (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
> cat conftest.err >&5
> - (eval echo "\"\$as_me:5196: output\"" >&5)
> + (eval echo "\"\$as_me:5255: output\"" >&5)
> cat conftest.out >&5
> if $GREP 'External.*some_variable' conftest.out > /dev/null; then
> lt_cv_nm_interface="MS dumpbin"
> fi
> rm -f conftest*
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
> $as_echo "$lt_cv_nm_interface" >&6; }
>
> -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
> $as_echo_n "checking whether ln -s works... " >&6; }
> LN_S=$as_ln_s
> if test "$LN_S" = "ln -s"; then
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
> $as_echo "no, using $LN_S" >&6; }
> fi
>
> # find the maximum length of command line arguments
> -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
> +{ $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 test "${lt_cv_sys_max_cmd_len+set}" = set; then
> +if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> i=0
> @@ -5335,10 +5394,10 @@
> fi
>
> if test -n $lt_cv_sys_max_cmd_len ; then
> - { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
> $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: none" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
> $as_echo "none" >&6; }
> fi
> max_cmd_len=$lt_cv_sys_max_cmd_len
> @@ -5352,7 +5411,7 @@
> : ${MV="mv -f"}
> : ${RM="rm -f"}
>
> -{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
> $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
> # Try some XSI features
> xsi_shell=no
> @@ -5362,17 +5421,17 @@
> && eval 'test $(( 1 + 1 )) -eq 2 \
> && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
> && xsi_shell=yes
> -{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
> $as_echo "$xsi_shell" >&6; }
>
>
> -{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
> $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
> lt_shell_append=no
> ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
>> /dev/null 2>&1 \
> && lt_shell_append=yes
> -{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
> $as_echo "$lt_shell_append" >&6; }
>
>
> @@ -5407,14 +5466,14 @@
>
>
>
> -{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
> +{ $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 test "${lt_cv_ld_reload_flag+set}" = set; then
> +if test "${lt_cv_ld_reload_flag+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_ld_reload_flag='-r'
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
> $as_echo "$lt_cv_ld_reload_flag" >&6; }
> reload_flag=$lt_cv_ld_reload_flag
> case $reload_flag in
> @@ -5443,9 +5502,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_OBJDUMP+set}" = set; then
> +if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$OBJDUMP"; then
> @@ -5456,24 +5515,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> OBJDUMP=$ac_cv_prog_OBJDUMP
> if test -n "$OBJDUMP"; then
> - { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
> $as_echo "$OBJDUMP" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -5483,9 +5542,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_OBJDUMP"; then
> @@ -5496,24 +5555,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_OBJDUMP="objdump"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
> if test -n "$ac_ct_OBJDUMP"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
> $as_echo "$ac_ct_OBJDUMP" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -5522,7 +5581,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -5542,9 +5601,9 @@
>
>
>
> -{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
> +{ $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 test "${lt_cv_deplibs_check_method+set}" = set; then
> +if test "${lt_cv_deplibs_check_method+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_file_magic_cmd='$MAGIC_CMD'
> @@ -5738,7 +5797,7 @@
> esac
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
> $as_echo "$lt_cv_deplibs_check_method" >&6; }
> file_magic_cmd=$lt_cv_file_magic_cmd
> deplibs_check_method=$lt_cv_deplibs_check_method
> @@ -5758,9 +5817,9 @@
> if test -n "$ac_tool_prefix"; then
> # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
> set dummy ${ac_tool_prefix}ar; ac_word=$2
> -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_AR+set}" = set; then
> +if test "${ac_cv_prog_AR+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$AR"; then
> @@ -5771,24 +5830,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_AR="${ac_tool_prefix}ar"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> AR=$ac_cv_prog_AR
> if test -n "$AR"; then
> - { $as_echo "$as_me:$LINENO: result: $AR" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
> $as_echo "$AR" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -5798,9 +5857,9 @@
> ac_ct_AR=$AR
> # Extract the first word of "ar", so it can be a program name with args.
> set dummy ar; ac_word=$2
> -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_AR"; then
> @@ -5811,24 +5870,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_AR="ar"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_AR=$ac_cv_prog_ac_ct_AR
> if test -n "$ac_ct_AR"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
> $as_echo "$ac_ct_AR" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -5837,7 +5896,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -5863,9 +5922,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_STRIP+set}" = set; then
> +if test "${ac_cv_prog_STRIP+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$STRIP"; then
> @@ -5876,24 +5935,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_STRIP="${ac_tool_prefix}strip"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> STRIP=$ac_cv_prog_STRIP
> if test -n "$STRIP"; then
> - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
> $as_echo "$STRIP" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -5903,9 +5962,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_STRIP"; then
> @@ -5916,24 +5975,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_STRIP="strip"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
> if test -n "$ac_ct_STRIP"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
> $as_echo "$ac_ct_STRIP" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -5942,7 +6001,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -5962,9 +6021,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_RANLIB+set}" = set; then
> +if test "${ac_cv_prog_RANLIB+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$RANLIB"; then
> @@ -5975,24 +6034,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> RANLIB=$ac_cv_prog_RANLIB
> if test -n "$RANLIB"; then
> - { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
> $as_echo "$RANLIB" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -6002,9 +6061,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_RANLIB"; then
> @@ -6015,24 +6074,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_RANLIB="ranlib"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
> if test -n "$ac_ct_RANLIB"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
> $as_echo "$ac_ct_RANLIB" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -6041,7 +6100,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -6119,9 +6178,9 @@
>
>
> # Check for command to grab the raw symbol name followed by C symbol from nm.
> -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
> +{ $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 test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
> +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
>
> @@ -6237,18 +6296,18 @@
> int main(){nm_test_var='a';nm_test_func();return(0);}
> _LT_EOF
>
> - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
> + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
> (eval $ac_compile) 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$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:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
> + 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:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && test -s "$nlist"; then
> + $as_echo "$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
> mv -f "$nlist"T "$nlist"
> @@ -6301,11 +6360,11 @@
> lt_save_CFLAGS="$CFLAGS"
> LIBS="conftstm.$ac_objext"
> CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
> - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
> + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
> (eval $ac_link) 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && test -s conftest${ac_exeext}; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; } && test -s conftest${ac_exeext}; then
> pipe_works=yes
> fi
> LIBS="$lt_save_LIBS"
> @@ -6339,10 +6398,10 @@
> 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:$LINENO: result: failed" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
> $as_echo "failed" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: ok" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
> $as_echo "ok" >&6; }
> fi
>
> @@ -6369,7 +6428,7 @@
>
>
> # Check whether --enable-libtool-lock was given.
> -if test "${enable_libtool_lock+set}" = set; then
> +if test "${enable_libtool_lock+set}" = set; then :
> enableval=$enable_libtool_lock;
> fi
>
> @@ -6381,11 +6440,11 @@
> ia64-*-hpux*)
> # Find out which ABI we are using.
> echo 'int i;' > conftest.$ac_ext
> - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
> + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
> (eval $ac_compile) 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> case `/usr/bin/file conftest.$ac_objext` in
> *ELF-32*)
> HPUX_IA64_MODE="32"
> @@ -6399,12 +6458,12 @@
> ;;
> *-*-irix6*)
> # Find out which ABI we are using.
> - echo '#line 6402 "configure"' > conftest.$ac_ext
> - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
> + echo '#line 6461 "configure"' > 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:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> if test "$lt_cv_prog_gnu_ld" = yes; then
> case `/usr/bin/file conftest.$ac_objext` in
> *32-bit*)
> @@ -6438,11 +6497,11 @@
> s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
> # Find out which ABI we are using.
> echo 'int i;' > conftest.$ac_ext
> - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
> + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
> (eval $ac_compile) 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> case `/usr/bin/file conftest.o` in
> *32-bit*)
> case $host in
> @@ -6491,9 +6550,9 @@
> # On SCO OpenServer 5, we need -belf to get full-featured binaries.
> SAVE_CFLAGS="$CFLAGS"
> CFLAGS="$CFLAGS -belf"
> - { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
> + { $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 test "${lt_cv_cc_needs_belf+set}" = set; then
> +if test "${lt_cv_cc_needs_belf+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_ext=c
> @@ -6502,11 +6561,7 @@
> ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
> ac_compiler_gnu=$ac_cv_c_compiler_gnu
>
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -6517,38 +6572,13 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> lt_cv_cc_needs_belf=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - lt_cv_cc_needs_belf=no
> + lt_cv_cc_needs_belf=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> ac_ext=c
> ac_cpp='$CPP $CPPFLAGS'
> ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> @@ -6556,7 +6586,7 @@
> ac_compiler_gnu=$ac_cv_c_compiler_gnu
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
> $as_echo "$lt_cv_cc_needs_belf" >&6; }
> if test x"$lt_cv_cc_needs_belf" != x"yes"; then
> # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
> @@ -6566,11 +6596,11 @@
> sparc*-*solaris*)
> # Find out which ABI we are using.
> echo 'int i;' > conftest.$ac_ext
> - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
> + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
> (eval $ac_compile) 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> case `/usr/bin/file conftest.o` in
> *64-bit*)
> case $lt_cv_prog_gnu_ld in
> @@ -6596,9 +6626,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
> +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$DSYMUTIL"; then
> @@ -6609,24 +6639,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> DSYMUTIL=$ac_cv_prog_DSYMUTIL
> if test -n "$DSYMUTIL"; then
> - { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
> $as_echo "$DSYMUTIL" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -6636,9 +6666,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_DSYMUTIL"; then
> @@ -6649,24 +6679,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
> if test -n "$ac_ct_DSYMUTIL"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
> $as_echo "$ac_ct_DSYMUTIL" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -6675,7 +6705,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -6688,9 +6718,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_NMEDIT+set}" = set; then
> +if test "${ac_cv_prog_NMEDIT+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$NMEDIT"; then
> @@ -6701,24 +6731,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> NMEDIT=$ac_cv_prog_NMEDIT
> if test -n "$NMEDIT"; then
> - { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
> $as_echo "$NMEDIT" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -6728,9 +6758,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_NMEDIT"; then
> @@ -6741,24 +6771,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_NMEDIT="nmedit"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
> if test -n "$ac_ct_NMEDIT"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
> $as_echo "$ac_ct_NMEDIT" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -6767,7 +6797,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -6780,9 +6810,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_LIPO+set}" = set; then
> +if test "${ac_cv_prog_LIPO+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$LIPO"; then
> @@ -6793,24 +6823,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> LIPO=$ac_cv_prog_LIPO
> if test -n "$LIPO"; then
> - { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
> $as_echo "$LIPO" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -6820,9 +6850,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_LIPO"; then
> @@ -6833,24 +6863,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_LIPO="lipo"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
> if test -n "$ac_ct_LIPO"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
> $as_echo "$ac_ct_LIPO" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -6859,7 +6889,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -6872,9 +6902,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_OTOOL+set}" = set; then
> +if test "${ac_cv_prog_OTOOL+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$OTOOL"; then
> @@ -6885,24 +6915,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> OTOOL=$ac_cv_prog_OTOOL
> if test -n "$OTOOL"; then
> - { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
> $as_echo "$OTOOL" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -6912,9 +6942,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_OTOOL"; then
> @@ -6925,24 +6955,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_OTOOL="otool"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
> if test -n "$ac_ct_OTOOL"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
> $as_echo "$ac_ct_OTOOL" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -6951,7 +6981,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -6964,9 +6994,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_OTOOL64+set}" = set; then
> +if test "${ac_cv_prog_OTOOL64+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$OTOOL64"; then
> @@ -6977,24 +7007,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> OTOOL64=$ac_cv_prog_OTOOL64
> if test -n "$OTOOL64"; then
> - { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
> $as_echo "$OTOOL64" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -7004,9 +7034,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_OTOOL64"; then
> @@ -7017,24 +7047,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_OTOOL64="otool64"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
> if test -n "$ac_ct_OTOOL64"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
> $as_echo "$ac_ct_OTOOL64" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -7043,7 +7073,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -7079,9 +7109,9 @@
>
>
>
> - { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
> + { $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 test "${lt_cv_apple_cc_single_mod+set}" = set; then
> +if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_apple_cc_single_mod=no
> @@ -7106,22 +7136,18 @@
> rm -f conftest.*
> fi
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
> $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
> - { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
> + { $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 test "${lt_cv_ld_exported_symbols_list+set}" = set; then
> +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_ld_exported_symbols_list=no
> save_LDFLAGS=$LDFLAGS
> echo "_main" > conftest.sym
> LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -7132,42 +7158,17 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> lt_cv_ld_exported_symbols_list=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - lt_cv_ld_exported_symbols_list=no
> + lt_cv_ld_exported_symbols_list=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LDFLAGS="$save_LDFLAGS"
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
> $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
> case $host_os in
> rhapsody* | darwin1.[012])
> @@ -7209,14 +7210,14 @@
> 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:$LINENO: checking how to run the C preprocessor" >&5
> +{ $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 test "${ac_cv_prog_CPP+set}" = set; then
> + if test "${ac_cv_prog_CPP+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> # Double quotes because CPP needs to be expanded
> @@ -7231,11 +7232,7 @@
> # <limits.h> 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 >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> #ifdef __STDC__
> # include <limits.h>
> @@ -7244,78 +7241,34 @@
> #endif
> Syntax error
> _ACEOF
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } >/dev/null && {
> - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - }; then
> - :
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> +if ac_fn_c_try_cpp "$LINENO"; then :
>
> +else
> # Broken: fails on valid input.
> continue
> fi
> -
> rm -f conftest.err conftest.$ac_ext
>
> # OK, works on sane cases. Now check whether nonexistent headers
> # can be detected and how.
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> #include <ac_nonexistent.h>
> _ACEOF
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } >/dev/null && {
> - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - }; then
> +if ac_fn_c_try_cpp "$LINENO"; then :
> # Broken: success on invalid input.
> continue
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> # Passes both tests.
> ac_preproc_ok=:
> break
> fi
> -
> rm -f conftest.err conftest.$ac_ext
>
> done
> # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
> rm -f conftest.err conftest.$ac_ext
> -if $ac_preproc_ok; then
> +if $ac_preproc_ok; then :
> break
> fi
>
> @@ -7327,7 +7280,7 @@
> else
> ac_cv_prog_CPP=$CPP
> fi
> -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
> +{ $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
> @@ -7338,11 +7291,7 @@
> # <limits.h> 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 >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> #ifdef __STDC__
> # include <limits.h>
> @@ -7351,87 +7300,40 @@
> #endif
> Syntax error
> _ACEOF
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } >/dev/null && {
> - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - }; then
> - :
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> +if ac_fn_c_try_cpp "$LINENO"; then :
>
> +else
> # Broken: fails on valid input.
> continue
> fi
> -
> rm -f conftest.err conftest.$ac_ext
>
> # OK, works on sane cases. Now check whether nonexistent headers
> # can be detected and how.
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> #include <ac_nonexistent.h>
> _ACEOF
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } >/dev/null && {
> - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - }; then
> +if ac_fn_c_try_cpp "$LINENO"; then :
> # Broken: success on invalid input.
> continue
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> # Passes both tests.
> ac_preproc_ok=:
> break
> fi
> -
> rm -f conftest.err conftest.$ac_ext
>
> done
> # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
> rm -f conftest.err conftest.$ac_ext
> -if $ac_preproc_ok; then
> - :
> +if $ac_preproc_ok; then :
> +
> else
> - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
> + { { $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:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
> -See \`config.log' for more details." >&5
> -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
> -See \`config.log' for more details." >&2;}
> - { (exit 1); exit 1; }; }; }
> +as_fn_error "C preprocessor \"$CPP\" fails sanity check
> +See \`config.log' for more details." "$LINENO" 5; }
> fi
>
> ac_ext=c
> @@ -7441,16 +7343,12 @@
> ac_compiler_gnu=$ac_cv_c_compiler_gnu
>
>
> -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
> +{ $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 test "${ac_cv_header_stdc+set}" = set; then
> +if test "${ac_cv_header_stdc+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> #include <stdlib.h>
> #include <stdarg.h>
> @@ -7465,48 +7363,23 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> +if ac_fn_c_try_compile "$LINENO"; then :
> ac_cv_header_stdc=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_header_stdc=no
> + 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 >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> #include <string.h>
>
> _ACEOF
> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> - $EGREP "memchr" >/dev/null 2>&1; then
> - :
> + $EGREP "memchr" >/dev/null 2>&1; then :
> +
> else
> ac_cv_header_stdc=no
> fi
> @@ -7516,18 +7389,14 @@
>
> if test $ac_cv_header_stdc = yes; then
> # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> #include <stdlib.h>
>
> _ACEOF
> if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
> - $EGREP "free" >/dev/null 2>&1; then
> - :
> + $EGREP "free" >/dev/null 2>&1; then :
> +
> else
> ac_cv_header_stdc=no
> fi
> @@ -7537,14 +7406,10 @@
>
> 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
> + if test "$cross_compiling" = yes; then :
> :
> else
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
> #include <ctype.h>
> #include <stdlib.h>
> @@ -7571,118 +7436,34 @@
> return 0;
> }
> _ACEOF
> -rm -f 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>&5
> - ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && { 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_try") 2>&5
> - ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; }; then
> - :
> -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
> +if ac_fn_c_try_run "$LINENO"; then :
>
> -( exit $ac_status )
> -ac_cv_header_stdc=no
> +else
> + ac_cv_header_stdc=no
> fi
> -rm -rf conftest.dSYM
> -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
> +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
> + conftest.$ac_objext conftest.beam conftest.$ac_ext
> fi
>
> -
> fi
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
> +{ $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
>
> -cat >>confdefs.h <<\_ACEOF
> -#define STDC_HEADERS 1
> -_ACEOF
> +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
>
> 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`
> -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
> -$as_echo_n "checking for $ac_header... " >&6; }
> -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
> - $as_echo_n "(cached) " >&6
> -else
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -$ac_includes_default
> -
> -#include <$ac_header>
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - eval "$as_ac_Header=yes"
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - eval "$as_ac_Header=no"
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -ac_res=`eval 'as_val=${'$as_ac_Header'}
> - $as_echo "$as_val"'`
> - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
> -$as_echo "$ac_res" >&6; }
> -as_val=`eval 'as_val=${'$as_ac_Header'}
> - $as_echo "$as_val"'`
> - if test "x$as_val" = x""yes; then
> +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
> +"
> +eval as_val=\$$as_ac_Header
> + if test "x$as_val" = x""yes; then :
> cat >>confdefs.h <<_ACEOF
> #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
> _ACEOF
> @@ -7692,62 +7473,13 @@
> done
>
>
> -
> for ac_header in dlfcn.h
> -do
> -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
> -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
> -$as_echo_n "checking for $ac_header... " >&6; }
> -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
> - $as_echo_n "(cached) " >&6
> -else
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -$ac_includes_default
> -
> -#include <$ac_header>
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - eval "$as_ac_Header=yes"
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - eval "$as_ac_Header=no"
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -ac_res=`eval 'as_val=${'$as_ac_Header'}
> - $as_echo "$as_val"'`
> - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
> -$as_echo "$ac_res" >&6; }
> -as_val=`eval 'as_val=${'$as_ac_Header'}
> - $as_echo "$as_val"'`
> - if test "x$as_val" = x""yes; then
> +do :
> + 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" = x""yes; then :
> cat >>confdefs.h <<_ACEOF
> -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
> +#define HAVE_DLFCN_H 1
> _ACEOF
>
> fi
> @@ -7767,7 +7499,7 @@
>
>
> # Check whether --enable-shared was given.
> -if test "${enable_shared+set}" = set; then
> +if test "${enable_shared+set}" = set; then :
> enableval=$enable_shared; p=${PACKAGE-default}
> case $enableval in
> yes) enable_shared=yes ;;
> @@ -7800,7 +7532,7 @@
>
>
> # Check whether --with-pic was given.
> -if test "${with_pic+set}" = set; then
> +if test "${with_pic+set}" = set; then :
> withval=$with_pic; pic_mode="$withval"
> else
> pic_mode=default
> @@ -7816,7 +7548,7 @@
>
>
> # Check whether --enable-fast-install was given.
> -if test "${enable_fast_install+set}" = set; then
> +if test "${enable_fast_install+set}" = set; then :
> enableval=$enable_fast_install; p=${PACKAGE-default}
> case $enableval in
> yes) enable_fast_install=yes ;;
> @@ -7897,9 +7629,9 @@
> setopt NO_GLOB_SUBST
> fi
>
> -{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
> $as_echo_n "checking for objdir... " >&6; }
> -if test "${lt_cv_objdir+set}" = set; then
> +if test "${lt_cv_objdir+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> rm -f .libs 2>/dev/null
> @@ -7912,7 +7644,7 @@
> fi
> rmdir .libs 2>/dev/null
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
> $as_echo "$lt_cv_objdir" >&6; }
> objdir=$lt_cv_objdir
>
> @@ -8005,9 +7737,9 @@
> case $deplibs_check_method in
> file_magic*)
> if test "$file_magic_cmd" = '$MAGIC_CMD'; then
> - { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
> + { $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 test "${lt_cv_path_MAGIC_CMD+set}" = set; then
> +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $MAGIC_CMD in
> @@ -8058,10 +7790,10 @@
>
> MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
> if test -n "$MAGIC_CMD"; then
> - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
> $as_echo "$MAGIC_CMD" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -8071,9 +7803,9 @@
>
> if test -z "$lt_cv_path_MAGIC_CMD"; then
> if test -n "$ac_tool_prefix"; then
> - { $as_echo "$as_me:$LINENO: checking for file" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
> $as_echo_n "checking for file... " >&6; }
> -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
> +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $MAGIC_CMD in
> @@ -8124,10 +7856,10 @@
>
> MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
> if test -n "$MAGIC_CMD"; then
> - { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
> $as_echo "$MAGIC_CMD" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -8204,9 +7936,9 @@
> if test "$GCC" = yes; then
> lt_prog_compiler_no_builtin_flag=' -fno-builtin'
>
> - { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
> + { $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 test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
> +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_prog_compiler_rtti_exceptions=no
> @@ -8222,11 +7954,11 @@
> -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
> -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
> -e 's:$: $lt_compiler_flag:'`
> - (eval echo "\"\$as_me:8225: $lt_compile\"" >&5)
> + (eval echo "\"\$as_me:7957: $lt_compile\"" >&5)
> (eval "$lt_compile" 2>conftest.err)
> ac_status=$?
> cat conftest.err >&5
> - echo "$as_me:8229: \$? = $ac_status" >&5
> + echo "$as_me:7961: \$? = $ac_status" >&5
> if (exit $ac_status) && test -s "$ac_outfile"; then
> # The compiler can only warn and ignore the option if not recognized
> # So say no if there are warnings other than the usual output.
> @@ -8239,7 +7971,7 @@
> $RM conftest*
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
> $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
>
> if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
> @@ -8259,7 +7991,7 @@
> lt_prog_compiler_pic=
> lt_prog_compiler_static=
>
> -{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
> +{ $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 test "$GCC" = yes; then
> @@ -8531,7 +8263,7 @@
> lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
> ;;
> esac
> -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
> $as_echo "$lt_prog_compiler_pic" >&6; }
>
>
> @@ -8543,9 +8275,9 @@
> # Check to make sure the PIC flag actually works.
> #
> if test -n "$lt_prog_compiler_pic"; then
> - { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
> + { $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 test "${lt_cv_prog_compiler_pic_works+set}" = set; then
> +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_prog_compiler_pic_works=no
> @@ -8561,11 +8293,11 @@
> -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
> -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
> -e 's:$: $lt_compiler_flag:'`
> - (eval echo "\"\$as_me:8564: $lt_compile\"" >&5)
> + (eval echo "\"\$as_me:8296: $lt_compile\"" >&5)
> (eval "$lt_compile" 2>conftest.err)
> ac_status=$?
> cat conftest.err >&5
> - echo "$as_me:8568: \$? = $ac_status" >&5
> + echo "$as_me:8300: \$? = $ac_status" >&5
> if (exit $ac_status) && test -s "$ac_outfile"; then
> # The compiler can only warn and ignore the option if not recognized
> # So say no if there are warnings other than the usual output.
> @@ -8578,7 +8310,7 @@
> $RM conftest*
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
> $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
>
> if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
> @@ -8602,9 +8334,9 @@
> # 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:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
> +{ $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 test "${lt_cv_prog_compiler_static_works+set}" = set; then
> +if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_prog_compiler_static_works=no
> @@ -8630,7 +8362,7 @@
> LDFLAGS="$save_LDFLAGS"
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
> $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
>
> if test x"$lt_cv_prog_compiler_static_works" = xyes; then
> @@ -8645,9 +8377,9 @@
>
>
>
> - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
> + { $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 test "${lt_cv_prog_compiler_c_o+set}" = set; then
> +if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_prog_compiler_c_o=no
> @@ -8666,11 +8398,11 @@
> -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
> -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
> -e 's:$: $lt_compiler_flag:'`
> - (eval echo "\"\$as_me:8669: $lt_compile\"" >&5)
> + (eval echo "\"\$as_me:8401: $lt_compile\"" >&5)
> (eval "$lt_compile" 2>out/conftest.err)
> ac_status=$?
> cat out/conftest.err >&5
> - echo "$as_me:8673: \$? = $ac_status" >&5
> + echo "$as_me:8405: \$? = $ac_status" >&5
> if (exit $ac_status) && test -s out/conftest2.$ac_objext
> then
> # The compiler can only warn and ignore the option if not recognized
> @@ -8692,7 +8424,7 @@
> $RM conftest*
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
> $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
>
>
> @@ -8700,9 +8432,9 @@
>
>
>
> - { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
> + { $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 test "${lt_cv_prog_compiler_c_o+set}" = set; then
> +if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_prog_compiler_c_o=no
> @@ -8721,11 +8453,11 @@
> -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
> -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
> -e 's:$: $lt_compiler_flag:'`
> - (eval echo "\"\$as_me:8724: $lt_compile\"" >&5)
> + (eval echo "\"\$as_me:8456: $lt_compile\"" >&5)
> (eval "$lt_compile" 2>out/conftest.err)
> ac_status=$?
> cat out/conftest.err >&5
> - echo "$as_me:8728: \$? = $ac_status" >&5
> + echo "$as_me:8460: \$? = $ac_status" >&5
> if (exit $ac_status) && test -s out/conftest2.$ac_objext
> then
> # The compiler can only warn and ignore the option if not recognized
> @@ -8747,7 +8479,7 @@
> $RM conftest*
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
> $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
>
>
> @@ -8756,7 +8488,7 @@
> hard_links="nottested"
> if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
> # do not overwrite the value of need_locks provided by the user
> - { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
> + { $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; }
> hard_links=yes
> $RM conftest*
> @@ -8764,10 +8496,10 @@
> 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:$LINENO: result: $hard_links" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
> $as_echo "$hard_links" >&6; }
> if test "$hard_links" = no; then
> - { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
> + { $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;}
> need_locks=warn
> fi
> @@ -8780,7 +8512,7 @@
>
>
>
> - { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
> + { $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; }
>
> runpath_var=
> @@ -9222,11 +8954,7 @@
> allow_undefined_flag='-berok'
> # Determine the default libpath from the value encoded in an
> # empty executable.
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -9237,27 +8965,7 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
>
> lt_aix_libpath_sed='
> /Import File Strings/,/^$/ {
> @@ -9271,16 +8979,9 @@
> if test -z "$aix_libpath"; then
> aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
> fi
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> -
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>
> hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
> @@ -9293,11 +8994,7 @@
> else
> # Determine the default libpath from the value encoded in an
> # empty executable.
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -9308,27 +9005,7 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
>
> lt_aix_libpath_sed='
> /Import File Strings/,/^$/ {
> @@ -9342,16 +9019,9 @@
> if test -z "$aix_libpath"; then
> aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
> fi
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> -
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
>
> hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
> @@ -9563,42 +9233,16 @@
> # implicitly export all symbols.
> save_LDFLAGS="$LDFLAGS"
> LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
> - cat >conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h. */
> int foo(void) {}
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
>
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> -
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LDFLAGS="$save_LDFLAGS"
> else
> archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
> @@ -9854,7 +9498,7 @@
> fi
> fi
>
> -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
> $as_echo "$ld_shlibs" >&6; }
> test "$ld_shlibs" = no && can_build_shared=no
>
> @@ -9891,16 +9535,16 @@
> # 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:$LINENO: checking whether -lc should be explicitly linked in" >&5
> + { $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; }
> $RM conftest*
> echo "$lt_simple_compile_test_code" > conftest.$ac_ext
>
> - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
> + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
> (eval $ac_compile) 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } 2>conftest.err; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; } 2>conftest.err; then
> soname=conftest
> lib=conftest
> libobjs=conftest.$ac_objext
> @@ -9914,11 +9558,11 @@
> libname=conftest
> lt_save_allow_undefined_flag=$allow_undefined_flag
> allow_undefined_flag=
> - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
> + 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:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }
> then
> archive_cmds_need_lc=no
> else
> @@ -9929,7 +9573,7 @@
> cat conftest.err 1>&5
> fi
> $RM conftest*
> - { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
> $as_echo "$archive_cmds_need_lc" >&6; }
> ;;
> esac
> @@ -10093,7 +9737,7 @@
>
>
>
> - { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
> $as_echo_n "checking dynamic linker characteristics... " >&6; }
>
> if test "$GCC" = yes; then
> @@ -10515,11 +10159,7 @@
> save_libdir=$libdir
> eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
> LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> int
> @@ -10530,41 +10170,13 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; 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 :
> shlibpath_overrides_runpath=yes
> fi
> -
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> -
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LDFLAGS=$save_LDFLAGS
> libdir=$save_libdir
>
> @@ -10573,13 +10185,10 @@
> # before this can be enabled.
> hardcode_into_libs=yes
>
> - # Add ABI-specific directories to the system library path.
> - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
> -
> # Append ld.so.conf contents to the search path
> if test -f /etc/ld.so.conf; then
> lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
> - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
> + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
> fi
>
> # We used to test for /lib/ld.so.1 and disable shared libraries on
> @@ -10779,7 +10388,7 @@
> dynamic_linker=no
> ;;
> esac
> -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
> $as_echo "$dynamic_linker" >&6; }
> test "$dynamic_linker" = no && can_build_shared=no
>
> @@ -10881,7 +10490,7 @@
>
>
>
> - { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
> + { $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; }
> hardcode_action=
> if test -n "$hardcode_libdir_flag_spec" ||
> @@ -10906,7 +10515,7 @@
> # directories.
> hardcode_action=unsupported
> fi
> -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
> $as_echo "$hardcode_action" >&6; }
>
> if test "$hardcode_action" = relink ||
> @@ -10951,18 +10560,14 @@
>
> darwin*)
> # if libdl is installed we need to link against it
> - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
> $as_echo_n "checking for dlopen in -ldl... " >&6; }
> -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
> +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> LIBS="-ldl $LIBS"
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> @@ -10980,43 +10585,18 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_lib_dl_dlopen=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_lib_dl_dlopen=no
> + ac_cv_lib_dl_dlopen=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
> +{ $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" = x""yes; then
> +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
> lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
> else
>
> @@ -11029,106 +10609,18 @@
> ;;
>
> *)
> - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
> -$as_echo_n "checking for shl_load... " >&6; }
> -if test "${ac_cv_func_shl_load+set}" = set; then
> - $as_echo_n "(cached) " >&6
> -else
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
> - For example, HP-UX 11i <limits.h> declares gettimeofday. */
> -#define shl_load innocuous_shl_load
> -
> -/* System header to define __stub macros and hopefully few prototypes,
> - which can conflict with char shl_load (); below.
> - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> - <limits.h> exists even on freestanding compilers. */
> -
> -#ifdef __STDC__
> -# include <limits.h>
> -#else
> -# include <assert.h>
> -#endif
> -
> -#undef shl_load
> -
> -/* 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 ();
> -/* The GNU C library defines this for functions which it implements
> - to always fail with ENOSYS. Some functions are actually named
> - something starting with __ and the normal name is an alias. */
> -#if defined __stub_shl_load || defined __stub___shl_load
> -choke me
> -#endif
> -
> -int
> -main ()
> -{
> -return shl_load ();
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> - ac_cv_func_shl_load=yes
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_func_shl_load=no
> -fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
> -$as_echo "$ac_cv_func_shl_load" >&6; }
> -if test "x$ac_cv_func_shl_load" = x""yes; then
> + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
> +if test "x$ac_cv_func_shl_load" = x""yes; then :
> lt_cv_dlopen="shl_load"
> else
> - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
> + { $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 test "${ac_cv_lib_dld_shl_load+set}" = set; then
> +if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> LIBS="-ldld $LIBS"
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> @@ -11146,145 +10638,32 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_lib_dld_shl_load=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_lib_dld_shl_load=no
> + ac_cv_lib_dld_shl_load=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
> +{ $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" = x""yes; then
> +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
> lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
> else
> - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
> -$as_echo_n "checking for dlopen... " >&6; }
> -if test "${ac_cv_func_dlopen+set}" = set; then
> - $as_echo_n "(cached) " >&6
> -else
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
> - For example, HP-UX 11i <limits.h> declares gettimeofday. */
> -#define dlopen innocuous_dlopen
> -
> -/* System header to define __stub macros and hopefully few prototypes,
> - which can conflict with char dlopen (); below.
> - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
> - <limits.h> exists even on freestanding compilers. */
> -
> -#ifdef __STDC__
> -# include <limits.h>
> -#else
> -# include <assert.h>
> -#endif
> -
> -#undef dlopen
> -
> -/* 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 ();
> -/* The GNU C library defines this for functions which it implements
> - to always fail with ENOSYS. Some functions are actually named
> - something starting with __ and the normal name is an alias. */
> -#if defined __stub_dlopen || defined __stub___dlopen
> -choke me
> -#endif
> -
> -int
> -main ()
> -{
> -return dlopen ();
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> - ac_cv_func_dlopen=yes
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_func_dlopen=no
> -fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
> -$as_echo "$ac_cv_func_dlopen" >&6; }
> -if test "x$ac_cv_func_dlopen" = x""yes; then
> + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
> +if test "x$ac_cv_func_dlopen" = x""yes; then :
> lt_cv_dlopen="dlopen"
> else
> - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
> $as_echo_n "checking for dlopen in -ldl... " >&6; }
> -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
> +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> LIBS="-ldl $LIBS"
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> @@ -11302,57 +10681,28 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_lib_dl_dlopen=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_lib_dl_dlopen=no
> + ac_cv_lib_dl_dlopen=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
> +{ $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" = x""yes; then
> +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
> lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
> else
> - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
> $as_echo_n "checking for dlopen in -lsvld... " >&6; }
> -if test "${ac_cv_lib_svld_dlopen+set}" = set; then
> +if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> LIBS="-lsvld $LIBS"
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> @@ -11370,57 +10720,28 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_lib_svld_dlopen=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_lib_svld_dlopen=no
> + ac_cv_lib_svld_dlopen=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
> +{ $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" = x""yes; then
> +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
> lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
> else
> - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
> + { $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 test "${ac_cv_lib_dld_dld_link+set}" = set; then
> +if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> LIBS="-ldld $LIBS"
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> @@ -11438,43 +10759,18 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_lib_dld_dld_link=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_lib_dld_dld_link=no
> + ac_cv_lib_dld_dld_link=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
> +{ $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" = x""yes; then
> +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
> lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
> fi
>
> @@ -11513,9 +10809,9 @@
> save_LIBS="$LIBS"
> LIBS="$lt_cv_dlopen_libs $LIBS"
>
> - { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
> + { $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 test "${lt_cv_dlopen_self+set}" = set; then
> +if test "${lt_cv_dlopen_self+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test "$cross_compiling" = yes; then :
> @@ -11524,7 +10820,7 @@
> lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
> lt_status=$lt_dlunknown
> cat > conftest.$ac_ext <<_LT_EOF
> -#line 11527 "configure"
> +#line 10823 "configure"
> #include "confdefs.h"
>
> #if HAVE_DLFCN_H
> @@ -11583,11 +10879,11 @@
> return status;
> }
> _LT_EOF
> - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
> + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
> (eval $ac_link) 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
> + $as_echo "$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=$?
> case x$lt_status in
> @@ -11604,14 +10900,14 @@
>
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
> $as_echo "$lt_cv_dlopen_self" >&6; }
>
> if test "x$lt_cv_dlopen_self" = xyes; then
> wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
> - { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
> + { $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 test "${lt_cv_dlopen_self_static+set}" = set; then
> +if test "${lt_cv_dlopen_self_static+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test "$cross_compiling" = yes; then :
> @@ -11620,7 +10916,7 @@
> lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
> lt_status=$lt_dlunknown
> cat > conftest.$ac_ext <<_LT_EOF
> -#line 11623 "configure"
> +#line 10919 "configure"
> #include "confdefs.h"
>
> #if HAVE_DLFCN_H
> @@ -11679,11 +10975,11 @@
> return status;
> }
> _LT_EOF
> - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
> + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
> (eval $ac_link) 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
> + $as_echo "$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=$?
> case x$lt_status in
> @@ -11700,7 +10996,7 @@
>
>
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
> $as_echo "$lt_cv_dlopen_self_static" >&6; }
> fi
>
> @@ -11739,12 +11035,12 @@
>
> striplib=
> old_striplib=
> -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
> +{ $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:$LINENO: result: yes" >&5
> + { $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
> @@ -11753,15 +11049,15 @@
> if test -n "$STRIP" ; then
> striplib="$STRIP -x"
> old_striplib="$STRIP -S"
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
> ;;
> *)
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> ;;
> esac
> @@ -11779,12 +11075,12 @@
>
>
> # Report which library types will actually be built
> - { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
> + { $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:$LINENO: result: $can_build_shared" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
> $as_echo "$can_build_shared" >&6; }
>
> - { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
> $as_echo_n "checking whether to build shared libraries... " >&6; }
> test "$can_build_shared" = "no" && enable_shared=no
>
> @@ -11805,14 +11101,14 @@
> fi
> ;;
> esac
> - { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
> $as_echo "$enable_shared" >&6; }
>
> - { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
> $as_echo_n "checking whether to build static libraries... " >&6; }
> # Make sure either enable_shared or enable_static is yes.
> test "$enable_shared" = yes || enable_static=yes
> - { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
> $as_echo "$enable_static" >&6; }
>
>
> @@ -11847,9 +11143,9 @@
> # Only expand once:
>
>
> -{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
> +{ $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 test "${lt_cv_path_NM+set}" = set; then
> +if test "${lt_cv_path_NM+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$NM"; then
> @@ -11896,7 +11192,7 @@
> : ${lt_cv_path_NM=no}
> fi
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
> $as_echo "$lt_cv_path_NM" >&6; }
> if test "$lt_cv_path_NM" != "no"; then
> NM="$lt_cv_path_NM"
> @@ -11907,9 +11203,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_DUMPBIN+set}" = set; then
> +if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$DUMPBIN"; then
> @@ -11920,24 +11216,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> DUMPBIN=$ac_cv_prog_DUMPBIN
> if test -n "$DUMPBIN"; then
> - { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
> $as_echo "$DUMPBIN" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -11951,9 +11247,9 @@
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
> +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> if test -n "$ac_ct_DUMPBIN"; then
> @@ -11964,24 +11260,24 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> fi
> fi
> ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
> if test -n "$ac_ct_DUMPBIN"; then
> - { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
> $as_echo "$ac_ct_DUMPBIN" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -11994,7 +11290,7 @@
> else
> case $cross_compiling:$ac_tool_warned in
> yes:)
> -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
> $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
> ac_tool_warned=yes ;;
> esac
> @@ -12011,32 +11307,32 @@
>
>
>
> -{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
> +{ $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 test "${lt_cv_nm_interface+set}" = set; then
> +if test "${lt_cv_nm_interface+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> lt_cv_nm_interface="BSD nm"
> echo "int some_variable = 0;" > conftest.$ac_ext
> - (eval echo "\"\$as_me:12021: $ac_compile\"" >&5)
> + (eval echo "\"\$as_me:11317: $ac_compile\"" >&5)
> (eval "$ac_compile" 2>conftest.err)
> cat conftest.err >&5
> - (eval echo "\"\$as_me:12024: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
> + (eval echo "\"\$as_me:11320: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
> (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
> cat conftest.err >&5
> - (eval echo "\"\$as_me:12027: output\"" >&5)
> + (eval echo "\"\$as_me:11323: output\"" >&5)
> cat conftest.out >&5
> if $GREP 'External.*some_variable' conftest.out > /dev/null; then
> lt_cv_nm_interface="MS dumpbin"
> fi
> rm -f conftest*
> fi
> -{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
> $as_echo "$lt_cv_nm_interface" >&6; }
>
>
> # Check whether --enable-optimization was given.
> -if test "${enable_optimization+set}" = set; then
> +if test "${enable_optimization+set}" = set; then :
> enableval=$enable_optimization;
> if (test "${enableval}" = "no"); then
> CFLAGS="$CFLAGS -O0"
> @@ -12048,7 +11344,7 @@
>
>
> # Check whether --with-html-dir was given.
> -if test "${with_html_dir+set}" = set; then
> +if test "${with_html_dir+set}" = set; then :
> withval=$with_html_dir;
> else
> with_html_dir='${datadir}/gtk-doc/html'
> @@ -12058,7 +11354,7 @@
>
>
> # Check whether --enable-gtk-doc was given.
> -if test "${enable_gtk_doc+set}" = set; then
> +if test "${enable_gtk_doc+set}" = set; then :
> enableval=$enable_gtk_doc;
> else
> enable_gtk_doc=no
> @@ -12067,31 +11363,29 @@
>
> if test x$enable_gtk_doc = xyes; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc\""; } >&5
> ($PKG_CONFIG --exists --print-errors "gtk-doc") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> :
> else
> - { { $as_echo "$as_me:$LINENO: error: gtk-doc not installed and --enable-gtk-doc requested" >&5
> -$as_echo "$as_me: error: gtk-doc not installed and --enable-gtk-doc requested" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "gtk-doc not installed and --enable-gtk-doc requested" "$LINENO" 5
> fi
> fi
>
> - { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
> + { $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:$LINENO: result: $enable_gtk_doc" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
> $as_echo "$enable_gtk_doc" >&6; }
>
> for ac_prog in gtkdoc-check
> 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:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
> +if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $GTKDOC_CHECK in
> @@ -12104,14 +11398,14 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -12119,10 +11413,10 @@
> fi
> GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
> if test -n "$GTKDOC_CHECK"; then
> - { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
> $as_echo "$GTKDOC_CHECK" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -12150,7 +11444,7 @@
>
>
> # Check whether --enable-debug was given.
> -if test "${enable_debug+set}" = set; then
> +if test "${enable_debug+set}" = set; then :
> enableval=$enable_debug;
> if (test "${enableval}" = "yes" &&
> test "${ac_cv_prog_cc_g}" = "yes"); then
> @@ -12161,7 +11455,7 @@
>
>
> # Check whether --enable-pie was given.
> -if test "${enable_pie+set}" = set; then
> +if test "${enable_pie+set}" = set; then :
> enableval=$enable_pie;
> if (test "${enableval}" = "yes" &&
> test "${ac_cv_prog_cc_pie}" = "yes"); then
> @@ -12173,7 +11467,7 @@
>
>
> # Check whether --enable-threads was given.
> -if test "${enable_threads+set}" = set; then
> +if test "${enable_threads+set}" = set; then :
> enableval=$enable_threads; enable_threads=${enableval}
> else
> enable_threads="no"
> @@ -12181,7 +11475,7 @@
>
>
> # Check whether --enable-ethernet was given.
> -if test "${enable_ethernet+set}" = set; then
> +if test "${enable_ethernet+set}" = set; then :
> enableval=$enable_ethernet; enable_ethernet=${enableval}
> else
> enable_ethernet="no"
> @@ -12205,7 +11499,7 @@
>
>
> # Check whether --enable-wifi was given.
> -if test "${enable_wifi+set}" = set; then
> +if test "${enable_wifi+set}" = set; then :
> enableval=$enable_wifi; enable_wifi=${enableval}
> else
> enable_wifi="no"
> @@ -12214,9 +11508,9 @@
> if (test "${enable_wifi}" != "no"); then
> # Extract the first word of "wpa_supplicant", so it can be a program name with args.
> set dummy wpa_supplicant; ac_word=$2
> -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_WPASUPPLICANT+set}" = set; then
> +if test "${ac_cv_path_WPASUPPLICANT+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $WPASUPPLICANT in
> @@ -12230,14 +11524,14 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_path_WPASUPPLICANT="$as_dir/$ac_word$ac_exec_ext"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -12245,10 +11539,10 @@
> fi
> WPASUPPLICANT=$ac_cv_path_WPASUPPLICANT
> if test -n "$WPASUPPLICANT"; then
> - { $as_echo "$as_me:$LINENO: result: $WPASUPPLICANT" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WPASUPPLICANT" >&5
> $as_echo "$WPASUPPLICANT" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -12272,7 +11566,7 @@
>
>
> # Check whether --enable-bluetooth was given.
> -if test "${enable_bluetooth+set}" = set; then
> +if test "${enable_bluetooth+set}" = set; then :
> enableval=$enable_bluetooth; enable_bluetooth=${enableval}
> else
> enable_bluetooth="no"
> @@ -12296,7 +11590,7 @@
>
>
> # Check whether --enable-hh2serial-gps was given.
> -if test "${enable_hh2serial_gps+set}" = set; then
> +if test "${enable_hh2serial_gps+set}" = set; then :
> enableval=$enable_hh2serial_gps; enable_hh2serial_gps=${enableval}
> else
> enable_hh2serial_gps="no"
> @@ -12320,7 +11614,7 @@
>
>
> # Check whether --enable-ofono was given.
> -if test "${enable_ofono+set}" = set; then
> +if test "${enable_ofono+set}" = set; then :
> enableval=$enable_ofono; enable_ofono=${enableval}
> else
> enable_ofono="no"
> @@ -12345,13 +11639,13 @@
>
>
> # Check whether --with-udhcpc was given.
> -if test "${with_udhcpc+set}" = set; then
> +if test "${with_udhcpc+set}" = set; then :
> withval=$with_udhcpc; path_udhcpc=${withval}
> fi
>
>
> # Check whether --enable-udhcp was given.
> -if test "${enable_udhcp+set}" = set; then
> +if test "${enable_udhcp+set}" = set; then :
> enableval=$enable_udhcp; enable_udhcp=${enableval}
> else
> enable_udhcp="no"
> @@ -12361,9 +11655,9 @@
> if (test -z "${path_udhcpc}"); then
> # Extract the first word of "udhcpc", so it can be a program name with args.
> set dummy udhcpc; ac_word=$2
> -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_UDHCPC+set}" = set; then
> +if test "${ac_cv_path_UDHCPC+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $UDHCPC in
> @@ -12377,14 +11671,14 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_path_UDHCPC="$as_dir/$ac_word$ac_exec_ext"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -12392,10 +11686,10 @@
> fi
> UDHCPC=$ac_cv_path_UDHCPC
> if test -n "$UDHCPC"; then
> - { $as_echo "$as_me:$LINENO: result: $UDHCPC" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UDHCPC" >&5
> $as_echo "$UDHCPC" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -12424,13 +11718,13 @@
>
>
> # Check whether --with-dhclient was given.
> -if test "${with_dhclient+set}" = set; then
> +if test "${with_dhclient+set}" = set; then :
> withval=$with_dhclient; path_dhclient=${withval}
> fi
>
>
> # Check whether --enable-dhclient was given.
> -if test "${enable_dhclient+set}" = set; then
> +if test "${enable_dhclient+set}" = set; then :
> enableval=$enable_dhclient; enable_dhclient=${enableval}
> else
> enable_dhclient="no"
> @@ -12440,9 +11734,9 @@
> if (test -z "${path_dhclient}"); then
> # Extract the first word of "dhclient", so it can be a program name with args.
> set dummy dhclient; ac_word=$2
> -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_DHCLIENT+set}" = set; then
> +if test "${ac_cv_path_DHCLIENT+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $DHCLIENT in
> @@ -12456,14 +11750,14 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_path_DHCLIENT="$as_dir/$ac_word$ac_exec_ext"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -12471,10 +11765,10 @@
> fi
> DHCLIENT=$ac_cv_path_DHCLIENT
> if test -n "$DHCLIENT"; then
> - { $as_echo "$as_me:$LINENO: result: $DHCLIENT" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DHCLIENT" >&5
> $as_echo "$DHCLIENT" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -12483,16 +11777,14 @@
> DHCLIENT="${path_dhclient}"
>
> fi
> - { $as_echo "$as_me:$LINENO: checking dhclient major version" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dhclient major version" >&5
> $as_echo_n "checking dhclient major version... " >&6; }
> version_dhclient=`${DHCLIENT} --version 2>&1 | sed '/^isc-dhclient-*/!d; s///; s/\..*//;q'`
> - { $as_echo "$as_me:$LINENO: result: ${version_dhclient}" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${version_dhclient}" >&5
> $as_echo "${version_dhclient}" >&6; }
> if (test "${version_dhclient}" = "4"); then
>
> -cat >>confdefs.h <<\_ACEOF
> -#define HAVE_DHCLIENT_HOSTNAME 1
> -_ACEOF
> +$as_echo "#define HAVE_DHCLIENT_HOSTNAME 1" >>confdefs.h
>
> fi
> fi
> @@ -12515,13 +11807,13 @@
>
>
> # Check whether --with-resolvconf was given.
> -if test "${with_resolvconf+set}" = set; then
> +if test "${with_resolvconf+set}" = set; then :
> withval=$with_resolvconf; path_resolvconf=${withval}
> fi
>
>
> # Check whether --enable-resolvconf was given.
> -if test "${enable_resolvconf+set}" = set; then
> +if test "${enable_resolvconf+set}" = set; then :
> enableval=$enable_resolvconf; enable_resolvconf=${enableval}
> else
> enable_resolvconf="no"
> @@ -12531,9 +11823,9 @@
> if (test -z "${path_resolvconf}"); then
> # Extract the first word of "resolvconf", so it can be a program name with args.
> set dummy resolvconf; ac_word=$2
> -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_RESOLVCONF+set}" = set; then
> +if test "${ac_cv_path_RESOLVCONF+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $RESOLVCONF in
> @@ -12547,14 +11839,14 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_path_RESOLVCONF="$as_dir/$ac_word$ac_exec_ext"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -12562,10 +11854,10 @@
> fi
> RESOLVCONF=$ac_cv_path_RESOLVCONF
> if test -n "$RESOLVCONF"; then
> - { $as_echo "$as_me:$LINENO: result: $RESOLVCONF" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RESOLVCONF" >&5
> $as_echo "$RESOLVCONF" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -12594,13 +11886,13 @@
>
>
> # Check whether --with-openconnect was given.
> -if test "${with_openconnect+set}" = set; then
> +if test "${with_openconnect+set}" = set; then :
> withval=$with_openconnect; path_openconnect=${withval}
> fi
>
>
> # Check whether --enable-openconnect was given.
> -if test "${enable_openconnect+set}" = set; then
> +if test "${enable_openconnect+set}" = set; then :
> enableval=$enable_openconnect; enable_openconnect=${enableval}
> else
> enable_openconnect="no"
> @@ -12610,9 +11902,9 @@
> if (test -z "${path_openconnect}"); then
> # Extract the first word of "openconnect", so it can be a program name with args.
> set dummy openconnect; ac_word=$2
> -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_OPENCONNECT+set}" = set; then
> +if test "${ac_cv_path_OPENCONNECT+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $OPENCONNECT in
> @@ -12626,14 +11918,14 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_path_OPENCONNECT="$as_dir/$ac_word$ac_exec_ext"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -12641,10 +11933,10 @@
> fi
> OPENCONNECT=$ac_cv_path_OPENCONNECT
> if test -n "$OPENCONNECT"; then
> - { $as_echo "$as_me:$LINENO: result: $OPENCONNECT" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENCONNECT" >&5
> $as_echo "$OPENCONNECT" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -12672,7 +11964,7 @@
>
>
> # Check whether --enable-portal was given.
> -if test "${enable_portal+set}" = set; then
> +if test "${enable_portal+set}" = set; then :
> enableval=$enable_portal; enable_portal=${enableval}
> else
> enable_portal="no"
> @@ -12696,176 +11988,36 @@
>
>
> # Check whether --enable-loopback was given.
> -if test "${enable_loopback+set}" = set; then
> +if test "${enable_loopback+set}" = set; then :
> enableval=$enable_loopback; enable_loopback=${enableval}
> else
> enable_loopback="no"
> fi
>
> if (test "${enable_loopback}" != "no"); then
> -
> -for ac_header in sys/inotify.h
> -do
> -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
> -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
> - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
> -$as_echo_n "checking for $ac_header... " >&6; }
> -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
> - $as_echo_n "(cached) " >&6
> -fi
> -ac_res=`eval 'as_val=${'$as_ac_Header'}
> - $as_echo "$as_val"'`
> - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
> -$as_echo "$ac_res" >&6; }
> -else
> - # Is the header compilable?
> -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
> -$as_echo_n "checking $ac_header usability... " >&6; }
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -$ac_includes_default
> -#include <$ac_header>
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - ac_header_compiler=yes
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_header_compiler=no
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
> -$as_echo "$ac_header_compiler" >&6; }
> -
> -# Is the header present?
> -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
> -$as_echo_n "checking $ac_header presence... " >&6; }
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <$ac_header>
> -_ACEOF
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } >/dev/null && {
> - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - }; then
> - ac_header_preproc=yes
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_header_preproc=no
> -fi
> -
> -rm -f conftest.err conftest.$ac_ext
> -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
> -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
> -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
> - ac_header_preproc=yes
> - ;;
> - no:yes:* )
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
> -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
> -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
> -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
> -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
> -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
> -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
> -
> - ;;
> -esac
> -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
> -$as_echo_n "checking for $ac_header... " >&6; }
> -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
> - $as_echo_n "(cached) " >&6
> -else
> - eval "$as_ac_Header=\$ac_header_preproc"
> -fi
> -ac_res=`eval 'as_val=${'$as_ac_Header'}
> - $as_echo "$as_val"'`
> - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
> -$as_echo "$ac_res" >&6; }
> -
> -fi
> -as_val=`eval 'as_val=${'$as_ac_Header'}
> - $as_echo "$as_val"'`
> - if test "x$as_val" = x""yes; then
> + for ac_header in sys/inotify.h
> +do :
> + ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
> +if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
> cat >>confdefs.h <<_ACEOF
> -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
> +#define HAVE_SYS_INOTIFY_H 1
> _ACEOF
> dummy=yes
> else
> - { { $as_echo "$as_me:$LINENO: error: inotify header files are required" >&5
> -$as_echo "$as_me: error: inotify header files are required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "inotify header files are required" "$LINENO" 5
> fi
>
> done
>
>
> - { $as_echo "$as_me:$LINENO: checking for inotify_init in -lc" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify_init in -lc" >&5
> $as_echo_n "checking for inotify_init in -lc... " >&6; }
> -if test "${ac_cv_lib_c_inotify_init+set}" = set; then
> +if test "${ac_cv_lib_c_inotify_init+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> LIBS="-lc $LIBS"
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> @@ -12883,48 +12035,21 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_lib_c_inotify_init=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_lib_c_inotify_init=no
> + ac_cv_lib_c_inotify_init=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_inotify_init" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_inotify_init" >&5
> $as_echo "$ac_cv_lib_c_inotify_init" >&6; }
> -if test "x$ac_cv_lib_c_inotify_init" = x""yes; then
> +if test "x$ac_cv_lib_c_inotify_init" = x""yes; then :
> dummy=yes
> else
> - { { $as_echo "$as_me:$LINENO: error: inotify library support is required" >&5
> -$as_echo "$as_me: error: inotify library support is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "inotify library support is required" "$LINENO" 5
> fi
>
> fi
> @@ -12946,175 +12071,35 @@
>
>
> # Check whether --enable-dnsproxy was given.
> -if test "${enable_dnsproxy+set}" = set; then
> +if test "${enable_dnsproxy+set}" = set; then :
> enableval=$enable_dnsproxy; enable_dnsproxy=${enableval}
> else
> enable_dnsproxy="no"
> fi
>
> if (test "${enable_dnsproxy}" != "no"); then
> -
> -for ac_header in resolv.h
> -do
> -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
> -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
> - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
> -$as_echo_n "checking for $ac_header... " >&6; }
> -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
> - $as_echo_n "(cached) " >&6
> -fi
> -ac_res=`eval 'as_val=${'$as_ac_Header'}
> - $as_echo "$as_val"'`
> - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
> -$as_echo "$ac_res" >&6; }
> -else
> - # Is the header compilable?
> -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
> -$as_echo_n "checking $ac_header usability... " >&6; }
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -$ac_includes_default
> -#include <$ac_header>
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - ac_header_compiler=yes
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_header_compiler=no
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
> -$as_echo "$ac_header_compiler" >&6; }
> -
> -# Is the header present?
> -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
> -$as_echo_n "checking $ac_header presence... " >&6; }
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <$ac_header>
> -_ACEOF
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } >/dev/null && {
> - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - }; then
> - ac_header_preproc=yes
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_header_preproc=no
> -fi
> -
> -rm -f conftest.err conftest.$ac_ext
> -{ $as_echo "$as_me:$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:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
> -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
> -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
> - ac_header_preproc=yes
> - ;;
> - no:yes:* )
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
> -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
> -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
> -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
> -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
> -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
> -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
> -
> - ;;
> -esac
> -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
> -$as_echo_n "checking for $ac_header... " >&6; }
> -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
> - $as_echo_n "(cached) " >&6
> -else
> - eval "$as_ac_Header=\$ac_header_preproc"
> -fi
> -ac_res=`eval 'as_val=${'$as_ac_Header'}
> - $as_echo "$as_val"'`
> - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
> -$as_echo "$ac_res" >&6; }
> -
> -fi
> -as_val=`eval 'as_val=${'$as_ac_Header'}
> - $as_echo "$as_val"'`
> - if test "x$as_val" = x""yes; then
> + for ac_header in resolv.h
> +do :
> + ac_fn_c_check_header_mongrel "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "$ac_includes_default"
> +if test "x$ac_cv_header_resolv_h" = x""yes; then :
> cat >>confdefs.h <<_ACEOF
> -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
> +#define HAVE_RESOLV_H 1
> _ACEOF
> dummy=yes
> else
> - { { $as_echo "$as_me:$LINENO: error: resolver header files are required" >&5
> -$as_echo "$as_me: error: resolver header files are required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "resolver header files are required" "$LINENO" 5
> fi
>
> done
>
> - { $as_echo "$as_me:$LINENO: checking for ns_initparse in -lresolv" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ns_initparse in -lresolv" >&5
> $as_echo_n "checking for ns_initparse in -lresolv... " >&6; }
> -if test "${ac_cv_lib_resolv_ns_initparse+set}" = set; then
> +if test "${ac_cv_lib_resolv_ns_initparse+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> LIBS="-lresolv $LIBS"
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> @@ -13132,48 +12117,21 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_lib_resolv_ns_initparse=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_lib_resolv_ns_initparse=no
> + ac_cv_lib_resolv_ns_initparse=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_ns_initparse" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_ns_initparse" >&5
> $as_echo "$ac_cv_lib_resolv_ns_initparse" >&6; }
> -if test "x$ac_cv_lib_resolv_ns_initparse" = x""yes; then
> +if test "x$ac_cv_lib_resolv_ns_initparse" = x""yes; then :
> dummy=yes
> else
> - { { $as_echo "$as_me:$LINENO: error: resolver library support is required" >&5
> -$as_echo "$as_me: error: resolver library support is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "resolver library support is required" "$LINENO" 5
> fi
>
> fi
> @@ -13195,7 +12153,7 @@
>
>
> # Check whether --enable-google was given.
> -if test "${enable_google+set}" = set; then
> +if test "${enable_google+set}" = set; then :
> enableval=$enable_google; enable_google=${enableval}
> else
> enable_google="no"
> @@ -13219,7 +12177,7 @@
>
>
> # Check whether --enable-meego was given.
> -if test "${enable_meego+set}" = set; then
> +if test "${enable_meego+set}" = set; then :
> enableval=$enable_meego; enable_meego=${enableval}
> else
> enable_meego="no"
> @@ -13242,18 +12200,14 @@
> fi
>
>
> -{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
> $as_echo_n "checking for dlopen in -ldl... " >&6; }
> -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
> +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> LIBS="-ldl $LIBS"
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> @@ -13271,60 +12225,33 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_lib_dl_dlopen=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_lib_dl_dlopen=no
> + ac_cv_lib_dl_dlopen=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
> +{ $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" = x""yes; then
> +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
> dummy=yes
> else
> - { { $as_echo "$as_me:$LINENO: error: dynamic linking loader is required" >&5
> -$as_echo "$as_me: error: dynamic linking loader is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "dynamic linking loader is required" "$LINENO" 5
> fi
>
>
>
> # Check whether --with-iwmxsdk was given.
> -if test "${with_iwmxsdk+set}" = set; then
> +if test "${with_iwmxsdk+set}" = set; then :
> withval=$with_iwmxsdk; pkgconfig_iwmxsdk=${withval}/lib/pkgconfig
> fi
>
>
> # Check whether --enable-iwmx was given.
> -if test "${enable_iwmx+set}" = set; then
> +if test "${enable_iwmx+set}" = set; then :
> enableval=$enable_iwmx; enable_iwmx=${enableval}
> fi
>
> @@ -13333,18 +12260,18 @@
> export PKG_CONFIG_PATH="${pkgconfig_iwmxsdk}"
>
> pkg_failed=no
> -{ $as_echo "$as_me:$LINENO: checking for IWMXSDK" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IWMXSDK" >&5
> $as_echo_n "checking for IWMXSDK... " >&6; }
>
> if test -n "$IWMXSDK_CFLAGS"; then
> pkg_cv_IWMXSDK_CFLAGS="$IWMXSDK_CFLAGS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libiWmxSdk-0\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiWmxSdk-0\""; } >&5
> ($PKG_CONFIG --exists --print-errors "libiWmxSdk-0") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_IWMXSDK_CFLAGS=`$PKG_CONFIG --cflags "libiWmxSdk-0" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -13356,11 +12283,11 @@
> pkg_cv_IWMXSDK_LIBS="$IWMXSDK_LIBS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libiWmxSdk-0\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiWmxSdk-0\""; } >&5
> ($PKG_CONFIG --exists --print-errors "libiWmxSdk-0") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_IWMXSDK_LIBS=`$PKG_CONFIG --libs "libiWmxSdk-0" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -13386,19 +12313,15 @@
> # Put the nasty error message in config.log where it belongs
> echo "$IWMXSDK_PKG_ERRORS" >&5
>
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> - { { $as_echo "$as_me:$LINENO: error: Intel WiMAX SDK is required" >&5
> -$as_echo "$as_me: error: Intel WiMAX SDK is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "Intel WiMAX SDK is required" "$LINENO" 5
> elif test $pkg_failed = untried; then
> - { { $as_echo "$as_me:$LINENO: error: Intel WiMAX SDK is required" >&5
> -$as_echo "$as_me: error: Intel WiMAX SDK is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "Intel WiMAX SDK is required" "$LINENO" 5
> else
> IWMXSDK_CFLAGS=$pkg_cv_IWMXSDK_CFLAGS
> IWMXSDK_LIBS=$pkg_cv_IWMXSDK_LIBS
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> dummy=yes
> fi
> @@ -13410,491 +12333,47 @@
> CPPFLAGS_save=$CPPFLAGS
> CPPFLAGS="$IWMXSDK_CFLAGS $CPPFLAGS"
>
> + ac_fn_c_check_decl "$LINENO" "WIMAX_API_DEVICE_STATUS_Connection_Idle" "ac_cv_have_decl_WIMAX_API_DEVICE_STATUS_Connection_Idle" "#include <WiMaxType.h>
> +"
> +if test "x$ac_cv_have_decl_WIMAX_API_DEVICE_STATUS_Connection_Idle" = x""yes; then :
> + $as_echo "#define HAVE_IWMXSDK_STATUS_IDLE 1" >>confdefs.h
>
> - { $as_echo "$as_me:$LINENO: checking whether WIMAX_API_DEVICE_STATUS_Connection_Idle is declared" >&5
> -$as_echo_n "checking whether WIMAX_API_DEVICE_STATUS_Connection_Idle is declared... " >&6; }
> -if test "${ac_cv_have_decl_WIMAX_API_DEVICE_STATUS_Connection_Idle+set}" = set; then
> - $as_echo_n "(cached) " >&6
> -else
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <WiMaxType.h>
> -
> -int
> -main ()
> -{
> -#ifndef WIMAX_API_DEVICE_STATUS_Connection_Idle
> - (void) WIMAX_API_DEVICE_STATUS_Connection_Idle;
> -#endif
> -
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - ac_cv_have_decl_WIMAX_API_DEVICE_STATUS_Connection_Idle=yes
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_have_decl_WIMAX_API_DEVICE_STATUS_Connection_Idle=no
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_WIMAX_API_DEVICE_STATUS_Connection_Idle" >&5
> -$as_echo "$ac_cv_have_decl_WIMAX_API_DEVICE_STATUS_Connection_Idle" >&6; }
> -if test "x$ac_cv_have_decl_WIMAX_API_DEVICE_STATUS_Connection_Idle" = x""yes; then
> - cat >>confdefs.h <<\_ACEOF
> -#define HAVE_IWMXSDK_STATUS_IDLE 1
> -_ACEOF
> -
> -fi
> -
> -
> -
> -
> - { $as_echo "$as_me:$LINENO: checking for WIMAX_API_DEVICE_ID" >&5
> -$as_echo_n "checking for WIMAX_API_DEVICE_ID... " >&6; }
> -if test "${ac_cv_type_WIMAX_API_DEVICE_ID+set}" = set; then
> - $as_echo_n "(cached) " >&6
> -else
> - ac_cv_type_WIMAX_API_DEVICE_ID=no
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <WiMaxType.h>
> -
> -int
> -main ()
> -{
> -if (sizeof (WIMAX_API_DEVICE_ID))
> - return 0;
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <WiMaxType.h>
> -
> -int
> -main ()
> -{
> -if (sizeof ((WIMAX_API_DEVICE_ID)))
> - return 0;
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - :
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_type_WIMAX_API_DEVICE_ID=yes
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> -
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_WIMAX_API_DEVICE_ID" >&5
> -$as_echo "$ac_cv_type_WIMAX_API_DEVICE_ID" >&6; }
> -if test "x$ac_cv_type_WIMAX_API_DEVICE_ID" = x""yes; then
> - cat >>confdefs.h <<\_ACEOF
> -#define HAVE_WIMAX_API_DEVICE_ID 1
> -_ACEOF
> -
> -fi
> -
> -
> -
> -
> - { $as_echo "$as_me:$LINENO: checking for WIMAX_API_HW_DEVICE_ID" >&5
> -$as_echo_n "checking for WIMAX_API_HW_DEVICE_ID... " >&6; }
> -if test "${ac_cv_type_WIMAX_API_HW_DEVICE_ID+set}" = set; then
> - $as_echo_n "(cached) " >&6
> -else
> - ac_cv_type_WIMAX_API_HW_DEVICE_ID=no
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <WiMaxType.h>
> -
> -int
> -main ()
> -{
> -if (sizeof (WIMAX_API_HW_DEVICE_ID))
> - return 0;
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <WiMaxType.h>
> -
> -int
> -main ()
> -{
> -if (sizeof ((WIMAX_API_HW_DEVICE_ID)))
> - return 0;
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - :
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_type_WIMAX_API_HW_DEVICE_ID=yes
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> -
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_WIMAX_API_HW_DEVICE_ID" >&5
> -$as_echo "$ac_cv_type_WIMAX_API_HW_DEVICE_ID" >&6; }
> -if test "x$ac_cv_type_WIMAX_API_HW_DEVICE_ID" = x""yes; then
> - cat >>confdefs.h <<\_ACEOF
> -#define HAVE_WIMAX_API_HW_DEVICE_ID 1
> -_ACEOF
> -
> -fi
> -
> -
> -
> -
> - { $as_echo "$as_me:$LINENO: checking for WIMAX_API_NSP_INFO_EX" >&5
> -$as_echo_n "checking for WIMAX_API_NSP_INFO_EX... " >&6; }
> -if test "${ac_cv_type_WIMAX_API_NSP_INFO_EX+set}" = set; then
> - $as_echo_n "(cached) " >&6
> -else
> - ac_cv_type_WIMAX_API_NSP_INFO_EX=no
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <WiMaxType.h>
> - #include <WiMaxTypesEx.h>
> -
> -int
> -main ()
> -{
> -if (sizeof (WIMAX_API_NSP_INFO_EX))
> - return 0;
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <WiMaxType.h>
> - #include <WiMaxTypesEx.h>
> -
> -int
> -main ()
> -{
> -if (sizeof ((WIMAX_API_NSP_INFO_EX)))
> - return 0;
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - :
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_type_WIMAX_API_NSP_INFO_EX=yes
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> -
> -fi
> -
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_WIMAX_API_NSP_INFO_EX" >&5
> -$as_echo "$ac_cv_type_WIMAX_API_NSP_INFO_EX" >&6; }
> -if test "x$ac_cv_type_WIMAX_API_NSP_INFO_EX" = x""yes; then
> - cat >>confdefs.h <<\_ACEOF
> -#define HAVE_WIMAX_API_NSP_INFO_EX 1
> -_ACEOF
> -
> -fi
> -
> -
> -
> -
> - { $as_echo "$as_me:$LINENO: checking for WIMAX_API_CONNECTED_NSP_INFO" >&5
> -$as_echo_n "checking for WIMAX_API_CONNECTED_NSP_INFO... " >&6; }
> -if test "${ac_cv_type_WIMAX_API_CONNECTED_NSP_INFO+set}" = set; then
> - $as_echo_n "(cached) " >&6
> -else
> - ac_cv_type_WIMAX_API_CONNECTED_NSP_INFO=no
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <WiMaxType.h>
> -
> -int
> -main ()
> -{
> -if (sizeof (WIMAX_API_CONNECTED_NSP_INFO))
> - return 0;
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> -/* end confdefs.h. */
> -#include <WiMaxType.h>
> -
> -int
> -main ()
> -{
> -if (sizeof ((WIMAX_API_CONNECTED_NSP_INFO)))
> - return 0;
> - ;
> - return 0;
> -}
> -_ACEOF
> -rm -f conftest.$ac_objext
> -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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_compile") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest.$ac_objext; then
> - :
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_type_WIMAX_API_CONNECTED_NSP_INFO=yes
> fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> -else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
>
>
> + ac_fn_c_check_type "$LINENO" "WIMAX_API_DEVICE_ID" "ac_cv_type_WIMAX_API_DEVICE_ID" "#include <WiMaxType.h>
> +"
> +if test "x$ac_cv_type_WIMAX_API_DEVICE_ID" = x""yes; then :
> + $as_echo "#define HAVE_WIMAX_API_DEVICE_ID 1" >>confdefs.h
> +
> fi
>
> -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +
> +
> + ac_fn_c_check_type "$LINENO" "WIMAX_API_HW_DEVICE_ID" "ac_cv_type_WIMAX_API_HW_DEVICE_ID" "#include <WiMaxType.h>
> +"
> +if test "x$ac_cv_type_WIMAX_API_HW_DEVICE_ID" = x""yes; then :
> + $as_echo "#define HAVE_WIMAX_API_HW_DEVICE_ID 1" >>confdefs.h
> +
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_WIMAX_API_CONNECTED_NSP_INFO" >&5
> -$as_echo "$ac_cv_type_WIMAX_API_CONNECTED_NSP_INFO" >&6; }
> -if test "x$ac_cv_type_WIMAX_API_CONNECTED_NSP_INFO" = x""yes; then
> - cat >>confdefs.h <<\_ACEOF
> -#define HAVE_WIMAX_API_CONNECTED_NSP_INFO 1
> -_ACEOF
> +
> +
> +
> + ac_fn_c_check_type "$LINENO" "WIMAX_API_NSP_INFO_EX" "ac_cv_type_WIMAX_API_NSP_INFO_EX" "#include <WiMaxType.h>
> + #include <WiMaxTypesEx.h>
> +"
> +if test "x$ac_cv_type_WIMAX_API_NSP_INFO_EX" = x""yes; then :
> + $as_echo "#define HAVE_WIMAX_API_NSP_INFO_EX 1" >>confdefs.h
> +
> +fi
> +
> +
> +
> + ac_fn_c_check_type "$LINENO" "WIMAX_API_CONNECTED_NSP_INFO" "ac_cv_type_WIMAX_API_CONNECTED_NSP_INFO" "#include <WiMaxType.h>
> +"
> +if test "x$ac_cv_type_WIMAX_API_CONNECTED_NSP_INFO" = x""yes; then :
> + $as_echo "#define HAVE_WIMAX_API_CONNECTED_NSP_INFO 1" >>confdefs.h
>
> fi
>
> @@ -13911,7 +12390,7 @@
>
>
> # Check whether --enable-iospm was given.
> -if test "${enable_iospm+set}" = set; then
> +if test "${enable_iospm+set}" = set; then :
> enableval=$enable_iospm; enable_iospm=${enableval}
> fi
>
> @@ -13926,13 +12405,13 @@
>
>
> # Check whether --with-ntpd was given.
> -if test "${with_ntpd+set}" = set; then
> +if test "${with_ntpd+set}" = set; then :
> withval=$with_ntpd; path_ntpd=${withval}
> fi
>
>
> # Check whether --enable-ntpd was given.
> -if test "${enable_ntpd+set}" = set; then
> +if test "${enable_ntpd+set}" = set; then :
> enableval=$enable_ntpd; enable_ntpd=${enableval}
> else
> enable_ntpd="no"
> @@ -13943,9 +12422,9 @@
> if (test -z "${path_ntpd}"); then
> # Extract the first word of "ntpd", so it can be a program name with args.
> set dummy ntpd; ac_word=$2
> -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
> $as_echo_n "checking for $ac_word... " >&6; }
> -if test "${ac_cv_path_NTPD+set}" = set; then
> +if test "${ac_cv_path_NTPD+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> case $NTPD in
> @@ -13959,14 +12438,14 @@
> do
> IFS=$as_save_IFS
> test -z "$as_dir" && as_dir=.
> - for ac_exec_ext in '' $ac_executable_extensions; do
> + for ac_exec_ext in '' $ac_executable_extensions; do
> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
> ac_cv_path_NTPD="$as_dir/$ac_word$ac_exec_ext"
> - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
> + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
> break 2
> fi
> done
> -done
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -13974,10 +12453,10 @@
> fi
> NTPD=$ac_cv_path_NTPD
> if test -n "$NTPD"; then
> - { $as_echo "$as_me:$LINENO: result: $NTPD" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NTPD" >&5
> $as_echo "$NTPD" >&6; }
> else
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> fi
>
> @@ -14006,18 +12485,18 @@
>
>
> pkg_failed=no
> -{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
> $as_echo_n "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:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\""; } >&5
> ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14029,11 +12508,11 @@
> pkg_cv_GLIB_LIBS="$GLIB_LIBS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16\""; } >&5
> ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14059,19 +12538,15 @@
> # Put the nasty error message in config.log where it belongs
> echo "$GLIB_PKG_ERRORS" >&5
>
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> - { { $as_echo "$as_me:$LINENO: error: GLib >= 2.16 is required" >&5
> -$as_echo "$as_me: error: GLib >= 2.16 is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "GLib >= 2.16 is required" "$LINENO" 5
> elif test $pkg_failed = untried; then
> - { { $as_echo "$as_me:$LINENO: error: GLib >= 2.16 is required" >&5
> -$as_echo "$as_me: error: GLib >= 2.16 is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "GLib >= 2.16 is required" "$LINENO" 5
> else
> GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
> GLIB_LIBS=$pkg_cv_GLIB_LIBS
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> dummy=yes
> fi
> @@ -14080,24 +12555,22 @@
>
> if (test "${enable_threads}" = "yes"); then
>
> -cat >>confdefs.h <<\_ACEOF
> -#define NEED_THREADS 1
> -_ACEOF
> +$as_echo "#define NEED_THREADS 1" >>confdefs.h
>
>
> pkg_failed=no
> -{ $as_echo "$as_me:$LINENO: checking for GTHREAD" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5
> $as_echo_n "checking for GTHREAD... " >&6; }
>
> if test -n "$GTHREAD_CFLAGS"; then
> pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\""; } >&5
> ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 2.16" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14109,11 +12582,11 @@
> pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 2.16\""; } >&5
> ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 2.16") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 2.16" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14139,19 +12612,15 @@
> # Put the nasty error message in config.log where it belongs
> echo "$GTHREAD_PKG_ERRORS" >&5
>
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> - { { $as_echo "$as_me:$LINENO: error: GThread >= 2.16 is required" >&5
> -$as_echo "$as_me: error: GThread >= 2.16 is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "GThread >= 2.16 is required" "$LINENO" 5
> elif test $pkg_failed = untried; then
> - { { $as_echo "$as_me:$LINENO: error: GThread >= 2.16 is required" >&5
> -$as_echo "$as_me: error: GThread >= 2.16 is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "GThread >= 2.16 is required" "$LINENO" 5
> else
> GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
> GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> dummy=yes
> fi
> @@ -14161,18 +12630,18 @@
>
>
> pkg_failed=no
> -{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
> $as_echo_n "checking for DBUS... " >&6; }
>
> if test -n "$DBUS_CFLAGS"; then
> pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0\""; } >&5
> ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14184,11 +12653,11 @@
> pkg_cv_DBUS_LIBS="$DBUS_LIBS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0\""; } >&5
> ($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14214,34 +12683,26 @@
> # Put the nasty error message in config.log where it belongs
> echo "$DBUS_PKG_ERRORS" >&5
>
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> - { { $as_echo "$as_me:$LINENO: error: D-Bus >= 1.0 is required" >&5
> -$as_echo "$as_me: error: D-Bus >= 1.0 is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "D-Bus >= 1.0 is required" "$LINENO" 5
> elif test $pkg_failed = untried; then
> - { { $as_echo "$as_me:$LINENO: error: D-Bus >= 1.0 is required" >&5
> -$as_echo "$as_me: error: D-Bus >= 1.0 is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "D-Bus >= 1.0 is required" "$LINENO" 5
> else
> DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
> DBUS_LIBS=$pkg_cv_DBUS_LIBS
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> dummy=yes
> fi
> -{ $as_echo "$as_me:$LINENO: checking for dbus_watch_get_unix_fd in -ldbus-1" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus_watch_get_unix_fd in -ldbus-1" >&5
> $as_echo_n "checking for dbus_watch_get_unix_fd in -ldbus-1... " >&6; }
> -if test "${ac_cv_lib_dbus_1_dbus_watch_get_unix_fd+set}" = set; then
> +if test "${ac_cv_lib_dbus_1_dbus_watch_get_unix_fd+set}" = set; then :
> $as_echo_n "(cached) " >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> LIBS="-ldbus-1 $LIBS"
> -cat >conftest.$ac_ext <<_ACEOF
> -/* confdefs.h. */
> -_ACEOF
> -cat confdefs.h >>conftest.$ac_ext
> -cat >>conftest.$ac_ext <<_ACEOF
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> /* Override any GCC internal prototype to avoid an error.
> @@ -14259,49 +12720,22 @@
> return 0;
> }
> _ACEOF
> -rm -f conftest.$ac_objext 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:$LINENO: $ac_try_echo\""
> -$as_echo "$ac_try_echo") >&5
> - (eval "$ac_link") 2>conftest.er1
> - ac_status=$?
> - grep -v '^ *+' conftest.er1 >conftest.err
> - rm -f conftest.er1
> - cat conftest.err >&5
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); } && {
> - test -z "$ac_c_werror_flag" ||
> - test ! -s conftest.err
> - } && test -s conftest$ac_exeext && {
> - test "$cross_compiling" = yes ||
> - $as_test_x conftest$ac_exeext
> - }; then
> +if ac_fn_c_try_link "$LINENO"; then :
> ac_cv_lib_dbus_1_dbus_watch_get_unix_fd=yes
> else
> - $as_echo "$as_me: failed program was:" >&5
> -sed 's/^/| /' conftest.$ac_ext >&5
> -
> - ac_cv_lib_dbus_1_dbus_watch_get_unix_fd=no
> + ac_cv_lib_dbus_1_dbus_watch_get_unix_fd=no
> fi
> -
> -rm -rf conftest.dSYM
> -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> - conftest$ac_exeext conftest.$ac_ext
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> LIBS=$ac_check_lib_save_LIBS
> fi
> -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dbus_1_dbus_watch_get_unix_fd" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbus_1_dbus_watch_get_unix_fd" >&5
> $as_echo "$ac_cv_lib_dbus_1_dbus_watch_get_unix_fd" >&6; }
> -if test "x$ac_cv_lib_dbus_1_dbus_watch_get_unix_fd" = x""yes; then
> +if test "x$ac_cv_lib_dbus_1_dbus_watch_get_unix_fd" = x""yes; then :
> dummy=yes
> else
>
> -cat >>confdefs.h <<\_ACEOF
> -#define NEED_DBUS_WATCH_GET_UNIX_FD 1
> -_ACEOF
> +$as_echo "#define NEED_DBUS_WATCH_GET_UNIX_FD 1" >>confdefs.h
>
> fi
>
> @@ -14310,7 +12744,7 @@
>
>
> # Check whether --with-dbusconf was given.
> -if test "${with_dbusconf+set}" = set; then
> +if test "${with_dbusconf+set}" = set; then :
> withval=$with_dbusconf; path_dbusconf=${withval}
> else
> path_dbusconf="`$PKG_CONFIG --variable=sysconfdir dbus-1`"
> @@ -14324,7 +12758,7 @@
>
>
> # Check whether --enable-polkit was given.
> -if test "${enable_polkit+set}" = set; then
> +if test "${enable_polkit+set}" = set; then :
> enableval=$enable_polkit; enable_polkit=${enableval}
> else
> enable_polkit="no"
> @@ -14333,18 +12767,18 @@
> if (test "${enable_polkit}" != "no"); then
>
> pkg_failed=no
> -{ $as_echo "$as_me:$LINENO: checking for POLKIT" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5
> $as_echo_n "checking for POLKIT... " >&6; }
>
> if test -n "$POLKIT_CFLAGS"; then
> pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-dbus >= 0.7\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-dbus >= 0.7\""; } >&5
> ($PKG_CONFIG --exists --print-errors "polkit-dbus >= 0.7") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_POLKIT_CFLAGS=`$PKG_CONFIG --cflags "polkit-dbus >= 0.7" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14356,11 +12790,11 @@
> pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-dbus >= 0.7\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"polkit-dbus >= 0.7\""; } >&5
> ($PKG_CONFIG --exists --print-errors "polkit-dbus >= 0.7") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_POLKIT_LIBS=`$PKG_CONFIG --libs "polkit-dbus >= 0.7" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14386,19 +12820,15 @@
> # Put the nasty error message in config.log where it belongs
> echo "$POLKIT_PKG_ERRORS" >&5
>
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> - { { $as_echo "$as_me:$LINENO: error: PolicyKit >= 0.7 is required" >&5
> -$as_echo "$as_me: error: PolicyKit >= 0.7 is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "PolicyKit >= 0.7 is required" "$LINENO" 5
> elif test $pkg_failed = untried; then
> - { { $as_echo "$as_me:$LINENO: error: PolicyKit >= 0.7 is required" >&5
> -$as_echo "$as_me: error: PolicyKit >= 0.7 is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "PolicyKit >= 0.7 is required" "$LINENO" 5
> else
> POLKIT_CFLAGS=$pkg_cv_POLKIT_CFLAGS
> POLKIT_LIBS=$pkg_cv_POLKIT_LIBS
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> dummy=yes
> fi
> @@ -14428,7 +12858,7 @@
>
>
> # Check whether --enable-client was given.
> -if test "${enable_client+set}" = set; then
> +if test "${enable_client+set}" = set; then :
> enableval=$enable_client; enable_client=${enableval}
> fi
>
> @@ -14442,25 +12872,25 @@
>
>
> # Check whether --enable-tools was given.
> -if test "${enable_tools+set}" = set; then
> +if test "${enable_tools+set}" = set; then :
> enableval=$enable_tools; enable_tools=${enableval}
> fi
>
> if (test "${enable_tools}" = "yes"); then
>
> pkg_failed=no
> -{ $as_echo "$as_me:$LINENO: checking for NETLINK" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETLINK" >&5
> $as_echo_n "checking for NETLINK... " >&6; }
>
> if test -n "$NETLINK_CFLAGS"; then
> pkg_cv_NETLINK_CFLAGS="$NETLINK_CFLAGS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnl-1\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-1\""; } >&5
> ($PKG_CONFIG --exists --print-errors "libnl-1") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_NETLINK_CFLAGS=`$PKG_CONFIG --cflags "libnl-1" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14472,11 +12902,11 @@
> pkg_cv_NETLINK_LIBS="$NETLINK_LIBS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnl-1\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnl-1\""; } >&5
> ($PKG_CONFIG --exists --print-errors "libnl-1") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_NETLINK_LIBS=`$PKG_CONFIG --libs "libnl-1" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14502,19 +12932,15 @@
> # Put the nasty error message in config.log where it belongs
> echo "$NETLINK_PKG_ERRORS" >&5
>
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> - { { $as_echo "$as_me:$LINENO: error: Netlink library is required" >&5
> -$as_echo "$as_me: error: Netlink library is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "Netlink library is required" "$LINENO" 5
> elif test $pkg_failed = untried; then
> - { { $as_echo "$as_me:$LINENO: error: Netlink library is required" >&5
> -$as_echo "$as_me: error: Netlink library is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "Netlink library is required" "$LINENO" 5
> else
> NETLINK_CFLAGS=$pkg_cv_NETLINK_CFLAGS
> NETLINK_LIBS=$pkg_cv_NETLINK_LIBS
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> dummy=yes
> fi
> @@ -14531,7 +12957,7 @@
>
>
> # Check whether --enable-test was given.
> -if test "${enable_test+set}" = set; then
> +if test "${enable_test+set}" = set; then :
> enableval=$enable_test; enable_test=${enableval}
> fi
>
> @@ -14545,7 +12971,7 @@
>
>
> # Check whether --enable-fake was given.
> -if test "${enable_fake+set}" = set; then
> +if test "${enable_fake+set}" = set; then :
> enableval=$enable_fake; enable_fake=${enableval}
> fi
>
> @@ -14559,25 +12985,25 @@
>
>
> # Check whether --enable-capng was given.
> -if test "${enable_capng+set}" = set; then
> +if test "${enable_capng+set}" = set; then :
> enableval=$enable_capng; enable_capng=${enableval}
> fi
>
> if (test "${enable_capng}" = "yes"); then
>
> pkg_failed=no
> -{ $as_echo "$as_me:$LINENO: checking for CAPNG" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAPNG" >&5
> $as_echo_n "checking for CAPNG... " >&6; }
>
> if test -n "$CAPNG_CFLAGS"; then
> pkg_cv_CAPNG_CFLAGS="$CAPNG_CFLAGS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcap-ng\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcap-ng\""; } >&5
> ($PKG_CONFIG --exists --print-errors "libcap-ng") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_CAPNG_CFLAGS=`$PKG_CONFIG --cflags "libcap-ng" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14589,11 +13015,11 @@
> pkg_cv_CAPNG_LIBS="$CAPNG_LIBS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcap-ng\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcap-ng\""; } >&5
> ($PKG_CONFIG --exists --print-errors "libcap-ng") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_CAPNG_LIBS=`$PKG_CONFIG --libs "libcap-ng" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14619,51 +13045,45 @@
> # Put the nasty error message in config.log where it belongs
> echo "$CAPNG_PKG_ERRORS" >&5
>
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> - { { $as_echo "$as_me:$LINENO: error: Capabilities library is required" >&5
> -$as_echo "$as_me: error: Capabilities library is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "Capabilities library is required" "$LINENO" 5
> elif test $pkg_failed = untried; then
> - { { $as_echo "$as_me:$LINENO: error: Capabilities library is required" >&5
> -$as_echo "$as_me: error: Capabilities library is required" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "Capabilities library is required" "$LINENO" 5
> else
> CAPNG_CFLAGS=$pkg_cv_CAPNG_CFLAGS
> CAPNG_LIBS=$pkg_cv_CAPNG_LIBS
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> dummy=yes
> fi
>
>
>
> -cat >>confdefs.h <<\_ACEOF
> -#define HAVE_CAPNG 1
> -_ACEOF
> +$as_echo "#define HAVE_CAPNG 1" >>confdefs.h
>
> fi
>
> # Check whether --enable-udev was given.
> -if test "${enable_udev+set}" = set; then
> +if test "${enable_udev+set}" = set; then :
> enableval=$enable_udev; enable_udev=${enableval}
> fi
>
> if (test "${enable_udev}" != "no"); then
>
> pkg_failed=no
> -{ $as_echo "$as_me:$LINENO: checking for UDEV" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
> $as_echo_n "checking for UDEV... " >&6; }
>
> if test -n "$UDEV_CFLAGS"; then
> pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libudev >= 143\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 143\""; } >&5
> ($PKG_CONFIG --exists --print-errors "libudev >= 143") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev >= 143" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14675,11 +13095,11 @@
> pkg_cv_UDEV_LIBS="$UDEV_LIBS"
> elif test -n "$PKG_CONFIG"; then
> if test -n "$PKG_CONFIG" && \
> - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libudev >= 143\"") >&5
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev >= 143\""; } >&5
> ($PKG_CONFIG --exists --print-errors "libudev >= 143") 2>&5
> ac_status=$?
> - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> - (exit $ac_status); }; then
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev >= 143" 2>/dev/null`
> else
> pkg_failed=yes
> @@ -14705,7 +13125,7 @@
> # Put the nasty error message in config.log where it belongs
> echo "$UDEV_PKG_ERRORS" >&5
>
> - { $as_echo "$as_me:$LINENO: result: no" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
> $as_echo "no" >&6; }
> enable_udev="no"
> elif test $pkg_failed = untried; then
> @@ -14713,7 +13133,7 @@
> else
> UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
> UDEV_LIBS=$pkg_cv_UDEV_LIBS
> - { $as_echo "$as_me:$LINENO: result: yes" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> $as_echo "yes" >&6; }
> enable_udev="yes"
> fi
> @@ -14739,7 +13159,7 @@
>
>
> # Check whether --enable-datafiles was given.
> -if test "${enable_datafiles+set}" = set; then
> +if test "${enable_datafiles+set}" = set; then :
> enableval=$enable_datafiles; enable_datafiles=${enableval}
> fi
>
> @@ -14781,13 +13201,13 @@
> case $ac_val in #(
> *${as_nl}*)
> case $ac_var in #(
> - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
> + *_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;} ;;
> esac
> case $ac_var in #(
> _ | IFS | as_nl) ;; #(
> BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
> - *) $as_unset $ac_var ;;
> + *) { eval $ac_var=; unset $ac_var;} ;;
> esac ;;
> esac
> done
> @@ -14795,8 +13215,8 @@
> (set) 2>&1 |
> case $as_nl`(ac_space=' '; set) 2>&1` in #(
> *${as_nl}ac_space=\ *)
> - # `set' does not quote correctly, so add quotes (double-quote
> - # substitution turns \\\\ into \\, and sed turns \\ into \).
> + # `set' does not quote correctly, so add quotes: double-quote
> + # substitution turns \\\\ into \\, and sed turns \\ into \.
> sed -n \
> "s/'/'\\\\''/g;
> s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
> @@ -14819,11 +13239,11 @@
> if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
> if test -w "$cache_file"; then
> test "x$cache_file" != "x/dev/null" &&
> - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
> $as_echo "$as_me: updating cache $cache_file" >&6;}
> cat confcache >$cache_file
> else
> - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
> + { $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;}
> fi
> fi
> @@ -14843,8 +13263,8 @@
> ac_i=`$as_echo "$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.
> - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
> - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
> + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
> + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
> done
> LIBOBJS=$ac_libobjs
>
> @@ -14860,328 +13280,194 @@
> fi
>
> if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"AMDEP\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"am__fastdepCC\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${ETHERNET_TRUE}" && test -z "${ETHERNET_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"ETHERNET\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"ETHERNET\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"ETHERNET\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${ETHERNET_BUILTIN_TRUE}" && test -z "${ETHERNET_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"ETHERNET_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"ETHERNET_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"ETHERNET_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${WIFI_TRUE}" && test -z "${WIFI_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"WIFI\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"WIFI\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"WIFI\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${WIFI_BUILTIN_TRUE}" && test -z "${WIFI_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"WIFI_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"WIFI_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"WIFI_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${BLUETOOTH_TRUE}" && test -z "${BLUETOOTH_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"BLUETOOTH\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"BLUETOOTH\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"BLUETOOTH\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${BLUETOOTH_BUILTIN_TRUE}" && test -z "${BLUETOOTH_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"BLUETOOTH_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"BLUETOOTH_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"BLUETOOTH_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${HH2SERIAL_GPS_TRUE}" && test -z "${HH2SERIAL_GPS_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"HH2SERIAL_GPS\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"HH2SERIAL_GPS\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"HH2SERIAL_GPS\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${HH2SERIAL_GPS_BUILTIN_TRUE}" && test -z "${HH2SERIAL_GPS_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"HH2SERIAL_GPS_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"HH2SERIAL_GPS_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"HH2SERIAL_GPS_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${OFONO_TRUE}" && test -z "${OFONO_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"OFONO\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"OFONO\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"OFONO\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${OFONO_BUILTIN_TRUE}" && test -z "${OFONO_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"OFONO_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"OFONO_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"OFONO_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${UDHCP_TRUE}" && test -z "${UDHCP_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"UDHCP\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"UDHCP\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"UDHCP\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${UDHCP_BUILTIN_TRUE}" && test -z "${UDHCP_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"UDHCP_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"UDHCP_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"UDHCP_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${DHCLIENT_TRUE}" && test -z "${DHCLIENT_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"DHCLIENT\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"DHCLIENT\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"DHCLIENT\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${DHCLIENT_BUILTIN_TRUE}" && test -z "${DHCLIENT_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"DHCLIENT_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"DHCLIENT_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"DHCLIENT_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${RESOLVCONF_TRUE}" && test -z "${RESOLVCONF_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"RESOLVCONF\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"RESOLVCONF\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"RESOLVCONF\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${RESOLVCONF_BUILTIN_TRUE}" && test -z "${RESOLVCONF_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"RESOLVCONF_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"RESOLVCONF_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"RESOLVCONF_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${OPENCONNECT_TRUE}" && test -z "${OPENCONNECT_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"OPENCONNECT\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"OPENCONNECT\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"OPENCONNECT\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${OPENCONNECT_BUILTIN_TRUE}" && test -z "${OPENCONNECT_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"OPENCONNECT_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"OPENCONNECT_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"OPENCONNECT_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${PORTAL_TRUE}" && test -z "${PORTAL_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"PORTAL\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"PORTAL\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"PORTAL\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${PORTAL_BUILTIN_TRUE}" && test -z "${PORTAL_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"PORTAL_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"PORTAL_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"PORTAL_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${LOOPBACK_TRUE}" && test -z "${LOOPBACK_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"LOOPBACK\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"LOOPBACK\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"LOOPBACK\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${LOOPBACK_BUILTIN_TRUE}" && test -z "${LOOPBACK_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"LOOPBACK_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"LOOPBACK_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"LOOPBACK_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${DNSPROXY_TRUE}" && test -z "${DNSPROXY_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"DNSPROXY\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"DNSPROXY\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"DNSPROXY\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${DNSPROXY_BUILTIN_TRUE}" && test -z "${DNSPROXY_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"DNSPROXY_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"DNSPROXY_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"DNSPROXY_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${GOOGLE_TRUE}" && test -z "${GOOGLE_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"GOOGLE\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"GOOGLE\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"GOOGLE\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${GOOGLE_BUILTIN_TRUE}" && test -z "${GOOGLE_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"GOOGLE_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"GOOGLE_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"GOOGLE_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${MEEGO_TRUE}" && test -z "${MEEGO_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"MEEGO\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"MEEGO\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"MEEGO\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${MEEGO_BUILTIN_TRUE}" && test -z "${MEEGO_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"MEEGO_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"MEEGO_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"MEEGO_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${IWMX_TRUE}" && test -z "${IWMX_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"IWMX\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"IWMX\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"IWMX\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${IOSPM_TRUE}" && test -z "${IOSPM_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"IOSPM\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"IOSPM\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"IOSPM\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${NTPD_TRUE}" && test -z "${NTPD_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"NTPD\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"NTPD\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"NTPD\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${NTPD_BUILTIN_TRUE}" && test -z "${NTPD_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"NTPD_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"NTPD_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"NTPD_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${POLKIT_TRUE}" && test -z "${POLKIT_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"POLKIT\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"POLKIT\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"POLKIT\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${POLKIT_BUILTIN_TRUE}" && test -z "${POLKIT_BUILTIN_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"POLKIT_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"POLKIT_BUILTIN\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"POLKIT_BUILTIN\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${CLIENT_TRUE}" && test -z "${CLIENT_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"CLIENT\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"CLIENT\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"CLIENT\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${TOOLS_TRUE}" && test -z "${TOOLS_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"TOOLS\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"TOOLS\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"TOOLS\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${TEST_TRUE}" && test -z "${TEST_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"TEST\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"TEST\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"TEST\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${FAKE_TRUE}" && test -z "${FAKE_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"FAKE\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"FAKE\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"FAKE\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${UDEV_TRUE}" && test -z "${UDEV_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"UDEV\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"UDEV\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"UDEV\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
> if test -z "${DATAFILES_TRUE}" && test -z "${DATAFILES_FALSE}"; then
> - { { $as_echo "$as_me:$LINENO: error: conditional \"DATAFILES\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&5
> -$as_echo "$as_me: error: conditional \"DATAFILES\" was never defined.
> -Usually this means the macro was only invoked conditionally." >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "conditional \"DATAFILES\" was never defined.
> +Usually this means the macro was only invoked conditionally." "$LINENO" 5
> fi
>
> : ${CONFIG_STATUS=./config.status}
> ac_write_fail=0
> ac_clean_files_save=$ac_clean_files
> ac_clean_files="$ac_clean_files $CONFIG_STATUS"
> -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
> $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
> -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
> +as_write_fail=0
> +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
> #! $SHELL
> # Generated by $as_me.
> # Run this file to recreate the current configuration.
> @@ -15191,17 +13477,18 @@
> debug=false
> ac_cs_recheck=false
> ac_cs_silent=false
> -SHELL=\${CONFIG_SHELL-$SHELL}
> -_ACEOF
>
> -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
> -## --------------------- ##
> -## M4sh Initialization. ##
> -## --------------------- ##
> +SHELL=\${CONFIG_SHELL-$SHELL}
> +export SHELL
> +_ASEOF
> +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
> +## -------------------- ##
> +## M4sh Initialization. ##
> +## -------------------- ##
>
> # Be more Bourne compatible
> DUALCASE=1; export DUALCASE # for MKS sh
> -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
> +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
> emulate sh
> NULLCMD=:
> # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
> @@ -15209,23 +13496,15 @@
> alias -g '${1+"$@"}'='"$@"'
> setopt NO_GLOB_SUBST
> else
> - case `(set -o) 2>/dev/null` in
> - *posix*) set -o posix ;;
> + case `(set -o) 2>/dev/null` in #(
> + *posix*) :
> + set -o posix ;; #(
> + *) :
> + ;;
> esac
> -
> fi
>
>
> -
> -
> -# PATH needs CR
> -# Avoid depending upon Character Ranges.
> -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
> -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
> -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
> -as_cr_digits='0123456789'
> -as_cr_alnum=$as_cr_Letters$as_cr_digits
> -
> as_nl='
> '
> export as_nl
> @@ -15233,7 +13512,13 @@
> 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
> -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
> +# 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
> @@ -15244,7 +13529,7 @@
> as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
> as_echo_n_body='eval
> arg=$1;
> - case $arg in
> + case $arg in #(
> *"$as_nl"*)
> expr "X$arg" : "X\\(.*\\)$as_nl";
> arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
> @@ -15267,13 +13552,6 @@
> }
> fi
>
> -# Support unset when possible.
> -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
> - as_unset=unset
> -else
> - as_unset=false
> -fi
> -
>
> # IFS
> # We need space, tab and new line, in precisely that order. Quoting is
> @@ -15283,15 +13561,15 @@
> IFS=" "" $as_nl"
>
> # Find who we are. Look in the path if we contain no directory separator.
> -case $0 in
> +case $0 in #((
> *[\\/]* ) as_myself=$0 ;;
> *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> 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
> -done
> + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
> + done
> IFS=$as_save_IFS
>
> ;;
> @@ -15303,12 +13581,16 @@
> fi
> if test ! -f "$as_myself"; then
> $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
> - { (exit 1); exit 1; }
> + exit 1
> fi
>
> -# Work around bugs in pre-3.0 UWIN ksh.
> -for as_var in ENV MAIL MAILPATH
> -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
> +# 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='> '
> @@ -15320,7 +13602,89 @@
> LANGUAGE=C
> export LANGUAGE
>
> -# Required to use basename.
> +# CDPATH.
> +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
> +
> +
> +# as_fn_error ERROR [LINENO LOG_FD]
> +# ---------------------------------
> +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
> +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
> +# script with status $?, using 1 if that was 0.
> +as_fn_error ()
> +{
> + as_status=$?; test $as_status -eq 0 && as_status=1
> + if test "$3"; then
> + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
> + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
> + fi
> + $as_echo "$as_me: error: $1" >&2
> + as_fn_exit $as_status
> +} # as_fn_error
> +
> +
> +# as_fn_set_status STATUS
> +# -----------------------
> +# Set $? to STATUS, without forking.
> +as_fn_set_status ()
> +{
> + return $1
> +} # as_fn_set_status
> +
> +# as_fn_exit STATUS
> +# -----------------
> +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
> +as_fn_exit ()
> +{
> + set +e
> + as_fn_set_status $1
> + exit $1
> +} # as_fn_exit
> +
> +# as_fn_unset VAR
> +# ---------------
> +# Portably unset VAR.
> +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 :
> + eval 'as_fn_append ()
> + {
> + eval $1+=\$2
> + }'
> +else
> + as_fn_append ()
> + {
> + eval $1=\$$1\$2
> + }
> +fi # as_fn_append
> +
> +# as_fn_arith ARG...
> +# ------------------
> +# 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 :
> + eval 'as_fn_arith ()
> + {
> + as_val=$(( $* ))
> + }'
> +else
> + as_fn_arith ()
> + {
> + as_val=`expr "$@" || test $? -eq 1`
> + }
> +fi # as_fn_arith
> +
> +
> if expr a : '\(a\)' >/dev/null 2>&1 &&
> test "X`expr 00001 : '.*\(...\)'`" = X001; then
> as_expr=expr
> @@ -15334,8 +13698,12 @@
> as_basename=false
> fi
>
> +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
> + as_dirname=dirname
> +else
> + as_dirname=false
> +fi
>
> -# Name of the executable.
> as_me=`$as_basename -- "$0" ||
> $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
> X"$0" : 'X\(//\)$' \| \
> @@ -15355,76 +13723,25 @@
> }
> s/.*/./; q'`
>
> -# CDPATH.
> -$as_unset CDPATH
> -
> -
> -
> - as_lineno_1=$LINENO
> - as_lineno_2=$LINENO
> - test "x$as_lineno_1" != "x$as_lineno_2" &&
> - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
> -
> - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
> - # uniformly replaced by the line number. The first 'sed' inserts a
> - # line-number line after each line using $LINENO; the second 'sed'
> - # does the real work. The second script uses 'N' to pair each
> - # line-number line with the line containing $LINENO, and appends
> - # trailing '-' during substitution so that $LINENO is not a special
> - # case at line end.
> - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
> - # scripts with optimization help from Paolo Bonzini. Blame Lee
> - # E. McMahon (1931-1989) for sed's syntax. :-)
> - sed -n '
> - p
> - /[$]LINENO/=
> - ' <$as_myself |
> - sed '
> - s/[$]LINENO.*/&-/
> - t lineno
> - b
> - :lineno
> - N
> - :loop
> - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
> - t loop
> - 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
> - { (exit 1); exit 1; }; }
> -
> - # Don't try to exec as it changes $[0], causing all sort of problems
> - # (the dirname of $[0] is not the place where we might find the
> - # original and so on. Autoconf is especially sensitive to this).
> - . "./$as_me.lineno"
> - # Exit status is that of the last command.
> - exit
> -}
> -
> -
> -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
> - as_dirname=dirname
> -else
> - as_dirname=false
> -fi
> +# Avoid depending upon Character Ranges.
> +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
> +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
> +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
> +as_cr_digits='0123456789'
> +as_cr_alnum=$as_cr_Letters$as_cr_digits
>
> ECHO_C= ECHO_N= ECHO_T=
> -case `echo -n x` in
> +case `echo -n x` in #(((((
> -n*)
> - case `echo 'x\c'` in
> + case `echo 'xy\c'` in
> *c*) ECHO_T=' ';; # ECHO_T is single tab character.
> - *) ECHO_C='\c';;
> + xy) ECHO_C='\c';;
> + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
> + ECHO_T=' ';;
> esac;;
> *)
> ECHO_N='-n';;
> esac
> -if expr a : '\(a\)' >/dev/null 2>&1 &&
> - test "X`expr 00001 : '.*\(...\)'`" = X001; then
> - as_expr=expr
> -else
> - as_expr=false
> -fi
>
> rm -f conf$$ conf$$.exe conf$$.file
> if test -d conf$$.dir; then
> @@ -15453,8 +13770,56 @@
> rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
> rmdir conf$$.dir 2>/dev/null
>
> +
> +# as_fn_mkdir_p
> +# -------------
> +# Create "$as_dir" as a directory, including parents if necessary.
> +as_fn_mkdir_p ()
> +{
> +
> + case $as_dir in #(
> + -*) as_dir=./$as_dir;;
> + esac
> + test -d "$as_dir" || eval $as_mkdir_p || {
> + as_dirs=
> + while :; do
> + case $as_dir in #(
> + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
> + *) as_qdir=$as_dir;;
> + esac
> + as_dirs="'$as_qdir' $as_dirs"
> + as_dir=`$as_dirname -- "$as_dir" ||
> +$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" |
> + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
> + s//\1/
> + q
> + }
> + /^X\(\/\/\)[^/].*/{
> + s//\1/
> + q
> + }
> + /^X\(\/\/\)$/{
> + s//\1/
> + q
> + }
> + /^X\(\/\).*/{
> + s//\1/
> + q
> + }
> + s/.*/./; q'`
> + test -d "$as_dir" && break
> + done
> + test -z "$as_dirs" || eval "mkdir $as_dirs"
> + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
> +
> +
> +} # as_fn_mkdir_p
> if mkdir -p . 2>/dev/null; then
> - as_mkdir_p=:
> + as_mkdir_p='mkdir -p "$as_dir"'
> else
> test -d ./-p && rmdir ./-p
> as_mkdir_p=false
> @@ -15473,10 +13838,10 @@
> if test -d "$1"; then
> test -d "$1/.";
> else
> - case $1 in
> + case $1 in #(
> -*)set "./$1";;
> esac;
> - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
> + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
> ???[sx]*):;;*)false;;esac;fi
> '\'' sh
> '
> @@ -15491,13 +13856,19 @@
>
>
> exec 6>&1
> +## ----------------------------------- ##
> +## Main body of $CONFIG_STATUS script. ##
> +## ----------------------------------- ##
> +_ASEOF
> +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
>
> -# Save the log message, to keep $[0] and so on meaningful, and to
> +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
> +# Save the log message, to keep $0 and so on meaningful, and to
> # report actual input values of CONFIG_FILES etc. instead of their
> # values after options handling.
> ac_log="
> -This file was extended by connman $as_me 0.54, which was
> -generated by GNU Autoconf 2.63. Invocation command line was
> +This file was extended by connman $as_me 0.54.2, which was
> +generated by GNU Autoconf 2.64. Invocation command line was
>
> CONFIG_FILES = $CONFIG_FILES
> CONFIG_HEADERS = $CONFIG_HEADERS
> @@ -15529,10 +13900,11 @@
>
> cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
> ac_cs_usage="\
> -\`$as_me' instantiates files from templates according to the
> -current configuration.
> +\`$as_me' instantiates files and other configuration actions
> +from templates according to the current configuration. Unless the files
> +and actions are specified as TAGs, all are instantiated by default.
>
> -Usage: $0 [OPTION]... [FILE]...
> +Usage: $0 [OPTION]... [TAG]...
>
> -h, --help print this help, then exit
> -V, --version print version number and configuration settings, then exit
> @@ -15554,16 +13926,16 @@
> Configuration commands:
> $config_commands
>
> -Report bugs to <bug-autoconf at gnu.org>."
> +Report bugs to the package provider."
>
> _ACEOF
> cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
> ac_cs_version="\\
> -connman config.status 0.54
> -configured by $0, generated by GNU Autoconf 2.63,
> +connman config.status 0.54.2
> +configured by $0, generated by GNU Autoconf 2.64,
> with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
>
> -Copyright (C) 2008 Free Software Foundation, Inc.
> +Copyright (C) 2009 Free Software Foundation, Inc.
> This config.status script is free software; the Free Software Foundation
> gives unlimited permission to copy, distribute and modify it."
>
> @@ -15606,20 +13978,19 @@
> case $ac_optarg in
> *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
> esac
> - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
> + as_fn_append CONFIG_FILES " '$ac_optarg'"
> ac_need_defaults=false;;
> --header | --heade | --head | --hea )
> $ac_shift
> case $ac_optarg in
> *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
> esac
> - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
> + as_fn_append CONFIG_HEADERS " '$ac_optarg'"
> ac_need_defaults=false;;
> --he | --h)
> # Conflict between --help and --header
> - { $as_echo "$as_me: error: ambiguous option: $1
> -Try \`$0 --help' for more information." >&2
> - { (exit 1); exit 1; }; };;
> + as_fn_error "ambiguous option: \`$1'
> +Try \`$0 --help' for more information.";;
> --help | --hel | -h )
> $as_echo "$ac_cs_usage"; exit ;;
> -q | -quiet | --quiet | --quie | --qui | --qu | --q \
> @@ -15627,11 +13998,10 @@
> ac_cs_silent=: ;;
>
> # This is an error.
> - -*) { $as_echo "$as_me: error: unrecognized option: $1
> -Try \`$0 --help' for more information." >&2
> - { (exit 1); exit 1; }; } ;;
> + -*) as_fn_error "unrecognized option: \`$1'
> +Try \`$0 --help' for more information." ;;
>
> - *) ac_config_targets="$ac_config_targets $1"
> + *) as_fn_append ac_config_targets " $1"
> ac_need_defaults=false ;;
>
> esac
> @@ -15947,9 +14317,7 @@
> "doc/version.xml") CONFIG_FILES="$CONFIG_FILES doc/version.xml" ;;
> "connman.pc") CONFIG_FILES="$CONFIG_FILES connman.pc" ;;
>
> - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
> -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
> - { (exit 1); exit 1; }; };;
> + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
> esac
> done
>
> @@ -15976,7 +14344,7 @@
> trap 'exit_status=$?
> { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
> ' 0
> - trap '{ (exit 1); exit 1; }' 1 2 13 15
> + trap 'as_fn_exit 1' 1 2 13 15
> }
> # Create a (secure) tmp directory for tmp files.
>
> @@ -15987,11 +14355,7 @@
> {
> tmp=./conf$$-$RANDOM
> (umask 077 && mkdir "$tmp")
> -} ||
> -{
> - $as_echo "$as_me: cannot create a temporary directory in ." >&2
> - { (exit 1); exit 1; }
> -}
> +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
>
> # Set up the scripts for CONFIG_FILES section.
> # No need to generate them if there are no CONFIG_FILES.
> @@ -15999,10 +14363,16 @@
> if test -n "$CONFIG_FILES"; then
>
>
> -ac_cr='
> '
> +ac_cr=`echo X | tr X '\015'`
> +# On cygwin, bash can eat \r inside `` if the user requested igncr.
> +# But we know of no other shell where ac_cr would be empty at this
> +# point, so we can use a bashism as a fallback.
> +if test "x$ac_cr" = x; then
> + eval ac_cr=\$\'\\r\'
> +fi
> ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
> if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
> - ac_cs_awk_cr='\\r'
> + ac_cs_awk_cr='\r'
> else
> ac_cs_awk_cr=$ac_cr
> fi
> @@ -16016,24 +14386,18 @@
> echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
> echo "_ACEOF"
> } >conf$$subs.sh ||
> - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
> -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
> ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
> ac_delim='%!_!# '
> for ac_last_try in false false false false false :; do
> . ./conf$$subs.sh ||
> - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
> -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
>
> ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
> if test $ac_delim_n = $ac_delim_num; then
> break
> elif $ac_last_try; then
> - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
> -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
> else
> ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
> fi
> @@ -16122,9 +14486,7 @@
> else
> cat
> fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
> - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
> -$as_echo "$as_me: error: could not setup config files machinery" >&2;}
> - { (exit 1); exit 1; }; }
> + || as_fn_error "could not setup config files machinery" "$LINENO" 5
> _ACEOF
>
> # VPATH may cause trouble with some makes, so we remove $(srcdir),
> @@ -16165,9 +14527,7 @@
> if test -z "$ac_t"; then
> break
> elif $ac_last_try; then
> - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
> -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
> else
> ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
> fi
> @@ -16252,9 +14612,7 @@
> _ACAWK
> _ACEOF
> cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
> - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
> -$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "could not setup config headers machinery" "$LINENO" 5
> fi # test -n "$CONFIG_HEADERS"
>
>
> @@ -16267,9 +14625,7 @@
> esac
> case $ac_mode$ac_tag in
> :[FHL]*:*);;
> - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
> -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
> - { (exit 1); exit 1; }; };;
> + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
> :[FH]-) ac_tag=-:-;;
> :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
> esac
> @@ -16297,12 +14653,10 @@
> [\\/$]*) false;;
> *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
> esac ||
> - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
> -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
> - { (exit 1); exit 1; }; };;
> + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
> esac
> case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
> - ac_file_inputs="$ac_file_inputs '$ac_f'"
> + as_fn_append ac_file_inputs " '$ac_f'"
> done
>
> # Let's still pretend it is `configure' which instantiates (i.e., don't
> @@ -16313,7 +14667,7 @@
> `' by configure.'
> if test x"$ac_file" != x-; then
> configure_input="$ac_file. $configure_input"
> - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
> $as_echo "$as_me: creating $ac_file" >&6;}
> fi
> # Neutralize special characters interpreted by sed in replacement strings.
> @@ -16326,9 +14680,7 @@
>
> case $ac_tag in
> *:-:* | *:-) cat >"$tmp/stdin" \
> - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
> -$as_echo "$as_me: error: could not create $ac_file" >&2;}
> - { (exit 1); exit 1; }; } ;;
> + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
> esac
> ;;
> esac
> @@ -16356,47 +14708,7 @@
> q
> }
> s/.*/./; q'`
> - { as_dir="$ac_dir"
> - case $as_dir in #(
> - -*) as_dir=./$as_dir;;
> - esac
> - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
> - as_dirs=
> - while :; do
> - case $as_dir in #(
> - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
> - *) as_qdir=$as_dir;;
> - esac
> - as_dirs="'$as_qdir' $as_dirs"
> - as_dir=`$as_dirname -- "$as_dir" ||
> -$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" |
> - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
> - s//\1/
> - q
> - }
> - /^X\(\/\/\)[^/].*/{
> - s//\1/
> - q
> - }
> - /^X\(\/\/\)$/{
> - s//\1/
> - q
> - }
> - /^X\(\/\).*/{
> - s//\1/
> - q
> - }
> - s/.*/./; q'`
> - test -d "$as_dir" && break
> - done
> - test -z "$as_dirs" || eval "mkdir $as_dirs"
> - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
> -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
> - { (exit 1); exit 1; }; }; }
> + as_dir="$ac_dir"; as_fn_mkdir_p
> ac_builddir=.
>
> case "$ac_dir" in
> @@ -16453,7 +14765,6 @@
> # If the template does not know about datarootdir, expand it.
> # FIXME: This hack should be removed a few years after 2.60.
> ac_datarootdir_hack=; ac_datarootdir_seen=
> -
> ac_sed_dataroot='
> /datarootdir/ {
> p
> @@ -16463,12 +14774,11 @@
> /@docdir@/p
> /@infodir@/p
> /@localedir@/p
> -/@mandir@/p
> -'
> +/@mandir@/p'
> 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:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
> + { $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;}
> _ACEOF
> cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
> @@ -16478,7 +14788,7 @@
> s&@infodir@&$infodir&g
> s&@localedir@&$localedir&g
> s&@mandir@&$mandir&g
> - s&\\\${datarootdir}&$datarootdir&g' ;;
> + s&\\\${datarootdir}&$datarootdir&g' ;;
> esac
> _ACEOF
>
> @@ -16507,14 +14817,12 @@
> $ac_datarootdir_hack
> "
> eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
> - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
> -$as_echo "$as_me: error: could not create $ac_file" >&2;}
> - { (exit 1); exit 1; }; }
> + || as_fn_error "could not create $ac_file" "$LINENO" 5
>
> test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
> { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
> { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
> - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
> + { $as_echo "$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'
> which seems to be undefined. Please make sure it is defined." >&2;}
> @@ -16524,9 +14832,7 @@
> -) cat "$tmp/out" && rm -f "$tmp/out";;
> *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
> esac \
> - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
> -$as_echo "$as_me: error: could not create $ac_file" >&2;}
> - { (exit 1); exit 1; }; }
> + || as_fn_error "could not create $ac_file" "$LINENO" 5
> ;;
> :H)
> #
> @@ -16537,25 +14843,19 @@
> $as_echo "/* $configure_input */" \
> && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
> } >"$tmp/config.h" \
> - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
> -$as_echo "$as_me: error: could not create $ac_file" >&2;}
> - { (exit 1); exit 1; }; }
> + || as_fn_error "could not create $ac_file" "$LINENO" 5
> if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
> - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
> $as_echo "$as_me: $ac_file is unchanged" >&6;}
> else
> rm -f "$ac_file"
> mv "$tmp/config.h" "$ac_file" \
> - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
> -$as_echo "$as_me: error: could not create $ac_file" >&2;}
> - { (exit 1); exit 1; }; }
> + || as_fn_error "could not create $ac_file" "$LINENO" 5
> fi
> else
> $as_echo "/* $configure_input */" \
> && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
> - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
> -$as_echo "$as_me: error: could not create -" >&2;}
> - { (exit 1); exit 1; }; }
> + || as_fn_error "could not create -" "$LINENO" 5
> fi
> # Compute "$ac_file"'s index in $config_headers.
> _am_arg="$ac_file"
> @@ -16593,7 +14893,7 @@
> s/.*/./; q'`/stamp-h$_am_stamp_count
> ;;
>
> - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
> + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
> $as_echo "$as_me: executing $ac_file commands" >&6;}
> ;;
> esac
> @@ -16688,47 +14988,7 @@
> q
> }
> s/.*/./; q'`
> - { as_dir=$dirpart/$fdir
> - case $as_dir in #(
> - -*) as_dir=./$as_dir;;
> - esac
> - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
> - as_dirs=
> - while :; do
> - case $as_dir in #(
> - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
> - *) as_qdir=$as_dir;;
> - esac
> - as_dirs="'$as_qdir' $as_dirs"
> - as_dir=`$as_dirname -- "$as_dir" ||
> -$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" |
> - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
> - s//\1/
> - q
> - }
> - /^X\(\/\/\)[^/].*/{
> - s//\1/
> - q
> - }
> - /^X\(\/\/\)$/{
> - s//\1/
> - q
> - }
> - /^X\(\/\).*/{
> - s//\1/
> - q
> - }
> - s/.*/./; q'`
> - test -d "$as_dir" && break
> - done
> - test -z "$as_dirs" || eval "mkdir $as_dirs"
> - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
> -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
> - { (exit 1); exit 1; }; }; }
> + as_dir=$dirpart/$fdir; as_fn_mkdir_p
> # echo "creating $dirpart/$file"
> echo '# dummy' > "$dirpart/$file"
> done
> @@ -17375,15 +15635,12 @@
> done # for ac_tag
>
>
> -{ (exit 0); exit 0; }
> +as_fn_exit 0
> _ACEOF
> -chmod +x $CONFIG_STATUS
> ac_clean_files=$ac_clean_files_save
>
> test $ac_write_fail = 0 ||
> - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
> -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
> - { (exit 1); exit 1; }; }
> + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
>
>
> # configure is writing to config.log, and then calls config.status.
> @@ -17404,10 +15661,10 @@
> exec 5>>config.log
> # Use ||, not &&, to avoid exiting from the if with $? = 1, which
> # would make configure fail if this is the last instruction.
> - $ac_cs_success || { (exit 1); exit 1; }
> + $ac_cs_success || as_fn_exit $?
> fi
> if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
> - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
> + { $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;}
> fi
>
> --- configure.ac
> +++ configure.ac
> @@ -1,5 +1,5 @@
> AC_PREREQ(2.60)
> -AC_INIT(connman, 0.54)
> +AC_INIT(connman, 0.54.2)
>
> AM_INIT_AUTOMAKE([foreign subdir-objects])
> AM_CONFIG_HEADER(config.h)
> --- ltmain.sh
> +++ ltmain.sh
> @@ -1,6 +1,6 @@
> # Generated from ltmain.m4sh.
>
> -# ltmain.sh (GNU libtool) 2.2.6b
> +# ltmain.sh (GNU libtool) 2.2.6
> # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
>
> # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
> @@ -65,7 +65,7 @@
> # compiler: $LTCC
> # compiler flags: $LTCFLAGS
> # linker: $LD (gnu? $with_gnu_ld)
> -# $progname: (GNU libtool) 2.2.6b
> +# $progname: (GNU libtool) 2.2.6
> # automake: $automake_version
> # autoconf: $autoconf_version
> #
> @@ -73,9 +73,9 @@
>
> PROGRAM=ltmain.sh
> PACKAGE=libtool
> -VERSION=2.2.6b
> +VERSION=2.2.6
> TIMESTAMP=""
> -package_revision=1.3017
> +package_revision=1.3012
>
> # Be Bourne compatible
> if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
> --- plugins/dhclient.c
> +++ plugins/dhclient.c
> @@ -114,15 +114,34 @@
> char *ifname;
> };
>
> +static void dhclient_unlink(const char *ifname)
> +{
> + char *pathname;
> +
> + pathname = g_strdup_printf("%s/dhclient.%s.pid",
> + STATEDIR, ifname);
> + unlink(pathname);
> + g_free(pathname);
> +
> + pathname = g_strdup_printf("%s/dhclient.%s.leases",
> + STATEDIR, ifname);
> + unlink(pathname);
> + g_free(pathname);
> +}
> +
> static void dhclient_died(struct connman_task *task, void *user_data)
> {
> struct dhclient_data *dhclient = user_data;
>
> + connman_dhcp_set_data(dhclient->dhcp, NULL);
> +
> connman_dhcp_unref(dhclient->dhcp);
>
> connman_task_destroy(dhclient->task);
> dhclient->task = NULL;
>
> + dhclient_unlink(dhclient->ifname);
> +
> g_free(dhclient->ifname);
> g_free(dhclient);
> }
> @@ -156,21 +175,6 @@
> connman_task_add_argument(task, "-n", NULL);
> }
>
> -static void dhclient_unlink(const char *ifname)
> -{
> - char *pathname;
> -
> - pathname = g_strdup_printf("%s/dhclient.%s.pid",
> - STATEDIR, ifname);
> - unlink(pathname);
> - g_free(pathname);
> -
> - pathname = g_strdup_printf("%s/dhclient.%s.leases",
> - STATEDIR, ifname);
> - unlink(pathname);
> - g_free(pathname);
> -}
> -
> static int dhclient_request(struct connman_dhcp *dhcp)
> {
> struct dhclient_data *dhclient;
> @@ -212,10 +216,10 @@
>
> DBG("dhcp %p", dhcp);
>
> - if (dhclient->task != NULL)
> - connman_task_stop(dhclient->task);
> + if (dhclient == NULL)
> + return -ESRCH;
>
> - dhclient_unlink(dhclient->ifname);
> + connman_task_stop(dhclient->task);
>
> return 0;
> }
> --- plugins/supplicant.c
> +++ plugins/supplicant.c
> @@ -610,7 +610,13 @@
>
> connman_device_set_powered(task->device, TRUE);
>
> + dbus_message_unref(reply);
> +
> + dbus_pending_call_unref(call);
> +
> hex_ssids = connman_wifi_load_ssid();
> + if (hex_ssids == NULL)
> + return;
>
> for (i = 0; hex_ssids[i]; i++) {
> unsigned char *ssid;
> @@ -635,10 +641,6 @@
>
> g_strfreev(hex_ssids);
>
> - dbus_message_unref(reply);
> -
> - dbus_pending_call_unref(call);
> -
> return;
>
> failed:
> --- src/network.c
> +++ src/network.c
> @@ -447,12 +447,15 @@
> void connman_network_set_index(struct connman_network *network, int index)
> {
> struct connman_service *service;
> + struct connman_ipconfig *ipconfig;
>
> service = __connman_service_lookup_from_network(network);
> if (service == NULL)
> goto done;
>
> - if (network->element.index < 0)
> + ipconfig = __connman_service_get_ipconfig(service);
> +
> + if (network->element.index < 0 && ipconfig == NULL)
> /*
> * This is needed for plugins that havent set their ipconfig
> * layer yet, due to not being able to get a network index
> @@ -460,10 +463,7 @@
> */
> __connman_service_create_ipconfig(service, index);
> else {
> - struct connman_ipconfig *ipconfig;
> -
> /* If index changed, the index of ipconfig must be reset. */
> - ipconfig = __connman_service_get_ipconfig(service);
> if (ipconfig == NULL)
> goto done;
>
> --- src/wifi.c
> +++ src/wifi.c
> @@ -68,12 +68,10 @@
> return NULL;
>
> groups = g_key_file_get_groups(key_file, &num_groups);
> - if (groups == NULL) {
> - hex_ssids = NULL;
> - goto done;
> - }
>
> - hex_ssids = g_try_malloc0(sizeof(*hex_ssids) * num_groups);
> + hex_ssids = g_try_malloc0(sizeof(*hex_ssids) * (num_groups + 1));
> + if (hex_ssids == NULL)
> + goto done;
>
> for (i = 0, j = 0; groups[i]; i++) {
> gchar *hex_ssid;
> @@ -94,7 +92,11 @@
> hex_ssids[j++] = hex_ssid;
> }
>
> + hex_ssids[j] = NULL;
> +
> done:
> + g_strfreev(groups);
> +
> __connman_storage_close_profile(profile, key_file, FALSE);
>
> return hex_ssids;
>
> ++++++ connman.yaml
> --- connman.yaml
> +++ connman.yaml
> @@ -1,6 +1,6 @@
> Name: connman
> Summary: Connection Manager
> -Version: 0.54
> +Version: 0.54.2
> Release: 1
> Group: System/Networking
> License: GPLv2
> _______________________________________________
> Meego-commits mailing list
> Meego-commits at meego.com
> http://lists.meego.com/listinfo/meego-commits
More information about the MeeGo-commits
mailing list