r26810 - in /desktop/experimental/gnome-control-center/debian: ./ patches/
fpeters at users.alioth.debian.org
fpeters at users.alioth.debian.org
Thu Mar 10 16:58:37 UTC 2011
Author: fpeters
Date: Thu Mar 10 16:58:36 2011
New Revision: 26810
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26810
Log:
* New upstream release.
+ debian/patches/00_disable-nm.patch: updated.
+ debian/patches/10_mouse-panel-link.patch: fixed upstream.
+ debian/patches/11_keyboard-panel-link.patch: ditto.
+ debian/patches/10_libshortcuts-link.patch: fix linking of the shortcut
code.
+ debian/patches/99_autoreconf.patch: refreshed.
+ debian/control.in: build build-dep on libgnomekbd-dev
Added:
desktop/experimental/gnome-control-center/debian/patches/10_libshortcuts-link.patch
Removed:
desktop/experimental/gnome-control-center/debian/patches/10_mouse-panel-link.patch
desktop/experimental/gnome-control-center/debian/patches/11_keyboard-panel-link.patch
Modified:
desktop/experimental/gnome-control-center/debian/changelog
desktop/experimental/gnome-control-center/debian/control
desktop/experimental/gnome-control-center/debian/control.in
desktop/experimental/gnome-control-center/debian/patches/00_disable-nm.patch
desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch
desktop/experimental/gnome-control-center/debian/patches/series
Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=26810&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog [utf-8] Thu Mar 10 16:58:36 2011
@@ -1,3 +1,16 @@
+gnome-control-center (1:2.91.91-1) experimental; urgency=low
+
+ * New upstream release.
+ + debian/patches/00_disable-nm.patch: updated.
+ + debian/patches/10_mouse-panel-link.patch: fixed upstream.
+ + debian/patches/11_keyboard-panel-link.patch: ditto.
+ + debian/patches/10_libshortcuts-link.patch: fix linking of the shortcut
+ code.
+ + debian/patches/99_autoreconf.patch: refreshed.
+ + debian/control.in: build build-dep on libgnomekbd-dev
+
+ -- Frederic Peters <fpeters at debian.org> Thu, 10 Mar 2011 17:35:21 +0100
+
gnome-control-center (1:2.91.90-1) experimental; urgency=low
* New upstream release.
Modified: desktop/experimental/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control?rev=26810&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control [utf-8] Thu Mar 10 16:58:36 2011
@@ -30,7 +30,7 @@
libxml2-dev,
gnome-settings-daemon-dev (>= 2.91.1),
libxft-dev (>= 2.1.2),
- libgnomekbd-dev (>= 2.91.90),
+ libgnomekbd-dev (>= 2.91.91),
libxklavier-dev (>= 5.1),
libupower-glib-dev (>= 0.9.1),
desktop-file-utils,
Modified: desktop/experimental/gnome-control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control.in?rev=26810&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control.in [utf-8] Thu Mar 10 16:58:36 2011
@@ -25,7 +25,7 @@
libxml2-dev,
gnome-settings-daemon-dev (>= 2.91.1),
libxft-dev (>= 2.1.2),
- libgnomekbd-dev (>= 2.91.90),
+ libgnomekbd-dev (>= 2.91.91),
libxklavier-dev (>= 5.1),
libupower-glib-dev (>= 0.9.1),
desktop-file-utils,
Modified: desktop/experimental/gnome-control-center/debian/patches/00_disable-nm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/00_disable-nm.patch?rev=26810&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/00_disable-nm.patch [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/00_disable-nm.patch [utf-8] Thu Mar 10 16:58:36 2011
@@ -1,9 +1,7 @@
-Description: disable NM 0.9 bits
-
-Index: gnome-control-center-2.91.90/configure.ac
-===================================================================
---- gnome-control-center-2.91.90.orig/configure.ac 2011-02-25 09:56:16.856327001 +0100
-+++ gnome-control-center-2.91.90/configure.ac 2011-02-25 09:56:22.900327002 +0100
+Index: gnome-control-center-2.91.91/configure.ac
+===================================================================
+--- gnome-control-center-2.91.91.orig/configure.ac 2011-03-10 13:47:18.685656001 +0100
++++ gnome-control-center-2.91.91/configure.ac 2011-03-10 16:04:49.153656000 +0100
@@ -122,12 +122,7 @@
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
AC_SUBST(GDESKTOP_PREFIX)
@@ -18,28 +16,27 @@
AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
# Check for CUPS 1.4 or newer
-Index: gnome-control-center-2.91.90/panels/network/cc-network-panel.c
-===================================================================
---- gnome-control-center-2.91.90.orig/panels/network/cc-network-panel.c 2011-02-25 09:56:16.848327001 +0100
-+++ gnome-control-center-2.91.90/panels/network/cc-network-panel.c 2011-02-25 09:56:35.556327002 +0100
-@@ -24,16 +24,6 @@
+Index: gnome-control-center-2.91.91/panels/network/cc-network-panel.c
+===================================================================
+--- gnome-control-center-2.91.91.orig/panels/network/cc-network-panel.c 2011-03-10 13:48:55.909656000 +0100
++++ gnome-control-center-2.91.91/panels/network/cc-network-panel.c 2011-03-10 16:18:43.857656000 +0100
+@@ -25,6 +25,7 @@
#include "cc-network-panel.h"
--#include "nm-remote-settings.h"
--#include "nm-client.h"
--#include "nm-device.h"
--#include "nm-device-ethernet.h"
--#include "nm-device-wifi.h"
--#include "nm-utils.h"
--#include "nm-active-connection.h"
--#include "nm-vpn-connection.h"
--#include "nm-setting-ip4-config.h"
--
++#if 0
+ #include "nm-remote-settings.h"
+ #include "nm-client.h"
+ #include "nm-device.h"
+@@ -35,6 +36,7 @@
+ #include "nm-active-connection.h"
+ #include "nm-vpn-connection.h"
+ #include "nm-setting-ip4-config.h"
++#endif
+
#include "panel-common.h"
#include "panel-cell-renderer-mode.h"
- #include "panel-cell-renderer-signal.h"
-@@ -50,7 +40,6 @@
+@@ -52,7 +54,6 @@
GPtrArray *devices;
GSettings *proxy_settings;
GtkBuilder *builder;
@@ -47,7 +44,7 @@
};
enum {
-@@ -72,8 +61,6 @@
+@@ -74,8 +75,6 @@
PANEL_WIRELESS_COLUMN_LAST
};
@@ -56,7 +53,7 @@
static void
cc_network_panel_get_property (GObject *object,
guint property_id,
-@@ -116,10 +103,6 @@
+@@ -118,10 +117,6 @@
g_object_unref (priv->builder);
priv->builder = NULL;
}
@@ -67,592 +64,55 @@
G_OBJECT_CLASS (cc_network_panel_parent_class)->dispose (object);
}
-@@ -258,210 +241,6 @@
- }
-
- static void
--panel_device_got_modem_manager_cb (GObject *source_object,
-- GAsyncResult *res,
-- gpointer user_data)
--{
-- GError *error = NULL;
-- GVariant *result = NULL;
-- GDBusProxy *proxy;
-- NMDevice *device = (NMDevice *) user_data;
--
-- proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
-- if (proxy == NULL) {
-- g_warning ("Error creating ModemManager proxy: %s",
-- error->message);
-- g_error_free (error);
-- goto out;
-- }
--
-- /* get the IMEI */
-- result = g_dbus_proxy_get_cached_property (proxy,
-- "EquipmentIdentifier");
--
-- /* save */
-- g_object_set_data_full (G_OBJECT (device),
-- "ControlCenter::EquipmentIdentifier",
-- g_variant_dup_string (result, NULL),
-- g_free);
--out:
-- if (result != NULL)
-- g_variant_unref (result);
-- if (proxy != NULL)
-- g_object_unref (proxy);
-- return;
--}
--
--static void
--panel_get_registration_info_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
--{
-- gchar *operator_code = NULL;
-- GError *error = NULL;
-- guint registration_status;
-- GVariant *result = NULL;
-- gchar *operator_name = NULL;
-- NMDevice *device = (NMDevice *) user_data;
--
-- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error);
-- if (result == NULL) {
-- g_warning ("Error getting registration info: %s\n",
-- error->message);
-- g_error_free (error);
-- return;
-- }
--
-- /* get values */
-- g_variant_get (result, "((uss))",
-- ®istration_status,
-- &operator_code,
-- &operator_name);
--
-- /* save */
-- g_object_set_data_full (G_OBJECT (device),
-- "ControlCenter::OperatorName",
-- g_strdup (operator_name),
-- g_free);
--
-- g_free (operator_name);
-- g_free (operator_code);
-- g_variant_unref (result);
--}
--
--static void
--panel_device_got_modem_manager_gsm_cb (GObject *source_object,
-- GAsyncResult *res,
-- gpointer user_data)
--{
-- GError *error = NULL;
-- GDBusProxy *proxy;
-- NMDevice *device = (NMDevice *) user_data;
--
-- proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
-- if (proxy == NULL) {
-- g_warning ("Error creating ModemManager GSM proxy: %s\n",
-- error->message);
-- g_error_free (error);
-- goto out;
-- }
--
-- g_dbus_proxy_call (proxy,
-- "GetRegistrationInfo",
-- NULL,
-- G_DBUS_CALL_FLAGS_NONE,
-- -1,
-- NULL,
-- panel_get_registration_info_cb,
-- device);
--out:
-- if (proxy != NULL)
-- g_object_unref (proxy);
-- return;
--}
--
--static void
--panel_add_device (CcNetworkPanel *panel, NMDevice *device)
--{
-- GtkListStore *liststore_devices;
-- GtkTreeIter iter;
-- gchar *title = NULL;
-- NMDeviceType type;
-- CcNetworkPanelPrivate *priv = panel->priv;
--
-- g_debug ("device %s type %i",
-- nm_device_get_udi (device),
-- nm_device_get_device_type (device));
--
-- g_ptr_array_add (panel->priv->devices,
-- g_object_ref (device));
--
-- /* do we have to get additonal data from ModemManager */
-- type = nm_device_get_device_type (device);
-- if (type == NM_DEVICE_TYPE_GSM ||
-- type == NM_DEVICE_TYPE_CDMA) {
-- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-- G_DBUS_PROXY_FLAGS_NONE,
-- NULL,
-- "org.freedesktop.ModemManager",
-- nm_device_get_udi (device),
-- "org.freedesktop.ModemManager.Modem",
-- panel->priv->cancellable,
-- panel_device_got_modem_manager_cb,
-- device);
-- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
-- G_DBUS_PROXY_FLAGS_NONE,
-- NULL,
-- "org.freedesktop.ModemManager",
-- nm_device_get_udi (device),
-- "org.freedesktop.ModemManager.Modem.Gsm.Network",
-- panel->priv->cancellable,
-- panel_device_got_modem_manager_gsm_cb,
-- device);
-- }
--
-- /* make title a bit bigger */
-- title = g_strdup_printf ("<span size=\"large\">%s</span>",
-- panel_device_type_to_localized_string (nm_device_get_device_type (device)));
--
-- liststore_devices = GTK_LIST_STORE (gtk_builder_get_object (priv->builder,
-- "liststore_devices"));
-- gtk_list_store_append (liststore_devices, &iter);
-- gtk_list_store_set (liststore_devices,
-- &iter,
-- PANEL_DEVICES_COLUMN_ICON, panel_device_type_to_icon_name (nm_device_get_device_type (device)),
-- PANEL_DEVICES_COLUMN_SORT, panel_device_type_to_sortable_string (nm_device_get_device_type (device)),
-- PANEL_DEVICES_COLUMN_TITLE, title,
-- PANEL_DEVICES_COLUMN_ID, nm_device_get_udi (device),
-- PANEL_DEVICES_COLUMN_TOOLTIP, NULL,
-- PANEL_DEVICES_COLUMN_COMPOSITE_DEVICE, device,
-- -1);
-- g_free (title);
--}
--
--static void
--panel_remove_device (CcNetworkPanel *panel, NMDevice *device)
--{
-- gboolean ret;
-- gchar *id_tmp;
-- GtkTreeIter iter;
-- GtkTreeModel *model;
-- guint i;
-- NMDevice *device_tmp = NULL;
--
-- /* remove device from array */
-- for (i=0; i<panel->priv->devices->len; i++) {
-- device_tmp = g_ptr_array_index (panel->priv->devices, i);
-- if (g_strcmp0 (nm_device_get_udi (device),
-- nm_device_get_udi (device_tmp)) == 0) {
-- g_ptr_array_remove_index_fast (panel->priv->devices, i);
-- break;
-- }
-- }
-- if (device_tmp == NULL)
-- return;
--
-- /* remove device from model */
-- model = GTK_TREE_MODEL (gtk_builder_get_object (panel->priv->builder,
-- "liststore_devices"));
-- ret = gtk_tree_model_get_iter_first (model, &iter);
-- if (!ret)
-- return;
--
-- /* get the other elements */
-- do {
-- gtk_tree_model_get (model, &iter,
-- PANEL_DEVICES_COLUMN_ID, &id_tmp,
-- -1);
-- if (g_strcmp0 (id_tmp,
-- nm_device_get_udi (device_tmp)) == 0) {
-- gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-- g_free (id_tmp);
-- break;
-- }
-- g_free (id_tmp);
-- } while (gtk_tree_model_iter_next (model, &iter));
--}
--
--static void
+@@ -259,6 +254,7 @@
+ gtk_tree_path_free (path);
+ }
+
++#if 0
+ static void
+ panel_device_got_modem_manager_cb (GObject *source_object,
+ GAsyncResult *res,
+@@ -461,6 +457,7 @@
+ g_free (id_tmp);
+ } while (gtk_tree_model_iter_next (model, &iter));
+ }
++#endif
+
+ static void
panel_add_devices_columns (CcNetworkPanel *panel, GtkTreeView *treeview)
+@@ -525,6 +522,7 @@
+ g_free (label_id);
+ }
+
++#if 0
+ static void
+ add_access_point (CcNetworkPanel *panel, NMAccessPoint *ap, NMAccessPoint *active)
{
- CcNetworkPanelPrivate *priv = panel->priv;
-@@ -524,46 +303,6 @@
- g_free (label_id);
- }
-
--static void
--add_access_point (CcNetworkPanel *panel, NMAccessPoint *ap, NMAccessPoint *active)
--{
-- CcNetworkPanelPrivate *priv = panel->priv;
-- const GByteArray *ssid;
-- const gchar *ssid_text;
-- const gchar *hw_address;
-- GtkListStore *liststore_wireless_network;
-- GtkTreeIter treeiter;
-- GtkWidget *widget;
--
-- ssid = nm_access_point_get_ssid (ap);
-- if (ssid == NULL)
-- return;
-- ssid_text = nm_utils_escape_ssid (ssid->data, ssid->len);
--
-- liststore_wireless_network = GTK_LIST_STORE (gtk_builder_get_object (priv->builder,
-- "liststore_wireless_network"));
--
-- hw_address = nm_access_point_get_hw_address (ap);
-- gtk_list_store_append (liststore_wireless_network, &treeiter);
-- gtk_list_store_set (liststore_wireless_network,
-- &treeiter,
-- PANEL_WIRELESS_COLUMN_ID, hw_address,
-- PANEL_WIRELESS_COLUMN_TITLE, ssid_text,
-- PANEL_WIRELESS_COLUMN_SORT, ssid_text,
-- PANEL_WIRELESS_COLUMN_STRENGTH, nm_access_point_get_strength (ap),
-- PANEL_WIRELESS_COLUMN_MODE, nm_access_point_get_mode (ap),
-- -1);
--
-- /* is this what we're on already? */
-- if (active == NULL)
-- return;
-- if (g_strcmp0 (hw_address, nm_access_point_get_hw_address (active)) == 0) {
-- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-- "combobox_network_name"));
-- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (widget), &treeiter);
-- }
--}
--
+@@ -564,6 +562,7 @@
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (widget), &treeiter);
+ }
+ }
++#endif
+
static gchar *
ip4_address_as_string (guint32 ip)
+@@ -583,6 +582,7 @@
+ }
+ }
+
++#if 0
+ static void
+ panel_show_ip4_config (NMIP4Config *cfg)
{
-@@ -583,334 +322,12 @@
- }
-
- static void
--panel_show_ip4_config (NMIP4Config *cfg)
--{
-- gchar *tmp;
-- const GArray *array;
-- const GPtrArray *ptr_array;
-- GSList *iter;
-- int i;
--
-- for (iter = (GSList *) nm_ip4_config_get_addresses (cfg); iter; iter = g_slist_next (iter)) {
-- NMIP4Address *addr = iter->data;
-- guint32 u;
--
-- tmp = ip4_address_as_string (nm_ip4_address_get_address (addr));
-- g_debug ("IP4 address: %s", tmp);
-- g_free (tmp);
--
-- u = nm_ip4_address_get_prefix (addr);
-- tmp = ip4_address_as_string (nm_utils_ip4_prefix_to_netmask (u));
-- g_debug ("IP4 prefix: %d (%s)", u, tmp);
-- g_free (tmp);
--
-- tmp = ip4_address_as_string (nm_ip4_address_get_gateway (addr));
-- g_debug ("IP4 gateway: %s", tmp);
-- g_free (tmp);
-- }
--
-- array = nm_ip4_config_get_nameservers (cfg);
-- if (array) {
-- g_debug ("IP4 DNS:");
-- for (i = 0; i < array->len; i++) {
-- tmp = ip4_address_as_string (g_array_index (array, guint32, i));
-- g_debug ("\t%s", tmp);
-- g_free (tmp);
-- }
-- }
--
-- ptr_array = nm_ip4_config_get_domains (cfg);
-- if (ptr_array) {
-- g_debug ("IP4 domains:");
-- for (i = 0; i < ptr_array->len; i++)
-- g_debug ("\t%s", (const char *) g_ptr_array_index (ptr_array, i));
-- }
--
-- array = nm_ip4_config_get_wins_servers (cfg);
-- if (array) {
-- g_debug ("IP4 WINS:");
-- for (i = 0; i < array->len; i++) {
-- tmp = ip4_address_as_string (g_array_index (array, guint32, i));
-- g_debug ("\t%s", tmp);
-- g_free (tmp);
-- }
-- }
--}
--
--static GPtrArray *
--panel_get_strongest_unique_aps (const GPtrArray *aps)
--{
-- const GByteArray *ssid;
-- const GByteArray *ssid_tmp;
-- gboolean add_ap;
-- GPtrArray *aps_unique = NULL;
-- guint i;
-- guint j;
-- NMAccessPoint *ap;
-- NMAccessPoint *ap_tmp;
--
-- /* we will have multiple entries for typical hotspots, just
-- * filter to the one with the strongest signal */
-- aps_unique = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
-- for (i = 0; i < aps->len; i++) {
-- ap = NM_ACCESS_POINT (g_ptr_array_index (aps, i));
-- ssid = nm_access_point_get_ssid (ap);
-- add_ap = TRUE;
--
-- /* get already added list */
-- for (j=0; j<aps_unique->len; j++) {
-- ap_tmp = NM_ACCESS_POINT (g_ptr_array_index (aps, j));
-- ssid_tmp = nm_access_point_get_ssid (ap_tmp);
--
-- /* is this the same type and data? */
-- if (ssid->len != ssid_tmp->len)
-- continue;
-- if (memcmp (ssid->data, ssid_tmp->data, ssid_tmp->len) != 0)
-- continue;
-- g_debug ("found duplicate: %s",
-- nm_utils_escape_ssid (ssid_tmp->data,
-- ssid_tmp->len));
--
-- /* the new access point is stronger */
-- if (nm_access_point_get_strength (ap) >
-- nm_access_point_get_strength (ap_tmp)) {
-- g_debug ("removing %s",
-- nm_utils_escape_ssid (ssid_tmp->data,
-- ssid_tmp->len));
-- g_ptr_array_remove (aps_unique, ap_tmp);
-- break;
-- } else {
-- add_ap = FALSE;
-- break;
-- }
-- }
-- if (add_ap) {
-- g_debug ("adding %s",
-- nm_utils_escape_ssid (ssid->data,
-- ssid->len));
-- g_ptr_array_add (aps_unique, g_object_ref (ap));
-- }
-- }
-- return aps_unique;
--}
--
--static void
--nm_device_refresh_item_ui (CcNetworkPanel *panel, NMDevice *device)
--{
-- CcNetworkPanelPrivate *priv = panel->priv;
-- const gchar *str;
-- const gchar *sub_pane = NULL;
-- const GPtrArray *aps;
-- GPtrArray *aps_unique = NULL;
-- gchar *str_tmp;
-- GHashTable *options = NULL;
-- GtkListStore *liststore_wireless_network;
-- GtkWidget *widget;
-- guint i;
-- NMAccessPoint *ap;
-- NMAccessPoint *active_ap;
-- NMDeviceState state;
-- NMDeviceType type;
-- NMDHCP4Config *config_dhcp4 = NULL;
-- NMDHCP6Config *config_dhcp6 = NULL;
--
-- /* we have a new device */
-- g_debug ("selected device is: %s", nm_device_get_udi (device));
-- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-- "hbox_device_header"));
-- gtk_widget_set_visible (widget, TRUE);
--
-- type = nm_device_get_device_type (device);
-- g_debug ("device %s type %i",
-- nm_device_get_udi (device),
-- type);
--
-- /* set device icon */
-- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-- "image_device"));
-- gtk_image_set_from_icon_name (GTK_IMAGE (widget),
-- panel_device_type_to_icon_name (type),
-- GTK_ICON_SIZE_DIALOG);
--
-- /* set device kind */
-- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-- "label_device"));
-- gtk_label_set_label (GTK_LABEL (widget),
-- panel_device_type_to_localized_string (type));
--
--
-- /* set device state */
-- state = nm_device_get_state (device);
-- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-- "label_status"));
-- gtk_label_set_label (GTK_LABEL (widget),
-- panel_device_state_to_localized_string (state));
--
-- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
-- "notebook_types"));
-- if (type == NM_DEVICE_TYPE_ETHERNET) {
-- gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 0);
-- sub_pane = "wired";
-- } else if (type == NM_DEVICE_TYPE_WIFI) {
-- gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 1);
-- sub_pane = "wireless";
-- } else if (type == NM_DEVICE_TYPE_GSM ||
-- type == NM_DEVICE_TYPE_CDMA) {
-- gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 4);
-- sub_pane = "mobilebb";
-- }
-- if (sub_pane == NULL)
-- goto out;
--
-- /* FIXME? should we need to do something with this? */
-- if (state == NM_DEVICE_STATE_ACTIVATED)
-- panel_show_ip4_config (nm_device_get_ip4_config (device));
--
-- if (type == NM_DEVICE_TYPE_ETHERNET) {
--
-- /* speed */
-- str_tmp = g_strdup_printf ("%d Mb/sec",
-- nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (device)));
-- panel_set_widget_data (panel,
-- sub_pane,
-- "speed",
-- str_tmp);
-- g_free (str_tmp);
--
-- /* device MAC */
-- str = nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (device));
-- panel_set_widget_data (panel,
-- sub_pane,
-- "mac",
-- str);
--
-- } else if (type == NM_DEVICE_TYPE_WIFI) {
--
-- /* speed */
-- str_tmp = g_strdup_printf ("%d Mb/s",
-- nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (device)));
-- panel_set_widget_data (panel,
-- sub_pane,
-- "speed",
-- str_tmp);
-- g_free (str_tmp);
--
-- /* device MAC */
-- str = nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (device));
-- panel_set_widget_data (panel,
-- sub_pane,
-- "mac",
-- str);
-- /* security */
-- str = nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (device));
-- panel_set_widget_data (panel,
-- sub_pane,
-- "security",
-- NULL); /* FIXME */
--
-- /* populate access point dropdown */
-- liststore_wireless_network = GTK_LIST_STORE (gtk_builder_get_object (priv->builder,
-- "liststore_wireless_network"));
-- gtk_list_store_clear (liststore_wireless_network);
-- active_ap = nm_device_wifi_get_active_access_point (NM_DEVICE_WIFI (device));
-- aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device));
-- if (aps == NULL)
-- return;
-- aps_unique = panel_get_strongest_unique_aps (aps);
-- for (i = 0; i < aps_unique->len; i++) {
-- ap = NM_ACCESS_POINT (g_ptr_array_index (aps_unique, i));
-- add_access_point (panel,
-- ap,
-- active_ap);
-- }
--
-- } else if (type == NM_DEVICE_TYPE_GSM ||
-- type == NM_DEVICE_TYPE_CDMA) {
--
-- /* IMEI */
-- str = g_object_get_data (G_OBJECT (device),
-- "ControlCenter::EquipmentIdentifier");
-- panel_set_widget_data (panel,
-- sub_pane,
-- "imei",
-- str);
--
-- /* operator name */
-- str = g_object_get_data (G_OBJECT (device),
-- "ControlCenter::OperatorName");
-- panel_set_widget_data (panel,
-- sub_pane,
-- "provider",
-- str);
--
-- /* device speed */
-- panel_set_widget_data (panel,
-- sub_pane,
-- "speed",
-- NULL);
-- }
--
-- /* get IP4 parameters */
-- config_dhcp4 = nm_device_get_dhcp4_config (device);
-- if (config_dhcp4 != NULL) {
-- g_object_get (G_OBJECT (config_dhcp4),
-- NM_DHCP4_CONFIG_OPTIONS, &options,
-- NULL);
--
-- /* IPv4 address */
-- panel_set_widget_data (panel,
-- sub_pane,
-- "ip4",
-- nm_dhcp4_config_get_one_option (config_dhcp4,
-- "ip_address"));
--
-- /* IPv4 DNS */
-- panel_set_widget_data (panel,
-- sub_pane,
-- "dns",
-- nm_dhcp4_config_get_one_option (config_dhcp4,
-- "domain_name_servers"));
--
-- /* IPv4 route */
-- panel_set_widget_data (panel,
-- sub_pane,
-- "route",
-- nm_dhcp4_config_get_one_option (config_dhcp4,
-- "routers"));
--
-- /* IPv4 netmask */
-- if (type == NM_DEVICE_TYPE_ETHERNET) {
-- panel_set_widget_data (panel,
-- sub_pane,
-- "subnet",
-- nm_dhcp4_config_get_one_option (config_dhcp4,
-- "subnet_mask"));
-- }
-- }
--
-- /* get IP6 parameters */
-- if (0) config_dhcp6 = nm_device_get_dhcp6_config (device);
-- if (config_dhcp6 != NULL) {
--
-- /* IPv6 address */
-- panel_set_widget_data (panel,
-- sub_pane,
-- "ip6",
-- nm_dhcp6_config_get_one_option (config_dhcp6,
-- "ip_address"));
-- }
--out:
-- if (aps_unique != NULL)
-- g_ptr_array_unref (aps_unique);
--}
--
--static void
+@@ -910,6 +910,7 @@
+ if (aps_unique != NULL)
+ g_ptr_array_unref (aps_unique);
+ }
++#endif
+
+ static void
nm_devices_treeview_clicked_cb (GtkTreeSelection *selection, CcNetworkPanel *panel)
- {
+@@ -917,7 +918,7 @@
GtkTreeIter iter;
GtkTreeModel *model;
GtkWidget *widget;
@@ -661,7 +121,7 @@
CcNetworkPanelPrivate *priv = panel->priv;
/* will only work in single or browse selection mode! */
-@@ -939,12 +356,6 @@
+@@ -946,12 +947,6 @@
goto out;
}
@@ -674,183 +134,28 @@
out:
return;
}
-@@ -975,175 +386,8 @@
- }
-
- static void
--cc_network_panel_notify_enable_active_cb (GtkSwitch *sw,
-- GParamSpec *pspec,
-- CcNetworkPanel *panel)
--{
-- gboolean enable;
--
-- /* set enabled state */
-- enable = !gtk_switch_get_active (sw);
-- nm_client_wireless_set_enabled (panel->priv->client, enable);
--}
--
--static void
--active_connections_changed (NMClient *client, GParamSpec *pspec, gpointer user_data)
--{
-- const GPtrArray *connections;
-- int i, j;
--
-- g_debug ("Active connections changed:");
-- connections = nm_client_get_active_connections (client);
-- for (i = 0; connections && (i < connections->len); i++) {
-- NMActiveConnection *connection;
-- const GPtrArray *devices;
--
-- connection = g_ptr_array_index (connections, i);
-- g_debug (" %s", nm_object_get_path (NM_OBJECT (connection)));
-- devices = nm_active_connection_get_devices (connection);
-- for (j = 0; devices && j < devices->len; j++)
-- g_debug (" %s", nm_device_get_udi (g_ptr_array_index (devices, j)));
-- if (NM_IS_VPN_CONNECTION (connection))
-- g_debug (" VPN base connection: %s", nm_active_connection_get_specific_object (connection));
-- }
--}
--
--static void
--device_state_notify_changed_cb (NMDevice *device,
-- GParamSpec *pspec,
-- gpointer user_data)
--{
-- CcNetworkPanel *panel = CC_NETWORK_PANEL (user_data);
--
-- /* only refresh the selected device */
-- if (g_strcmp0 (panel->priv->current_device,
-- nm_device_get_udi (device)) == 0) {
-- nm_device_refresh_item_ui (panel, device);
-- }
--}
--
--static void
--device_added_cb (NMClient *client, NMDevice *device, CcNetworkPanel *panel)
--{
-- g_debug ("New device added");
-- panel_add_device (panel, device);
-- g_signal_connect (G_OBJECT (device), "notify::state",
-- (GCallback) device_state_notify_changed_cb, NULL);
--}
--
--static void
--device_removed_cb (NMClient *client, NMDevice *device, CcNetworkPanel *panel)
--{
-- g_debug ("Device removed");
-- panel_remove_device (panel, device);
--}
--
--static void
--manager_running (NMClient *client, GParamSpec *pspec, gpointer user_data)
--{
-- const GPtrArray *devices;
-- int i;
-- NMDevice *device_tmp;
-- CcNetworkPanel *panel = CC_NETWORK_PANEL (user_data);
--
-- /* TODO: clear all devices we added */
-- if (!nm_client_get_manager_running (client)) {
-- g_debug ("NM disappeared");
-- return;
-- }
--
-- g_debug ("coldplugging devices");
-- devices = nm_client_get_devices (client);
-- if (devices == NULL) {
-- g_debug ("No devices to add");
-- return;
-- }
-- for (i = 0; i < devices->len; i++) {
-- device_tmp = g_ptr_array_index (devices, i);
-- panel_add_device (panel, device_tmp);
-- }
--
-- /* select the first device */
-- select_first_device (panel);
--}
--
--static void
--notify_connections_read_cb (NMRemoteSettings *settings,
-- GParamSpec *pspec,
-- gpointer user_data)
--{
-- CcNetworkPanel *panel = CC_NETWORK_PANEL (user_data);
-- GSList *list, *iter;
--
-- list = nm_remote_settings_list_connections (settings);
-- g_debug ("%p has %i remote connections",
-- panel, g_slist_length (list));
-- for (iter = list; iter; iter = g_slist_next (iter)) {
-- NMConnection *candidate = NM_CONNECTION (iter->data);
-- /* we can't actually test this yet as VPN support in
-- * NetworkManager 0.9 is currently broken */
-- g_debug ("TODO: add %s", nm_connection_get_path (candidate));
-- }
--}
--
--static gboolean
--panel_check_network_manager_version (CcNetworkPanel *panel)
--{
-- const gchar *message;
-- const gchar *version;
-- gchar **split;
-- GtkWidget *dialog;
-- GtkWindow *window = NULL;
-- guint major = 0;
-- guint micro = 0;
-- guint minor = 0;
-- gboolean ret = TRUE;
--
-- /* parse running version */
-- version = nm_client_get_version (panel->priv->client);
-- if (version != NULL) {
-- split = g_strsplit (version, ".", -1);
-- major = atoi (split[0]);
-- minor = atoi (split[1]);
-- micro = atoi (split[2]);
-- }
--
-- /* is it too new */
-- if (major > 0 || major > 9) {
--
-- /* TRANSLATORS: the user is running a NM that is too new and API compatible */
-- message = _("The running NetworkManager version is not compatible (too new).");
--
-- /* is it new enough */
-- } else if (minor <= 8 && micro < 992) {
--
-- /* TRANSLATORS: the user is running a NM that is too old and API compatible */
-- message = _("The running NetworkManager version is not compatible (too old).");
-- }
--
-- /* nothing to do */
-- if (message == NULL)
-- goto out;
--
-- /* do modal dialog */
-- ret = FALSE;
-- dialog = gtk_message_dialog_new (window,
-- GTK_DIALOG_MODAL,
-- GTK_MESSAGE_ERROR,
-- GTK_BUTTONS_CLOSE,
-- "%s",
-- message);
-- gtk_dialog_run (GTK_DIALOG (dialog));
-- gtk_widget_destroy (dialog);
--out:
-- g_strfreev (split);
-- return ret;
--}
--
--static void
+@@ -981,6 +976,7 @@
+ g_free (title);
+ }
+
++#if 0
+ static void
+ cc_network_panel_notify_enable_active_cb (GtkSwitch *sw,
+ GParamSpec *pspec,
+@@ -1146,11 +1142,11 @@
+ g_strfreev (split);
+ return ret;
+ }
++#endif
+
+ static void
cc_network_panel_init (CcNetworkPanel *panel)
{
- DBusGConnection *bus = NULL;
gboolean ret;
GError *error = NULL;
gint value;
-@@ -1155,7 +399,6 @@
+@@ -1162,7 +1158,6 @@
GtkTreeSelection *selection;
GtkTreeSortable *sortable;
GtkWidget *widget;
@@ -858,318 +163,59 @@
panel->priv = NETWORK_PANEL_PRIVATE (panel);
-@@ -1270,44 +513,6 @@
+@@ -1277,6 +1272,7 @@
/* add the virtual proxy device */
panel_add_proxy_device (panel);
-- /* setup wireless combobox model */
-- combobox = GTK_COMBO_BOX (gtk_builder_get_object (panel->priv->builder,
-- "combobox_network_name"));
--
-- renderer = panel_cell_renderer_mode_new ();
-- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox),
-- renderer,
-- FALSE);
-- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
-- "mode", PANEL_WIRELESS_COLUMN_MODE,
-- NULL);
--
-- /* sort networks in drop down */
-- sortable = GTK_TREE_SORTABLE (gtk_builder_get_object (panel->priv->builder,
-- "liststore_wireless_network"));
-- gtk_tree_sortable_set_sort_column_id (sortable,
-- PANEL_WIRELESS_COLUMN_SORT,
-- GTK_SORT_ASCENDING);
--
-- renderer = panel_cell_renderer_signal_new ();
-- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combobox),
-- renderer,
-- FALSE);
-- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
-- "signal", PANEL_WIRELESS_COLUMN_STRENGTH,
-- NULL);
--
-- /* use NetworkManager client */
-- panel->priv->client = nm_client_new ();
-- g_signal_connect (panel->priv->client, "notify::" NM_CLIENT_MANAGER_RUNNING,
-- G_CALLBACK (manager_running), panel);
-- g_signal_connect (panel->priv->client, "notify::" NM_CLIENT_ACTIVE_CONNECTIONS,
-- G_CALLBACK (active_connections_changed), panel);
-- g_signal_connect (panel->priv->client, "device-added",
-- G_CALLBACK (device_added_cb), panel);
-- g_signal_connect (panel->priv->client, "device-removed",
-- G_CALLBACK (device_removed_cb), panel);
--
++#if 0
+ /* setup wireless combobox model */
+ combobox = GTK_COMBO_BOX (gtk_builder_get_object (panel->priv->builder,
+ "combobox_network_name"));
+@@ -1314,6 +1310,7 @@
+ G_CALLBACK (device_added_cb), panel);
+ g_signal_connect (panel->priv->client, "device-removed",
+ G_CALLBACK (device_removed_cb), panel);
++#endif
+
/* disable for now, until we can remove connections without
* segfaulting NM... */
- widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
-@@ -1321,32 +526,10 @@
+@@ -1328,6 +1325,9 @@
gtk_widget_set_sensitive (widget, FALSE);
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
"switch_flight_mode"));
-- ret = nm_client_wireless_get_enabled (panel->priv->client);
-- gtk_switch_set_active (GTK_SWITCH (widget), !ret);
-- g_signal_connect (GTK_SWITCH (widget), "notify::active",
-- G_CALLBACK (cc_network_panel_notify_enable_active_cb),
-- panel);
+ gtk_switch_set_active (GTK_SWITCH (widget), FALSE);
-
-- /* add remote settings such as VPN settings as virtual devices */
-- bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-- if (bus == NULL) {
-- g_warning ("Error connecting to system D-Bus: %s",
-- error->message);
-- g_error_free (error);
-- }
-- remote_settings = nm_remote_settings_new (bus);
-- g_signal_connect (remote_settings, "notify::" NM_REMOTE_SETTINGS_CONNECTIONS_READ,
-- G_CALLBACK (notify_connections_read_cb), panel);
--
-- /* is the user compiling against a new version, but running an
-- * old daemon version? */
-- ret = panel_check_network_manager_version (panel);
-- if (ret) {
-- manager_running (panel->priv->client, NULL, panel);
-- } else {
-- /* just select the proxy settings */
-- select_first_device (panel);
-- }
-+ /* just select the proxy settings */
++
++#if 0
+ ret = nm_client_wireless_get_enabled (panel->priv->client);
+ gtk_switch_set_active (GTK_SWITCH (widget), !ret);
+ g_signal_connect (GTK_SWITCH (widget), "notify::active",
+@@ -1354,6 +1354,8 @@
+ /* just select the proxy settings */
+ select_first_device (panel);
+ }
++#endif
+ select_first_device (panel);
/* hide implementation details */
widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,
-Index: gnome-control-center-2.91.90/panels/network/panel-common.c
-===================================================================
---- gnome-control-center-2.91.90.orig/panels/network/panel-common.c 2011-02-25 09:56:16.828327001 +0100
-+++ gnome-control-center-2.91.90/panels/network/panel-common.c 2011-02-25 09:56:22.904327002 +0100
-@@ -27,188 +27,3 @@
-
- #include "panel-common.h"
-
--/**
-- * panel_device_type_to_icon_name:
-- **/
--const gchar *
--panel_device_type_to_icon_name (NMDeviceType type)
--{
-- const gchar *value = NULL;
-- switch (type) {
-- case NM_DEVICE_TYPE_ETHERNET:
-- value = "network-wired";
-- break;
-- case NM_DEVICE_TYPE_WIFI:
-- case NM_DEVICE_TYPE_GSM:
-- case NM_DEVICE_TYPE_CDMA:
-- case NM_DEVICE_TYPE_BT:
-- case NM_DEVICE_TYPE_OLPC_MESH:
-- value = "network-wireless";
-- break;
-- default:
-- break;
-- }
-- return value;
--}
--
--/**
-- * panel_device_type_to_localized_string:
-- **/
--const gchar *
--panel_device_type_to_localized_string (NMDeviceType type)
--{
-- const gchar *value = NULL;
-- switch (type) {
-- case NM_DEVICE_TYPE_UNKNOWN:
-- /* TRANSLATORS: device type */
-- value = _("Unknown");
-- break;
-- case NM_DEVICE_TYPE_ETHERNET:
-- /* TRANSLATORS: device type */
-- value = _("Wired");
-- break;
-- case NM_DEVICE_TYPE_WIFI:
-- /* TRANSLATORS: device type */
-- value = _("Wireless");
-- break;
-- case NM_DEVICE_TYPE_GSM:
-- case NM_DEVICE_TYPE_CDMA:
-- /* TRANSLATORS: device type */
-- value = _("Mobile broadband");
-- break;
-- case NM_DEVICE_TYPE_BT:
-- /* TRANSLATORS: device type */
-- value = _("Bluetooth");
-- break;
-- case NM_DEVICE_TYPE_OLPC_MESH:
-- /* TRANSLATORS: device type */
-- value = _("Mesh");
-- break;
-- default:
-- break;
-- }
-- return value;
--}
--
--/**
-- * panel_device_type_to_sortable_string:
-- *
-- * Try to return order of approximate connection speed.
-- **/
--const gchar *
--panel_device_type_to_sortable_string (NMDeviceType type)
--{
-- const gchar *value = NULL;
-- switch (type) {
-- case NM_DEVICE_TYPE_ETHERNET:
-- value = "1";
-- break;
-- case NM_DEVICE_TYPE_WIFI:
-- value = "2";
-- break;
-- case NM_DEVICE_TYPE_GSM:
-- case NM_DEVICE_TYPE_CDMA:
-- value = "3";
-- break;
-- case NM_DEVICE_TYPE_BT:
-- value = "4";
-- break;
-- case NM_DEVICE_TYPE_OLPC_MESH:
-- value = "5";
-- break;
-- default:
-- value = "6";
-- break;
-- }
-- return value;
--}
--
--/**
-- * panel_ap_mode_to_localized_string:
-- **/
--const gchar *
--panel_ap_mode_to_localized_string (NM80211Mode mode)
--{
-- const gchar *value = NULL;
-- switch (mode) {
-- case NM_802_11_MODE_UNKNOWN:
-- /* TRANSLATORS: AP type */
-- value = _("Unknown");
-- break;
-- case NM_802_11_MODE_ADHOC:
-- /* TRANSLATORS: AP type */
-- value = _("Ad-hoc");
-- break;
-- case NM_802_11_MODE_INFRA:
-- /* TRANSLATORS: AP type */
-- value = _("Infrastructure");
-- break;
-- default:
-- break;
-- }
-- return value;
--}
--
--/**
-- * panel_device_state_to_localized_string:
-- **/
--const gchar *
--panel_device_state_to_localized_string (NMDeviceState type)
--{
-- const gchar *value = NULL;
-- switch (type) {
-- case NM_DEVICE_STATE_UNKNOWN:
-- /* TRANSLATORS: device status */
-- value = _("Status unknown");
-- break;
-- case NM_DEVICE_STATE_UNMANAGED:
-- /* TRANSLATORS: device status */
-- value = _("Unmanaged");
-- break;
-- case NM_DEVICE_STATE_UNAVAILABLE:
-- /* TRANSLATORS: device status */
-- value = _("Unavailable");
-- break;
-- case NM_DEVICE_STATE_DISCONNECTED:
-- /* TRANSLATORS: device status */
-- value = _("Disconnected");
-- break;
-- case NM_DEVICE_STATE_PREPARE:
-- /* TRANSLATORS: device status */
-- value = _("Preparing connection");
-- break;
-- case NM_DEVICE_STATE_CONFIG:
-- /* TRANSLATORS: device status */
-- value = _("Configuring connection");
-- break;
-- case NM_DEVICE_STATE_NEED_AUTH:
-- /* TRANSLATORS: device status */
-- value = _("Authenticating");
-- break;
-- case NM_DEVICE_STATE_IP_CONFIG:
-- /* TRANSLATORS: device status */
-- value = _("Getting network address");
-- break;
-- case NM_DEVICE_STATE_IP_CHECK:
-- /* TRANSLATORS: device status */
-- value = _("Checking network address");
-- break;
-- case NM_DEVICE_STATE_ACTIVATED:
-- /* TRANSLATORS: device status */
-- value = _("Connected");
-- break;
-- case NM_DEVICE_STATE_DEACTIVATING:
-- /* TRANSLATORS: device status */
-- value = _("Disconnecting");
-- break;
-- case NM_DEVICE_STATE_FAILED:
-- /* TRANSLATORS: device status */
-- value = _("Failed to connect");
-- break;
-- default:
-- /* TRANSLATORS: device status */
-- value = _("Status unknown (missing)");
-- break;
-- }
-- return value;
--}
-Index: gnome-control-center-2.91.90/panels/network/panel-common.h
-===================================================================
---- gnome-control-center-2.91.90.orig/panels/network/panel-common.h 2011-02-25 09:56:16.832327001 +0100
-+++ gnome-control-center-2.91.90/panels/network/panel-common.h 2011-02-25 09:56:22.904327002 +0100
-@@ -23,16 +23,9 @@
- #define PANEL_COMMON_H
-
- #include <glib-object.h>
--#include <NetworkManager.h>
-
- G_BEGIN_DECLS
-
--const gchar *panel_device_type_to_icon_name (NMDeviceType type);
--const gchar *panel_device_type_to_localized_string (NMDeviceType type);
--const gchar *panel_device_type_to_sortable_string (NMDeviceType type);
--const gchar *panel_ap_mode_to_localized_string (NM80211Mode mode);
--const gchar *panel_device_state_to_localized_string (NMDeviceState type);
--
- G_END_DECLS
-
- #endif /* PANEL_COMMON_H */
-Index: gnome-control-center-2.91.90/panels/network/panel-cell-renderer-mode.c
-===================================================================
---- gnome-control-center-2.91.90.orig/panels/network/panel-cell-renderer-mode.c 2011-02-25 09:56:16.820327001 +0100
-+++ gnome-control-center-2.91.90/panels/network/panel-cell-renderer-mode.c 2011-02-25 09:56:22.904327002 +0100
-@@ -64,8 +64,6 @@
+Index: gnome-control-center-2.91.91/panels/network/panel-cell-renderer-mode.c
+===================================================================
+--- gnome-control-center-2.91.91.orig/panels/network/panel-cell-renderer-mode.c 2011-03-10 13:48:56.001656000 +0100
++++ gnome-control-center-2.91.91/panels/network/panel-cell-renderer-mode.c 2011-03-10 13:49:47.401656000 +0100
+@@ -64,9 +64,6 @@
{
const gchar *icon_name = NULL;
- if (renderer->mode == NM_802_11_MODE_ADHOC)
- icon_name = "network-workgroup";
-
+-
g_object_set (renderer, "icon-name", icon_name, NULL);
}
-Index: gnome-control-center-2.91.90/panels/network/panel-cell-renderer-mode.h
-===================================================================
---- gnome-control-center-2.91.90.orig/panels/network/panel-cell-renderer-mode.h 2011-02-25 09:56:16.816327001 +0100
-+++ gnome-control-center-2.91.90/panels/network/panel-cell-renderer-mode.h 2011-02-25 09:56:22.904327002 +0100
+
+Index: gnome-control-center-2.91.91/panels/network/panel-cell-renderer-mode.h
+===================================================================
+--- gnome-control-center-2.91.91.orig/panels/network/panel-cell-renderer-mode.h 2011-03-10 13:48:56.013656000 +0100
++++ gnome-control-center-2.91.91/panels/network/panel-cell-renderer-mode.h 2011-03-10 13:49:38.897656001 +0100
@@ -25,9 +25,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -1180,10 +226,10 @@
#define PANEL_TYPE_CELL_RENDERER_MODE (panel_cell_renderer_mode_get_type())
#define PANEL_CELL_RENDERER_MODE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PANEL_TYPE_CELL_RENDERER_MODE, PanelCellRendererMode))
#define PANEL_CELL_RENDERER_MODE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), PANEL_TYPE_CELL_RENDERER_MODE, PanelCellRendererModeClass))
-Index: gnome-control-center-2.91.90/panels/network/panel-cell-renderer-signal.h
-===================================================================
---- gnome-control-center-2.91.90.orig/panels/network/panel-cell-renderer-signal.h 2011-02-25 09:56:16.808327001 +0100
-+++ gnome-control-center-2.91.90/panels/network/panel-cell-renderer-signal.h 2011-02-25 09:56:22.904327002 +0100
+Index: gnome-control-center-2.91.91/panels/network/panel-cell-renderer-signal.h
+===================================================================
+--- gnome-control-center-2.91.91.orig/panels/network/panel-cell-renderer-signal.h 2011-03-10 13:48:56.045656000 +0100
++++ gnome-control-center-2.91.91/panels/network/panel-cell-renderer-signal.h 2011-03-10 13:49:27.017656001 +0100
@@ -25,9 +25,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -1194,3 +240,75 @@
#define PANEL_TYPE_CELL_RENDERER_SIGNAL (panel_cell_renderer_signal_get_type())
#define PANEL_CELL_RENDERER_SIGNAL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PANEL_TYPE_CELL_RENDERER_SIGNAL, PanelCellRendererSignal))
#define PANEL_CELL_RENDERER_SIGNAL_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST((cls), PANEL_TYPE_CELL_RENDERER_SIGNAL, PanelCellRendererSignalClass))
+Index: gnome-control-center-2.91.91/panels/network/panel-common.h
+===================================================================
+--- gnome-control-center-2.91.91.orig/panels/network/panel-common.h 2011-03-10 13:48:56.069656000 +0100
++++ gnome-control-center-2.91.91/panels/network/panel-common.h 2011-03-10 13:50:08.125656001 +0100
+@@ -23,17 +23,9 @@
+ #define PANEL_COMMON_H
+
+ #include <glib-object.h>
+-#include <NetworkManager.h>
+-#include <nm-device.h>
+
+ G_BEGIN_DECLS
+
+-const gchar *panel_device_to_icon_name (NMDevice *device);
+-const gchar *panel_device_to_localized_string (NMDevice *device);
+-const gchar *panel_device_to_sortable_string (NMDevice *device);
+-const gchar *panel_ap_mode_to_localized_string (NM80211Mode mode);
+-const gchar *panel_device_state_to_localized_string (NMDeviceState type);
+-
+ G_END_DECLS
+
+ #endif /* PANEL_COMMON_H */
+Index: gnome-control-center-2.91.91/panels/network/Makefile.in
+===================================================================
+--- gnome-control-center-2.91.91.orig/panels/network/Makefile.in 2011-03-10 13:48:55.957656000 +0100
++++ gnome-control-center-2.91.91/panels/network/Makefile.in 2011-03-10 15:05:53.605656002 +0100
+@@ -82,7 +82,7 @@
+ LTLIBRARIES = $(ccpanels_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libnetwork_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1)
+ am_libnetwork_la_OBJECTS = network-module.lo panel-common.lo \
+ panel-cell-renderer-mode.lo panel-cell-renderer-signal.lo \
+ cc-network-panel.lo
+@@ -212,6 +212,8 @@
+ LIBLANGUAGE_LIBS = @LIBLANGUAGE_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LIBSHORTCUTS_CFLAGS = @LIBSHORTCUTS_CFLAGS@
++LIBSHORTCUTS_LIBS = @LIBSHORTCUTS_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+@@ -229,8 +231,6 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+-NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+-NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NETWORK_PANEL_CFLAGS = @NETWORK_PANEL_CFLAGS@
+ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@
+ NM = @NM@
+Index: gnome-control-center-2.91.91/panels/network/panel-common.c
+===================================================================
+--- gnome-control-center-2.91.91.orig/panels/network/panel-common.c 2011-03-10 13:48:56.057656000 +0100
++++ gnome-control-center-2.91.91/panels/network/panel-common.c 2011-03-10 16:06:29.297656001 +0100
+@@ -26,8 +26,8 @@
+ #include <gtk/gtk.h>
+
+ #include "panel-common.h"
+-#include "nm-device-modem.h"
+
++#if 0
+ /**
+ * panel_device_to_icon_name:
+ **/
+@@ -227,3 +227,4 @@
+ }
+ return value;
+ }
++#endif
Added: desktop/experimental/gnome-control-center/debian/patches/10_libshortcuts-link.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/10_libshortcuts-link.patch?rev=26810&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/10_libshortcuts-link.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/10_libshortcuts-link.patch [utf-8] Thu Mar 10 16:58:36 2011
@@ -1,0 +1,29 @@
+Description: fix linking of libshortcuts
+
+https://bugzilla.gnome.org/show_bug.cgi?id=644410
+Index: gnome-control-center-2.91.91/configure.ac
+===================================================================
+--- gnome-control-center-2.91.91.orig/configure.ac 2011-03-10 15:01:10.825656002 +0100
++++ gnome-control-center-2.91.91/configure.ac 2011-03-10 15:03:28.025656000 +0100
+@@ -89,6 +89,7 @@
+
+ PKG_CHECK_MODULES(LIBGNOME_CONTROL_CENTER, $COMMON_MODULES gconf-2.0)
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0)
++PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES libgnome-menu gio-unix-2.0)
+ PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
+Index: gnome-control-center-2.91.91/panels/common/Makefile.am
+===================================================================
+--- gnome-control-center-2.91.91.orig/panels/common/Makefile.am 2011-03-10 15:01:10.845656002 +0100
++++ gnome-control-center-2.91.91/panels/common/Makefile.am 2011-03-10 15:01:40.677656002 +0100
+@@ -30,7 +30,8 @@
+ eggaccelerators.c
+
+ libshortcuts_la_LIBADD = \
+- $(PANEL_LIBS)
++ $(PANEL_LIBS) \
++ $(LIBSHORTCUTS_LIBS)
+
+ libshortcuts_la_LDFLAGS = $(PANEL_LDFLAGS)
+
Modified: desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch?rev=26810&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch [utf-8] Thu Mar 10 16:58:36 2011
@@ -1,8 +1,44 @@
-Index: gnome-control-center-2.91.90/configure
+Index: gnome-control-center-2.91.91/configure
===================================================================
---- gnome-control-center-2.91.90.orig/configure 2011-02-24 23:31:54.968327001 +0100
-+++ gnome-control-center-2.91.90/configure 2011-02-25 09:18:34.864327002 +0100
-@@ -791,8 +791,6 @@
+--- gnome-control-center-2.91.91.orig/configure 2011-03-10 15:05:05.313656000 +0100
++++ gnome-control-center-2.91.91/configure 2011-03-10 15:05:59.137656002 +0100
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.68 for gnome-control-center 2.91.91.
++# Generated by GNU Autoconf 2.67 for gnome-control-center 2.91.91.
+ #
+ # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center>.
+ #
+@@ -91,7 +91,6 @@
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+-as_myself=
+ case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -225,18 +224,11 @@
+ # 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.
+- # Preserve -v and -x to the replacement shell.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+- case $- in # ((((
+- *v*x* | *x*v* ) as_opts=-vx ;;
+- *v* ) as_opts=-v ;;
+- *x* ) as_opts=-x ;;
+- * ) as_opts= ;;
+- esac
+- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
+
+ if test x$as_have_required = xno; then :
+@@ -662,8 +654,6 @@
CUPS_CONFIG
BUILD_NETWORK_FALSE
BUILD_NETWORK_TRUE
@@ -11,7 +47,41 @@
GDESKTOP_PREFIX
USER_ACCOUNTS_PANEL_LIBS
USER_ACCOUNTS_PANEL_CFLAGS
-@@ -1090,8 +1088,6 @@
+@@ -697,6 +687,8 @@
+ BACKGROUND_PANEL_CFLAGS
+ SHELL_LIBS
+ SHELL_CFLAGS
++LIBSHORTCUTS_LIBS
++LIBSHORTCUTS_CFLAGS
+ LIBLANGUAGE_LIBS
+ LIBLANGUAGE_CFLAGS
+ LIBGNOME_CONTROL_CENTER_LIBS
+@@ -897,7 +889,6 @@
+ with_help_formats
+ enable_scrollkeeper
+ enable_nls
+-with_gnu_ld
+ enable_rpath
+ with_libiconv_prefix
+ with_libintl_prefix
+@@ -927,7 +918,6 @@
+ LIBS
+ CPPFLAGS
+ CPP
+-CPPFLAGS
+ PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
+@@ -936,6 +926,8 @@
+ LIBGNOME_CONTROL_CENTER_LIBS
+ LIBLANGUAGE_CFLAGS
+ LIBLANGUAGE_LIBS
++LIBSHORTCUTS_CFLAGS
++LIBSHORTCUTS_LIBS
+ SHELL_CFLAGS
+ SHELL_LIBS
+ BACKGROUND_PANEL_CFLAGS
+@@ -968,8 +960,6 @@
UNIVERSAL_ACCESS_PANEL_LIBS
USER_ACCOUNTS_PANEL_CFLAGS
USER_ACCOUNTS_PANEL_LIBS
@@ -20,7 +90,27 @@
CHEESE_CFLAGS
CHEESE_LIBS
ISOCODES_CFLAGS
-@@ -1860,10 +1856,6 @@
+@@ -1380,7 +1370,7 @@
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+- : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ ;;
+
+ esac
+@@ -1678,6 +1668,10 @@
+ C compiler flags for LIBLANGUAGE, overriding pkg-config
+ LIBLANGUAGE_LIBS
+ linker flags for LIBLANGUAGE, overriding pkg-config
++ LIBSHORTCUTS_CFLAGS
++ C compiler flags for LIBSHORTCUTS, overriding pkg-config
++ LIBSHORTCUTS_LIBS
++ linker flags for LIBSHORTCUTS, overriding pkg-config
+ SHELL_CFLAGS
+ C compiler flags for SHELL, overriding pkg-config
+ SHELL_LIBS linker flags for SHELL, overriding pkg-config
+@@ -1742,10 +1736,6 @@
C compiler flags for USER_ACCOUNTS_PANEL, overriding pkg-config
USER_ACCOUNTS_PANEL_LIBS
linker flags for USER_ACCOUNTS_PANEL, overriding pkg-config
@@ -31,107 +121,1822 @@
CHEESE_CFLAGS
C compiler flags for CHEESE, overriding pkg-config
CHEESE_LIBS linker flags for CHEESE, overriding pkg-config
-@@ -5330,13 +5322,13 @@
+@@ -1825,7 +1815,7 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ gnome-control-center configure 2.91.91
+-generated by GNU Autoconf 2.68
++generated by GNU Autoconf 2.67
+
+ Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -1871,7 +1861,7 @@
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_compile
+@@ -1908,7 +1898,7 @@
+
+ ac_retval=1
+ fi
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_cpp
+@@ -1950,7 +1940,7 @@
+ ac_retval=$ac_status
+ fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_run
+@@ -1996,7 +1986,7 @@
+ # 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; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_link
+@@ -2010,7 +2000,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2028,7 +2018,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+ } # ac_fn_c_check_header_compile
+
+@@ -2040,7 +2030,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2095,7 +2085,7 @@
+ eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+ } # ac_fn_c_check_func
+
+@@ -2107,10 +2097,10 @@
+ ac_fn_c_check_header_mongrel ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if eval \${$3+:} false; then :
++ if eval "test \"\${$3+set}\"" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -2177,7 +2167,7 @@
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval \${$3+:} false; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=\$ac_header_compiler"
+@@ -2186,7 +2176,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
++ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+ } # ac_fn_c_check_header_mongrel
+ cat >config.log <<_ACEOF
+@@ -2194,7 +2184,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by gnome-control-center $as_me 2.91.91, which was
+-generated by GNU Autoconf 2.68. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ $ $0 $@
+
+@@ -2452,7 +2442,7 @@
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ done
+
+@@ -2596,7 +2586,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if ${ac_cv_path_install+:} false; then :
++if test "${ac_cv_path_install+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2683,11 +2673,11 @@
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -2773,7 +2763,7 @@
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_STRIP+:} false; then :
++if test "${ac_cv_prog_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$STRIP"; then
+@@ -2813,7 +2803,7 @@
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_STRIP"; then
+@@ -2866,7 +2856,7 @@
+ { $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 ${ac_cv_path_mkdir+:} false; then :
++ if test "${ac_cv_path_mkdir+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2917,7 +2907,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_AWK+:} false; then :
++if test "${ac_cv_prog_AWK+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$AWK"; then
+@@ -2957,7 +2947,7 @@
+ $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 eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -3123,7 +3113,7 @@
+ done
+ rm -rf conftest.dir
+
+-if ${am_cv_prog_tar_ustar+:} false; then :
++if test "${am_cv_prog_tar_ustar+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ am_cv_prog_tar_ustar=$_am_tool
+@@ -3183,7 +3173,7 @@
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3223,7 +3213,7 @@
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_CC+:} false; then :
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -3276,7 +3266,7 @@
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3316,7 +3306,7 @@
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3375,7 +3365,7 @@
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_CC+:} false; then :
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -3419,7 +3409,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_CC+:} false; then :
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -3474,7 +3464,7 @@
+ 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_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3589,7 +3579,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "C compiler cannot create executables
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3632,7 +3622,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3691,7 +3681,7 @@
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
+ fi
+@@ -3702,7 +3692,7 @@
+ ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if ${ac_cv_objext+:} false; then :
++if test "${ac_cv_objext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3743,7 +3733,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -3753,7 +3743,7 @@
+ ac_objext=$OBJEXT
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if ${ac_cv_c_compiler_gnu+:} false; then :
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3790,7 +3780,7 @@
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if ${ac_cv_prog_cc_g+:} false; then :
++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
+@@ -3868,7 +3858,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if ${ac_cv_prog_cc_c89+:} false; then :
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_prog_cc_c89=no
+@@ -4029,7 +4019,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
++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
+@@ -4161,7 +4151,7 @@
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4291,7 +4281,7 @@
+ CPP=
+ fi
+ if test -z "$CPP"; then
+- if ${ac_cv_prog_CPP+:} false; then :
++ if test "${ac_cv_prog_CPP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ # Double quotes because CPP needs to be expanded
+@@ -4407,7 +4397,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+
+ ac_ext=c
+@@ -4419,7 +4409,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if ${ac_cv_path_GREP+:} false; then :
++if test "${ac_cv_path_GREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$GREP"; then
+@@ -4482,7 +4472,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
+-if ${ac_cv_path_EGREP+:} false; then :
++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
+@@ -4549,7 +4539,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if ${ac_cv_header_stdc+:} false; then :
++if test "${ac_cv_header_stdc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4693,7 +4683,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+-if ${ac_cv_build+:} false; then :
++if test "${ac_cv_build+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_build_alias=$build_alias
+@@ -4709,7 +4699,7 @@
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -4727,7 +4717,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+ $as_echo_n "checking host system type... " >&6; }
+-if ${ac_cv_host+:} false; then :
++if test "${ac_cv_host+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "x$host_alias" = x; then
+@@ -4742,7 +4732,7 @@
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -4829,7 +4819,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
+-if ${ac_cv_path_SED+:} false; then :
++if test "${ac_cv_path_SED+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+@@ -4911,7 +4901,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+ $as_echo_n "checking for fgrep... " >&6; }
+-if ${ac_cv_path_FGREP+:} false; then :
++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
+@@ -5042,7 +5032,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if ${lt_cv_path_LD+:} false; then :
++if test "${lt_cv_path_LD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$LD"; then
+@@ -5082,7 +5072,7 @@
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if ${lt_cv_prog_gnu_ld+:} false; then :
++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.
+@@ -5109,7 +5099,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+ $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+-if ${lt_cv_path_NM+:} false; then :
++if test "${lt_cv_path_NM+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$NM"; then
+@@ -5172,7 +5162,7 @@
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_DUMPBIN+:} false; then :
++if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$DUMPBIN"; then
+@@ -5216,7 +5206,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_DUMPBIN"; then
+@@ -5288,7 +5278,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+ $as_echo_n "checking the name lister ($NM) interface... " >&6; }
+-if ${lt_cv_nm_interface+:} false; then :
++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:5333: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5325: $ac_compile\"" >&5)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:5336: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5328: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&5
-- (eval echo "\"\$as_me:5339: output\"" >&5)
-+ (eval echo "\"\$as_me:5331: output\"" >&5)
- cat conftest.out >&5
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
-@@ -6541,7 +6533,7 @@
- ;;
- *-*-irix6*)
- # Find out which ABI we are using.
-- echo '#line 6544 "configure"' > conftest.$ac_ext
-+ echo '#line 6536 "configure"' > conftest.$ac_ext
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
-@@ -7820,11 +7812,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:7823: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7815: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:7827: \$? = $ac_status" >&5
-+ echo "$as_me:7819: \$? = $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.
-@@ -8159,11 +8151,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:8162: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8154: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:8166: \$? = $ac_status" >&5
-+ echo "$as_me:8158: \$? = $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.
-@@ -8264,11 +8256,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:8267: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8259: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8271: \$? = $ac_status" >&5
-+ echo "$as_me:8263: \$? = $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
-@@ -8319,11 +8311,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:8322: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8314: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:8326: \$? = $ac_status" >&5
-+ echo "$as_me:8318: \$? = $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
-@@ -10703,7 +10695,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 10706 "configure"
-+#line 10698 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -10799,7 +10791,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--#line 10802 "configure"
-+#line 10794 "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
-@@ -16438,80 +16430,7 @@
+@@ -5323,7 +5313,7 @@
+ # find the maximum length of command line arguments
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+ $as_echo_n "checking the maximum length of command line arguments... " >&6; }
+-if ${lt_cv_sys_max_cmd_len+:} false; then :
++if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ i=0
+@@ -5520,7 +5510,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+ $as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+-if ${lt_cv_to_host_file_cmd+:} false; then :
++if test "${lt_cv_to_host_file_cmd+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $host in
+@@ -5567,7 +5557,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+ $as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+-if ${lt_cv_to_tool_file_cmd+:} false; then :
++if test "${lt_cv_to_tool_file_cmd+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ #assume ordinary cross tools, or native build.
+@@ -5594,7 +5584,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+ $as_echo_n "checking for $LD option to reload object files... " >&6; }
+-if ${lt_cv_ld_reload_flag+:} false; then :
++if test "${lt_cv_ld_reload_flag+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_ld_reload_flag='-r'
+@@ -5635,7 +5625,7 @@
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_OBJDUMP+:} false; then :
++if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$OBJDUMP"; then
+@@ -5675,7 +5665,7 @@
+ set dummy objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_OBJDUMP"; then
+@@ -5734,7 +5724,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+ $as_echo_n "checking how to recognize dependent libraries... " >&6; }
+-if ${lt_cv_deplibs_check_method+:} false; then :
++if test "${lt_cv_deplibs_check_method+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
+@@ -5981,7 +5971,7 @@
+ set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_DLLTOOL+:} false; then :
++if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$DLLTOOL"; then
+@@ -6021,7 +6011,7 @@
+ set dummy dlltool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_DLLTOOL"; then
+@@ -6081,7 +6071,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+ $as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
++if test "${lt_cv_sharedlib_from_linklib_cmd+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_sharedlib_from_linklib_cmd='unknown'
+@@ -6124,7 +6114,7 @@
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_AR+:} false; then :
++if test "${ac_cv_prog_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$AR"; then
+@@ -6168,7 +6158,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_AR+:} false; then :
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_AR"; then
+@@ -6232,7 +6222,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+ $as_echo_n "checking for archiver @FILE support... " >&6; }
+-if ${lt_cv_ar_at_file+:} false; then :
++if test "${lt_cv_ar_at_file+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_ar_at_file=no
+@@ -6293,7 +6283,7 @@
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_STRIP+:} false; then :
++if test "${ac_cv_prog_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$STRIP"; then
+@@ -6333,7 +6323,7 @@
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_STRIP"; then
+@@ -6392,7 +6382,7 @@
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_RANLIB+:} false; then :
++if test "${ac_cv_prog_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$RANLIB"; then
+@@ -6432,7 +6422,7 @@
+ set dummy ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_RANLIB"; then
+@@ -6561,7 +6551,7 @@
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+ $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -6994,7 +6984,7 @@
+ CFLAGS="$CFLAGS -belf"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+-if ${lt_cv_cc_needs_belf+:} false; then :
++if test "${lt_cv_cc_needs_belf+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_ext=c
+@@ -7067,7 +7057,7 @@
+ set dummy ${ac_tool_prefix}mt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
++if test "${ac_cv_prog_MANIFEST_TOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$MANIFEST_TOOL"; then
+@@ -7107,7 +7097,7 @@
+ set dummy mt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
++if test "${ac_cv_prog_ac_ct_MANIFEST_TOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_MANIFEST_TOOL"; then
+@@ -7157,7 +7147,7 @@
+ test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+ $as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+-if ${lt_cv_path_mainfest_tool+:} false; then :
++if test "${lt_cv_path_mainfest_tool+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_path_mainfest_tool=no
+@@ -7187,7 +7177,7 @@
+ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_DSYMUTIL+:} false; then :
++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$DSYMUTIL"; then
+@@ -7227,7 +7217,7 @@
+ set dummy dsymutil; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_DSYMUTIL"; then
+@@ -7279,7 +7269,7 @@
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_NMEDIT+:} false; then :
++if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$NMEDIT"; then
+@@ -7319,7 +7309,7 @@
+ set dummy nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_NMEDIT"; then
+@@ -7371,7 +7361,7 @@
+ set dummy ${ac_tool_prefix}lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_LIPO+:} false; then :
++if test "${ac_cv_prog_LIPO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$LIPO"; then
+@@ -7411,7 +7401,7 @@
+ set dummy lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_LIPO"; then
+@@ -7463,7 +7453,7 @@
+ set dummy ${ac_tool_prefix}otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_OTOOL+:} false; then :
++if test "${ac_cv_prog_OTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$OTOOL"; then
+@@ -7503,7 +7493,7 @@
+ set dummy otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_OTOOL"; then
+@@ -7555,7 +7545,7 @@
+ set dummy ${ac_tool_prefix}otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_OTOOL64+:} false; then :
++if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$OTOOL64"; then
+@@ -7595,7 +7585,7 @@
+ set dummy otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_OTOOL64"; then
+@@ -7670,7 +7660,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+ $as_echo_n "checking for -single_module linker flag... " >&6; }
+-if ${lt_cv_apple_cc_single_mod+:} false; then :
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_apple_cc_single_mod=no
+@@ -7699,7 +7689,7 @@
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+-if ${lt_cv_ld_exported_symbols_list+:} false; then :
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_ld_exported_symbols_list=no
+@@ -7731,7 +7721,7 @@
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+ $as_echo_n "checking for -force_load linker flag... " >&6; }
+-if ${lt_cv_ld_force_load+:} false; then :
++if test "${lt_cv_ld_force_load+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_ld_force_load=no
+@@ -7817,7 +7807,7 @@
+ 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" = xyes; then :
++if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DLFCN_H 1
+ _ACEOF
+@@ -8004,7 +7994,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+ $as_echo_n "checking for objdir... " >&6; }
+-if ${lt_cv_objdir+:} false; then :
++if test "${lt_cv_objdir+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ rm -f .libs 2>/dev/null
+@@ -8082,7 +8072,7 @@
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+ $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+-if ${lt_cv_path_MAGIC_CMD+:} false; then :
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MAGIC_CMD in
+@@ -8148,7 +8138,7 @@
+ if test -n "$ac_tool_prefix"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+ $as_echo_n "checking for file... " >&6; }
+-if ${lt_cv_path_MAGIC_CMD+:} false; then :
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MAGIC_CMD in
+@@ -8290,7 +8280,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+@@ -8635,7 +8625,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+-if ${lt_cv_prog_compiler_pic+:} false; then :
++if test "${lt_cv_prog_compiler_pic+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+@@ -8650,7 +8640,7 @@
+ if test -n "$lt_prog_compiler_pic"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+-if ${lt_cv_prog_compiler_pic_works+:} false; then :
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_pic_works=no
+@@ -8714,7 +8704,7 @@
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if ${lt_cv_prog_compiler_static_works+:} false; then :
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_static_works=no
+@@ -8757,7 +8747,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if ${lt_cv_prog_compiler_c_o+:} false; then :
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_c_o=no
+@@ -8812,7 +8802,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if ${lt_cv_prog_compiler_c_o+:} false; then :
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler_c_o=no
+@@ -9377,7 +9367,7 @@
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+ else
+- if ${lt_cv_aix_libpath_+:} false; then :
++ if test "${lt_cv_aix_libpath_+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -9430,7 +9420,7 @@
+ if test "${lt_cv_aix_libpath+set}" = set; then
+ aix_libpath=$lt_cv_aix_libpath
+ else
+- if ${lt_cv_aix_libpath_+:} false; then :
++ if test "${lt_cv_aix_libpath_+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -9702,7 +9692,7 @@
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+ $as_echo_n "checking if $CC understands -b... " >&6; }
+-if ${lt_cv_prog_compiler__b+:} false; then :
++if test "${lt_cv_prog_compiler__b+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_prog_compiler__b=no
+@@ -9771,7 +9761,7 @@
+ # This should be the same for all languages, so no per-tag cache variable.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+ $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+-if ${lt_cv_irix_exported_symbol+:} false; then :
++if test "${lt_cv_irix_exported_symbol+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ save_LDFLAGS="$LDFLAGS"
+@@ -10087,7 +10077,7 @@
+ # to ld, don't add -lc before -lgcc.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+-if ${lt_cv_archive_cmds_need_lc+:} false; then :
++if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ $RM conftest*
+@@ -10788,7 +10778,7 @@
+ shlibpath_overrides_runpath=no
+
+ # Some binutils ld are patched to set DT_RUNPATH
+- if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
++ if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ lt_cv_shlibpath_overrides_runpath=no
+@@ -11212,7 +11202,7 @@
+ # if libdl is installed we need to link against it
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if ${ac_cv_lib_dl_dlopen+:} false; then :
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -11246,7 +11236,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+
+@@ -11260,12 +11250,12 @@
+
+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+-if test "x$ac_cv_func_shl_load" = xyes; then :
++if test "x$ac_cv_func_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if ${ac_cv_lib_dld_shl_load+:} false; then :
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -11299,16 +11289,16 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+-if test "x$ac_cv_func_dlopen" = xyes; then :
++if test "x$ac_cv_func_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if ${ac_cv_lib_dl_dlopen+:} false; then :
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -11342,12 +11332,12 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
++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:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
+-if ${ac_cv_lib_svld_dlopen+:} false; then :
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -11381,12 +11371,12 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
++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:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
+-if ${ac_cv_lib_dld_dld_link+:} false; then :
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -11420,7 +11410,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+@@ -11461,7 +11451,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
+-if ${lt_cv_dlopen_self+:} false; then :
++if test "${lt_cv_dlopen_self+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -11567,7 +11557,7 @@
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+-if ${lt_cv_dlopen_self_static+:} false; then :
++if test "${lt_cv_dlopen_self_static+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then :
+@@ -11835,7 +11825,7 @@
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_PKG_CONFIG+:} false; then :
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PKG_CONFIG in
+@@ -11878,7 +11868,7 @@
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $ac_pt_PKG_CONFIG in
+@@ -12076,7 +12066,7 @@
+ set dummy intltool-update; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_UPDATE in
+@@ -12116,7 +12106,7 @@
+ set dummy intltool-merge; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_MERGE in
+@@ -12156,7 +12146,7 @@
+ set dummy intltool-extract; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_EXTRACT in
+@@ -12317,7 +12307,7 @@
+ set dummy xgettext; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_XGETTEXT+:} false; then :
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $XGETTEXT in
+@@ -12357,7 +12347,7 @@
+ set dummy msgmerge; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_MSGMERGE+:} false; then :
++if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGMERGE in
+@@ -12397,7 +12387,7 @@
+ set dummy msgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_MSGFMT+:} false; then :
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGFMT in
+@@ -12437,7 +12427,7 @@
+ set dummy gmsgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GMSGFMT+:} false; then :
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GMSGFMT in
+@@ -12488,7 +12478,7 @@
+ set dummy perl; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_PERL in
+@@ -12572,7 +12562,7 @@
+ case $host in
+ *-*-solaris*)
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ DATADIRNAME=share
+ else
+ DATADIRNAME=lib
+@@ -12633,7 +12623,7 @@
+ set dummy msgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_MSGFMT+:} false; then :
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$MSGFMT" in
+@@ -12674,7 +12664,7 @@
+ set dummy gmsgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GMSGFMT+:} false; then :
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GMSGFMT in
+@@ -12756,7 +12746,7 @@
+ set dummy xgettext; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_XGETTEXT+:} false; then :
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$XGETTEXT" in
+@@ -12834,7 +12824,7 @@
+ set dummy msgmerge; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_MSGMERGE+:} false; then :
++if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$MSGMERGE" in
+@@ -12956,7 +12946,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if ${acl_cv_path_LD+:} false; then :
++if test "${acl_cv_path_LD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$LD"; then
+@@ -12993,7 +12983,7 @@
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if ${acl_cv_prog_gnu_ld+:} false; then :
++if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+@@ -13013,7 +13003,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+ $as_echo_n "checking for shared library run path origin... " >&6; }
+-if ${acl_cv_rpath+:} false; then :
++if test "${acl_cv_rpath+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -13527,7 +13517,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+ $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
++if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ gt_save_LIBS="$LIBS"
+@@ -13561,7 +13551,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+ $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
++if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ gt_save_LIBS="$LIBS"
+@@ -13637,7 +13627,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+ $as_echo_n "checking for GNU gettext in libc... " >&6; }
+-if eval \${$gt_func_gnugettext_libc+:} false; then :
++if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -13700,7 +13690,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+ $as_echo_n "checking for iconv... " >&6; }
+-if ${am_cv_func_iconv+:} false; then :
++if test "${am_cv_func_iconv+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -13757,7 +13747,7 @@
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+ $as_echo_n "checking for working iconv... " >&6; }
+-if ${am_cv_func_iconv_works+:} false; then :
++if test "${am_cv_func_iconv_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+@@ -14308,7 +14298,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+ $as_echo_n "checking for GNU gettext in libintl... " >&6; }
+-if eval \${$gt_func_gnugettext_libintl+:} false; then :
++if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ gt_save_CPPFLAGS="$CPPFLAGS"
+@@ -14642,8 +14632,8 @@
+ have_x=disabled
+ else
+ case $x_includes,$x_libraries in #(
+- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+- *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
++ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
++ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ # One or both of the vars are not set, and there is no cached value.
+@@ -14920,7 +14910,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -14954,14 +14944,14 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+-if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -14995,7 +14985,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+
+@@ -15014,14 +15004,14 @@
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+-if test "x$ac_cv_func_gethostbyname" = xyes; then :
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+
+ fi
+
+ if test $ac_cv_func_gethostbyname = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+-if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15055,14 +15045,14 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+-if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15096,7 +15086,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+
+@@ -15111,14 +15101,14 @@
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+-if test "x$ac_cv_func_connect" = xyes; then :
++if test "x$ac_cv_func_connect" = x""yes; then :
+
+ fi
+
+ if test $ac_cv_func_connect = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+ $as_echo_n "checking for connect in -lsocket... " >&6; }
+-if ${ac_cv_lib_socket_connect+:} false; then :
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15152,7 +15142,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+ $as_echo "$ac_cv_lib_socket_connect" >&6; }
+-if test "x$ac_cv_lib_socket_connect" = xyes; then :
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+
+@@ -15160,14 +15150,14 @@
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+-if test "x$ac_cv_func_remove" = xyes; then :
++if test "x$ac_cv_func_remove" = x""yes; then :
+
+ fi
+
+ if test $ac_cv_func_remove = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+ $as_echo_n "checking for remove in -lposix... " >&6; }
+-if ${ac_cv_lib_posix_remove+:} false; then :
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15201,7 +15191,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+ $as_echo "$ac_cv_lib_posix_remove" >&6; }
+-if test "x$ac_cv_lib_posix_remove" = xyes; then :
++if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+
+@@ -15209,14 +15199,14 @@
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+-if test "x$ac_cv_func_shmat" = xyes; then :
++if test "x$ac_cv_func_shmat" = x""yes; then :
+
+ fi
+
+ if test $ac_cv_func_shmat = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+ $as_echo_n "checking for shmat in -lipc... " >&6; }
+-if ${ac_cv_lib_ipc_shmat+:} false; then :
++if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15250,7 +15240,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+ $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+-if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+
+@@ -15268,7 +15258,7 @@
+ # John Interrante, Karl Berry
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+-if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15302,7 +15292,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+ fi
+
+@@ -15316,7 +15306,7 @@
+ set dummy glib-mkenums; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GLIB_MKENUMS+:} false; then :
++if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GLIB_MKENUMS in
+@@ -15358,7 +15348,7 @@
+ for ac_header in X11/Xlib.h
+ do :
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_X11_Xlib_h" = xyes; then :
++if test "x$ac_cv_header_X11_Xlib_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_X11_XLIB_H 1
+ _ACEOF
+@@ -15369,7 +15359,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86MiscQueryExtension in -lXxf86misc" >&5
+ $as_echo_n "checking for XF86MiscQueryExtension in -lXxf86misc... " >&6; }
+-if ${ac_cv_lib_Xxf86misc_XF86MiscQueryExtension+:} false; then :
++if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryExtension+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15403,7 +15393,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&5
+ $as_echo "$ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" >&6; }
+-if test "x$ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" = xyes; then :
++if test "x$ac_cv_lib_Xxf86misc_XF86MiscQueryExtension" = x""yes; then :
+
+ for ac_header in X11/extensions/xf86misc.h
+ do :
+@@ -15412,7 +15402,7 @@
+ #endif
+
+ "
+-if test "x$ac_cv_header_X11_extensions_xf86misc_h" = xyes; then :
++if test "x$ac_cv_header_X11_extensions_xf86misc_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_X11_EXTENSIONS_XF86MISC_H 1
+ _ACEOF
+@@ -15427,7 +15417,7 @@
+ for ac_header in X11/extensions/XKB.h
+ do :
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/XKB.h" "ac_cv_header_X11_extensions_XKB_h" "$ac_includes_default"
+-if test "x$ac_cv_header_X11_extensions_XKB_h" = xyes; then :
++if test "x$ac_cv_header_X11_extensions_XKB_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_X11_EXTENSIONS_XKB_H 1
+ _ACEOF
+@@ -15440,7 +15430,7 @@
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5
+ $as_echo_n "checking for floor in -lm... " >&6; }
+-if ${ac_cv_lib_m_floor+:} false; then :
++if test "${ac_cv_lib_m_floor+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15474,7 +15464,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5
+ $as_echo "$ac_cv_lib_m_floor" >&6; }
+-if test "x$ac_cv_lib_m_floor" = xyes; then :
++if test "x$ac_cv_lib_m_floor" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBM 1
+ _ACEOF
+@@ -15584,7 +15574,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ LIBGNOME_CONTROL_CENTER_CFLAGS=$pkg_cv_LIBGNOME_CONTROL_CENTER_CFLAGS
+@@ -15675,7 +15665,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ LIBLANGUAGE_CFLAGS=$pkg_cv_LIBLANGUAGE_CFLAGS
+@@ -15686,6 +15676,97 @@
+ fi
+
+ pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSHORTCUTS" >&5
++$as_echo_n "checking for LIBSHORTCUTS... " >&6; }
++
++if test -n "$LIBSHORTCUTS_CFLAGS"; then
++ pkg_cv_LIBSHORTCUTS_CFLAGS="$LIBSHORTCUTS_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES x11\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES x11") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_LIBSHORTCUTS_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES x11" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$LIBSHORTCUTS_LIBS"; then
++ pkg_cv_LIBSHORTCUTS_LIBS="$LIBSHORTCUTS_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES x11\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES x11") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_LIBSHORTCUTS_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES x11" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ LIBSHORTCUTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$COMMON_MODULES x11" 2>&1`
++ else
++ LIBSHORTCUTS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$COMMON_MODULES x11" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$LIBSHORTCUTS_PKG_ERRORS" >&5
++
++ as_fn_error $? "Package requirements ($COMMON_MODULES x11) were not met:
++
++$LIBSHORTCUTS_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables LIBSHORTCUTS_CFLAGS
++and LIBSHORTCUTS_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
++
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables LIBSHORTCUTS_CFLAGS
++and LIBSHORTCUTS_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5 ; }
++
++else
++ LIBSHORTCUTS_CFLAGS=$pkg_cv_LIBSHORTCUTS_CFLAGS
++ LIBSHORTCUTS_LIBS=$pkg_cv_LIBSHORTCUTS_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++fi
++
++pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHELL" >&5
+ $as_echo_n "checking for SHELL... " >&6; }
+
+@@ -15766,7 +15847,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ SHELL_CFLAGS=$pkg_cv_SHELL_CFLAGS
+@@ -15866,7 +15947,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ BACKGROUND_PANEL_CFLAGS=$pkg_cv_BACKGROUND_PANEL_CFLAGS
+@@ -15975,7 +16056,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ DATETIME_PANEL_CFLAGS=$pkg_cv_DATETIME_PANEL_CFLAGS
+@@ -16066,7 +16147,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ DISPLAY_PANEL_CFLAGS=$pkg_cv_DISPLAY_PANEL_CFLAGS
+@@ -16157,7 +16238,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ INFO_PANEL_CFLAGS=$pkg_cv_INFO_PANEL_CFLAGS
+@@ -16248,7 +16329,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ KEYBOARD_PANEL_CFLAGS=$pkg_cv_KEYBOARD_PANEL_CFLAGS
+@@ -16339,7 +16420,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ MEDIA_PANEL_CFLAGS=$pkg_cv_MEDIA_PANEL_CFLAGS
+@@ -16439,7 +16520,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ MOUSE_PANEL_CFLAGS=$pkg_cv_MOUSE_PANEL_CFLAGS
+@@ -16530,7 +16611,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ NETWORK_PANEL_CFLAGS=$pkg_cv_NETWORK_PANEL_CFLAGS
+@@ -16621,7 +16702,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ POWER_PANEL_CFLAGS=$pkg_cv_POWER_PANEL_CFLAGS
+@@ -16721,7 +16802,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ PRINTERS_PANEL_CFLAGS=$pkg_cv_PRINTERS_PANEL_CFLAGS
+@@ -16821,7 +16902,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ REGION_PANEL_CFLAGS=$pkg_cv_REGION_PANEL_CFLAGS
+@@ -16912,7 +16993,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ SCREEN_PANEL_CFLAGS=$pkg_cv_SCREEN_PANEL_CFLAGS
+@@ -17039,7 +17120,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ SOUND_PANEL_CFLAGS=$pkg_cv_SOUND_PANEL_CFLAGS
+@@ -17130,7 +17211,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ UNIVERSAL_ACCESS_PANEL_CFLAGS=$pkg_cv_UNIVERSAL_ACCESS_PANEL_CFLAGS
+@@ -17248,7 +17329,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ USER_ACCOUNTS_PANEL_CFLAGS=$pkg_cv_USER_ACCOUNTS_PANEL_CFLAGS
+@@ -17261,80 +17342,7 @@
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
@@ -213,11 +2018,375 @@
if test x$have_networkmanager = xyes; then
BUILD_NETWORK_TRUE=
BUILD_NETWORK_FALSE='#'
-Index: gnome-control-center-2.91.90/panels/mouse/Makefile.in
+@@ -17358,7 +17366,7 @@
+ set dummy cups-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_CUPS_CONFIG+:} false; then :
++if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $CUPS_CONFIG in
+@@ -17381,7 +17389,7 @@
+ done
+ IFS=$as_save_IFS
+
+- test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="as_fn_error $? "cups-config not found but CUPS support requested" "$LINENO" 5"
++ test -z "$ac_cv_path_CUPS_CONFIG" && ac_cv_path_CUPS_CONFIG="as_fn_error $? "cups-config not found but CUPS support requested" "$LINENO" 5 "
+ ;;
+ esac
+ fi
+@@ -17617,7 +17625,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ ISOCODES_CFLAGS=$pkg_cv_ISOCODES_CFLAGS
+@@ -17639,7 +17647,7 @@
+ set dummy glib-genmarshal; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then :
++if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GLIB_GENMARSHAL in
+@@ -17688,7 +17696,7 @@
+ set dummy gconftool-2; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GCONFTOOL+:} false; then :
++if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GCONFTOOL in
+@@ -17767,7 +17775,7 @@
+ if test "${enable_schemas_install+set}" = set; then :
+ enableval=$enable_schemas_install; case ${enableval} in
+ yes|no) ;;
+- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+ esac
+ fi
+
+@@ -17891,7 +17899,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ else
+ SOCIALWEB_CFLAGS=$pkg_cv_SOCIALWEB_CFLAGS
+@@ -17919,7 +17927,7 @@
+ set dummy update-mime-database; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_UPDATE_MIME_DATABASE+:} false; then :
++if test "${ac_cv_path_UPDATE_MIME_DATABASE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $UPDATE_MIME_DATABASE in
+@@ -17980,7 +17988,7 @@
+ set dummy gtkdoc-check; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GTKDOC_CHECK+:} false; then :
++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_CHECK in
+@@ -18022,7 +18030,7 @@
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GTKDOC_REBASE+:} false; then :
++if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_REBASE in
+@@ -18066,7 +18074,7 @@
+ set dummy gtkdoc-mkpdf; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_GTKDOC_MKPDF+:} false; then :
++if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTKDOC_MKPDF in
+@@ -18340,21 +18348,10 @@
+ :end' >>confcache
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+- if test "x$cache_file" != "x/dev/null"; then
++ test "x$cache_file" != "x/dev/null" &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
+- if test ! -f "$cache_file" || test -h "$cache_file"; then
+- cat confcache >"$cache_file"
+- else
+- case $cache_file in #(
+- */* | ?:*)
+- mv -f confcache "$cache_file"$$ &&
+- mv -f "$cache_file"$$ "$cache_file" ;; #(
+- *)
+- mv -f confcache "$cache_file" ;;
+- esac
+- fi
+- fi
++ cat confcache >$cache_file
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+@@ -18462,7 +18459,7 @@
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+-: "${CONFIG_STATUS=./config.status}"
++: ${CONFIG_STATUS=./config.status}
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+@@ -18563,7 +18560,6 @@
+ IFS=" "" $as_nl"
+
+ # Find who we are. Look in the path if we contain no directory separator.
+-as_myself=
+ case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -18871,7 +18867,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by gnome-control-center $as_me 2.91.91, which was
+-generated by GNU Autoconf 2.68. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -18937,7 +18933,7 @@
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ gnome-control-center config.status 2.91.91
+-configured by $0, generated by GNU Autoconf 2.68,
++configured by $0, generated by GNU Autoconf 2.67,
+ with options \\"\$ac_cs_config\\"
+
+ Copyright (C) 2010 Free Software Foundation, Inc.
+@@ -19429,7 +19425,7 @@
+ "shell/gnome-control-center.desktop.in") CONFIG_FILES="$CONFIG_FILES shell/gnome-control-center.desktop.in" ;;
+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+
+- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ esac
+ done
+
+@@ -19452,10 +19448,9 @@
+ # after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+- tmp= ac_tmp=
++ tmp=
+ trap 'exit_status=$?
+- : "${ac_tmp:=$tmp}"
+- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ ' 0
+ trap 'as_fn_exit 1' 1 2 13 15
+ }
+@@ -19463,13 +19458,12 @@
+
+ {
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+- test -d "$tmp"
++ test -n "$tmp" && test -d "$tmp"
+ } ||
+ {
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+ } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+-ac_tmp=$tmp
+
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -19491,7 +19485,7 @@
+ ac_cs_awk_cr=$ac_cr
+ fi
+
+-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
++echo 'BEGIN {' >"$tmp/subs1.awk" &&
+ _ACEOF
+
+
+@@ -19519,7 +19513,7 @@
+ rm -f conf$$subs.sh
+
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
++cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+ _ACEOF
+ sed -n '
+ h
+@@ -19567,7 +19561,7 @@
+ rm -f conf$$subs.awk
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
++cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+
+@@ -19599,7 +19593,7 @@
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
+ cat
+-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+
+@@ -19633,7 +19627,7 @@
+ # No need to generate them if there are no CONFIG_HEADERS.
+ # This happens for instance with `./config.status Makefile'.
+ if test -n "$CONFIG_HEADERS"; then
+-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
++cat >"$tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+
+@@ -19645,8 +19639,8 @@
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+- if test -z "$ac_tt"; then
++ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
++ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+@@ -19747,7 +19741,7 @@
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -19766,7 +19760,7 @@
+ for ac_f
+ do
+ case $ac_f in
+- -) ac_f="$ac_tmp/stdin";;
++ -) ac_f="$tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+@@ -19775,7 +19769,7 @@
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+@@ -19801,8 +19795,8 @@
+ esac
+
+ case $ac_tag in
+- *:-:* | *:-) cat >"$ac_tmp/stdin" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++ *:-:* | *:-) cat >"$tmp/stdin" \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+@@ -19938,22 +19932,21 @@
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ "
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+- "$ac_tmp/out"`; test -z "$ac_out"; } &&
++ { 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:${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;}
+
+- rm -f "$ac_tmp/stdin"
++ rm -f "$tmp/stdin"
+ case $ac_file in
+- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
++ -) cat "$tmp/out" && rm -f "$tmp/out";;
++ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+@@ -19964,20 +19957,20 @@
+ if test x"$ac_file" != x-; then
+ {
+ $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+- } >"$ac_tmp/config.h" \
++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
++ } >"$tmp/config.h" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
++ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+- mv "$ac_tmp/config.h" "$ac_file" \
++ mv "$tmp/config.h" "$ac_file" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
++ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error $? "could not create -" "$LINENO" 5
+ fi
+ # Compute "$ac_file"'s index in $config_headers.
+Index: gnome-control-center-2.91.91/panels/common/Makefile.in
===================================================================
---- gnome-control-center-2.91.90.orig/panels/mouse/Makefile.in 2011-02-24 23:31:54.960327001 +0100
-+++ gnome-control-center-2.91.90/panels/mouse/Makefile.in 2011-02-25 09:18:36.772327001 +0100
-@@ -226,8 +226,6 @@
+--- gnome-control-center-2.91.91.orig/panels/common/Makefile.in 2011-03-10 15:05:32.337656001 +0100
++++ gnome-control-center-2.91.91/panels/common/Makefile.in 2011-03-10 15:05:52.809656002 +0100
+@@ -66,7 +66,8 @@
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(liblanguage_la_LDFLAGS) $(LDFLAGS) -o \
+ $@
+-libshortcuts_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
++libshortcuts_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
+ am_libshortcuts_la_OBJECTS = eggaccelerators.lo
+ libshortcuts_la_OBJECTS = $(am_libshortcuts_la_OBJECTS)
+ libshortcuts_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+@@ -191,6 +192,8 @@
+ LIBLANGUAGE_LIBS = @LIBLANGUAGE_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LIBSHORTCUTS_CFLAGS = @LIBSHORTCUTS_CFLAGS@
++LIBSHORTCUTS_LIBS = @LIBSHORTCUTS_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+@@ -208,8 +211,6 @@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -226,25 +2395,13 @@
NETWORK_PANEL_CFLAGS = @NETWORK_PANEL_CFLAGS@
NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@
NM = @NM@
-@@ -364,7 +362,7 @@
- gsd-input-helper.c \
- gsd-input-helper.h
-
--libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS)
-+libmouse_properties_la_LIBADD = $(PANEL_LIBS) $(MOUSE_PANEL_LIBS) -lX11
- libmouse_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
- pixmapdir = $(pkgdatadir)/pixmaps
- pixmap_DATA = \
-Index: gnome-control-center-2.91.90/panels/keyboard/Makefile.in
-===================================================================
---- gnome-control-center-2.91.90.orig/panels/keyboard/Makefile.in 2011-02-25 09:18:20.192327002 +0100
-+++ gnome-control-center-2.91.90/panels/keyboard/Makefile.in 2011-02-25 09:18:36.628327001 +0100
-@@ -370,7 +370,7 @@
- eggaccelerators.h
-
- libkeyboard_la_CFLAGS = $(PANEL_CFLAGS) $(KEYBOARD_PANEL_CFLAGS)
--libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS)
-+libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS) -lX11
- libkeyboard_la_LDFLAGS = $(PANEL_LDFLAGS)
- uidir = $(pkgdatadir)/ui
- ui_DATA = gnome-keyboard-panel.ui
+@@ -353,7 +354,8 @@
+ eggaccelerators.c
+
+ libshortcuts_la_LIBADD = \
+- $(PANEL_LIBS)
++ $(PANEL_LIBS) \
++ $(LIBSHORTCUTS_LIBS)
+
+ libshortcuts_la_LDFLAGS = $(PANEL_LDFLAGS)
+ all: all-am
Modified: desktop/experimental/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/series?rev=26810&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/series [utf-8] Thu Mar 10 16:58:36 2011
@@ -1,4 +1,3 @@
00_disable-nm.patch
-10_mouse-panel-link.patch
-11_keyboard-panel-link.patch
+10_libshortcuts-link.patch
99_autoreconf.patch
More information about the pkg-gnome-commits
mailing list