r23782 - in /desktop/unstable/gnome-session/debian: changelog patches/03_devicekit_optional.patch patches/10_session_save.patch patches/13_capplet_always_save.patch patches/14_crash_on_exit.patch patches/90_relibtoolize.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Apr 13 21:04:57 UTC 2010
Author: joss
Date: Tue Apr 13 21:04:55 2010
New Revision: 23782
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23782
Log:
* New upstream release.
* Refresh patches.
* 13_capplet_always_save.patch, 14_crash_on_exit.patch: dropped,
merged upstream.
* Pass --libexecdir=/usr/lib, since it will add /gnome-session
already.
Removed:
desktop/unstable/gnome-session/debian/patches/13_capplet_always_save.patch
desktop/unstable/gnome-session/debian/patches/14_crash_on_exit.patch
Modified:
desktop/unstable/gnome-session/debian/changelog
desktop/unstable/gnome-session/debian/patches/03_devicekit_optional.patch
desktop/unstable/gnome-session/debian/patches/10_session_save.patch
desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch
desktop/unstable/gnome-session/debian/patches/series
desktop/unstable/gnome-session/debian/rules
Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=23782&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Tue Apr 13 21:04:55 2010
@@ -1,3 +1,14 @@
+gnome-session (2.30.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Refresh patches.
+ * 13_capplet_always_save.patch, 14_crash_on_exit.patch: dropped,
+ merged upstream.
+ * Pass --libexecdir=/usr/lib, since it will add /gnome-session
+ already.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 13 Apr 2010 22:53:59 +0200
+
gnome-session (2.28.0-7) unstable; urgency=low
* 12_no_gdm_fallback.patch: new patch. Don’t fall back on GDM if
Modified: desktop/unstable/gnome-session/debian/patches/03_devicekit_optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/03_devicekit_optional.patch?rev=23782&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/03_devicekit_optional.patch [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/03_devicekit_optional.patch [utf-8] Tue Apr 13 21:04:55 2010
@@ -1,10 +1,10 @@
Get gnome-session to build on non-Linux architectures.
-Index: gnome-session-2.28.0/configure.in
-===================================================================
---- gnome-session-2.28.0.orig/configure.in 2009-11-06 13:29:48.819681562 +0100
-+++ gnome-session-2.28.0/configure.in 2009-11-06 13:49:50.316182918 +0100
-@@ -53,7 +53,6 @@ PKG_CHECK_MODULES(GNOME_SESSION,
+Index: gnome-session-2.30.0/configure.in
+===================================================================
+--- gnome-session-2.30.0.orig/configure.in 2010-04-13 22:43:48.649245447 +0200
++++ gnome-session-2.30.0/configure.in 2010-04-13 22:43:50.193234971 +0200
+@@ -52,7 +52,6 @@ PKG_CHECK_MODULES(GNOME_SESSION,
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
@@ -12,7 +12,7 @@
)
PKG_CHECK_MODULES(SESSION_PROPERTIES,
-@@ -82,6 +81,22 @@ PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0
+@@ -81,6 +80,22 @@ PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0
dnl ====================================================================
@@ -35,18 +35,18 @@
dnl Option to set the default window manager
dnl ====================================================================
AC_ARG_WITH(default-wm,
-@@ -379,6 +394,7 @@ echo "
- cflags: ${CFLAGS}
+@@ -385,6 +400,7 @@ echo "
Maintainer mode: ${USE_MAINTAINER_MODE}
+ Warn about deprecations: ${enable_deprecations}
+ DeviceKit-Power support: ${have_devkit_power}
Default WM: ${with_default_wm}
- PolicyKit support: ${have_polkit}
- XRender support: ${have_xrender}
-Index: gnome-session-2.28.0/gnome-session/Makefile.am
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/Makefile.am 2009-11-06 13:35:16.084183474 +0100
-+++ gnome-session-2.28.0/gnome-session/Makefile.am 2009-11-06 13:37:38.976181603 +0100
+ IPv6 support: ${have_full_ipv6}
+ Backtrace support: ${have_backtrace}
+Index: gnome-session-2.30.0/gnome-session/Makefile.am
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/Makefile.am 2010-04-13 22:43:48.621243843 +0200
++++ gnome-session-2.30.0/gnome-session/Makefile.am 2010-04-13 22:43:50.193234971 +0200
@@ -15,6 +15,7 @@ INCLUDES = \
$(SM_CFLAGS) \
$(ICE_CFLAGS) \
@@ -63,10 +63,10 @@
$(GCONF_LIBS) \
$(XRENDER_LIBS) \
$(XTEST_LIBS) \
-Index: gnome-session-2.28.0/gnome-session/gsm-logout-dialog.c
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-logout-dialog.c 2009-11-06 13:38:14.095688566 +0100
-+++ gnome-session-2.28.0/gnome-session/gsm-logout-dialog.c 2009-11-06 13:42:10.287680895 +0100
+Index: gnome-session-2.30.0/gnome-session/gsm-logout-dialog.c
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/gsm-logout-dialog.c 2010-04-13 22:43:48.589245081 +0200
++++ gnome-session-2.30.0/gnome-session/gsm-logout-dialog.c 2010-04-13 22:43:50.193234971 +0200
@@ -27,7 +27,9 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
@@ -87,7 +87,7 @@
GsmConsolekit *consolekit;
int timeout;
-@@ -142,7 +146,9 @@ gsm_logout_dialog_init (GsmLogoutDialog
+@@ -142,7 +146,9 @@ gsm_logout_dialog_init (GsmLogoutDialog
gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
gtk_window_stick (GTK_WINDOW (logout_dialog));
@@ -140,10 +140,10 @@
}
static gboolean
-Index: gnome-session-2.28.0/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-manager.c 2009-11-06 13:42:18.671681542 +0100
-+++ gnome-session-2.28.0/gnome-session/gsm-manager.c 2009-11-06 13:48:43.659683204 +0100
+Index: gnome-session-2.30.0/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/gsm-manager.c 2010-04-13 22:43:48.561240543 +0200
++++ gnome-session-2.30.0/gnome-session/gsm-manager.c 2010-04-13 22:43:50.193234971 +0200
@@ -38,7 +38,9 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
@@ -164,7 +164,7 @@
};
enum {
-@@ -971,6 +975,7 @@ manager_perhaps_lock (GsmManager *manage
+@@ -983,6 +987,7 @@ manager_perhaps_lock (GsmManager *manage
static void
manager_attempt_hibernate (GsmManager *manager)
{
@@ -172,7 +172,7 @@
gboolean can_hibernate;
GError *error;
gboolean ret;
-@@ -992,11 +997,15 @@ manager_attempt_hibernate (GsmManager *m
+@@ -1004,11 +1009,15 @@ manager_attempt_hibernate (GsmManager *m
g_error_free (error);
}
}
@@ -188,7 +188,7 @@
gboolean can_suspend;
GError *error;
gboolean ret;
-@@ -1018,6 +1027,9 @@ manager_attempt_suspend (GsmManager *man
+@@ -1030,6 +1039,9 @@ manager_attempt_suspend (GsmManager *man
g_error_free (error);
}
}
@@ -198,7 +198,7 @@
}
static void
-@@ -2190,10 +2202,12 @@ gsm_manager_dispose (GObject *object)
+@@ -2202,10 +2214,12 @@ gsm_manager_dispose (GObject *object)
manager->priv->gconf_client = NULL;
}
@@ -211,7 +211,7 @@
G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
}
-@@ -2423,7 +2437,9 @@ gsm_manager_init (GsmManager *manager)
+@@ -2435,7 +2449,9 @@ gsm_manager_init (GsmManager *manager)
G_CALLBACK (on_presence_status_changed),
manager);
@@ -221,7 +221,7 @@
/* GConf setup */
gconf_client_add_dir (manager->priv->gconf_client,
-@@ -2947,10 +2963,15 @@ gsm_manager_can_shutdown (GsmManager *ma
+@@ -2959,10 +2975,15 @@ gsm_manager_can_shutdown (GsmManager *ma
gboolean can_suspend;
gboolean can_hibernate;
Modified: desktop/unstable/gnome-session/debian/patches/10_session_save.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/10_session_save.patch?rev=23782&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/10_session_save.patch [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/10_session_save.patch [utf-8] Tue Apr 13 21:04:55 2010
@@ -1,10 +1,10 @@
Based on the patch in GNOME #575544
-Index: gnome-session-2.28.0/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-manager.c 2009-09-18 18:36:04.000000000 +0200
-+++ gnome-session-2.28.0/gnome-session/gsm-manager.c 2009-10-24 12:43:56.861770100 +0200
-@@ -68,6 +68,7 @@
+Index: gnome-session-2.30.0/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/gsm-manager.c 2010-04-13 22:43:50.193234971 +0200
++++ gnome-session-2.30.0/gnome-session/gsm-manager.c 2010-04-13 22:45:09.769740854 +0200
+@@ -70,6 +70,7 @@
#define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
#define GSM_MANAGER_PHASE_TIMEOUT 10 /* seconds */
@@ -12,7 +12,7 @@
#define GDM_FLEXISERVER_COMMAND "gdmflexiserver"
#define GDM_FLEXISERVER_ARGS "--startnew Standard"
-@@ -1147,6 +1148,69 @@ query_end_session_complete (GsmManager *
+@@ -1171,6 +1172,69 @@ query_end_session_complete (GsmManager *
}
@@ -82,7 +82,7 @@
static guint32
generate_cookie (void)
{
-@@ -1221,6 +1285,21 @@ _on_query_end_session_timeout (GsmManage
+@@ -1245,6 +1309,21 @@ _on_query_end_session_timeout (GsmManage
return FALSE;
}
@@ -104,7 +104,7 @@
static void
do_phase_query_end_session (GsmManager *manager)
{
-@@ -1857,13 +1936,32 @@ on_client_end_session_response (GsmClien
+@@ -1881,13 +1960,32 @@ on_client_end_session_response (GsmClien
const char *reason,
GsmManager *manager)
{
@@ -139,7 +139,7 @@
if (cancel) {
cancel_end_session (manager);
return;
-@@ -1962,6 +2060,15 @@ on_xsmp_client_logout_request (GsmXSMPCl
+@@ -1986,6 +2084,15 @@ on_xsmp_client_logout_request (GsmXSMPCl
}
static void
@@ -155,7 +155,7 @@
on_store_client_added (GsmStore *store,
const char *id,
GsmManager *manager)
-@@ -1982,6 +2089,10 @@ on_store_client_added (GsmStore *store
+@@ -2006,6 +2113,10 @@ on_store_client_added (GsmStore *store
"logout-request",
G_CALLBACK (on_xsmp_client_logout_request),
manager);
@@ -166,7 +166,7 @@
}
g_signal_connect (client,
-@@ -2939,6 +3050,41 @@ gsm_manager_shutdown (GsmManager *manage
+@@ -2967,6 +3078,41 @@ gsm_manager_shutdown (GsmManager *manage
}
gboolean
@@ -208,10 +208,10 @@
gsm_manager_can_shutdown (GsmManager *manager,
gboolean *shutdown_available,
GError **error)
-Index: gnome-session-2.28.0/gnome-session/gsm-manager.h
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-manager.h 2009-04-19 20:26:52.000000000 +0200
-+++ gnome-session-2.28.0/gnome-session/gsm-manager.h 2009-10-24 12:43:56.861770100 +0200
+Index: gnome-session-2.30.0/gnome-session/gsm-manager.h
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/gsm-manager.h 2010-04-13 22:43:47.605735935 +0200
++++ gnome-session-2.30.0/gnome-session/gsm-manager.h 2010-04-13 22:45:09.773737032 +0200
@@ -152,6 +152,9 @@ gboolean gsm_manager_is_inhib
gboolean gsm_manager_shutdown (GsmManager *manager,
GError **error);
@@ -222,11 +222,11 @@
gboolean gsm_manager_can_shutdown (GsmManager *manager,
gboolean *shutdown_available,
GError **error);
-Index: gnome-session-2.28.0/gnome-session/gsm-xsmp-client.c
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-xsmp-client.c 2009-07-29 02:36:08.000000000 +0200
-+++ gnome-session-2.28.0/gnome-session/gsm-xsmp-client.c 2009-10-24 12:43:56.861770100 +0200
-@@ -70,6 +70,7 @@ enum {
+Index: gnome-session-2.30.0/gnome-session/gsm-xsmp-client.c
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/gsm-xsmp-client.c 2010-04-13 22:43:47.593735178 +0200
++++ gnome-session-2.30.0/gnome-session/gsm-xsmp-client.c 2010-04-13 22:45:09.773737032 +0200
+@@ -69,6 +69,7 @@ enum {
enum {
REGISTER_REQUEST,
LOGOUT_REQUEST,
@@ -234,7 +234,7 @@
LAST_SIGNAL
};
-@@ -523,6 +524,30 @@ xsmp_cancel_end_session (GsmClient *clie
+@@ -502,6 +503,30 @@ xsmp_cancel_end_session (GsmClient *clie
return TRUE;
}
@@ -265,7 +265,7 @@
static char *
get_desktop_file_path (GsmXSMPClient *client)
{
-@@ -993,6 +1018,7 @@ gsm_xsmp_client_class_init (GsmXSMPClien
+@@ -976,6 +1001,7 @@ gsm_xsmp_client_class_init (GsmXSMPClien
object_class->get_property = gsm_xsmp_client_get_property;
object_class->set_property = gsm_xsmp_client_set_property;
@@ -273,10 +273,13 @@
client_class->impl_save = xsmp_save;
client_class->impl_stop = xsmp_stop;
client_class->impl_query_end_session = xsmp_query_end_session;
-@@ -1023,6 +1049,17 @@ gsm_xsmp_client_class_init (GsmXSMPClien
- G_TYPE_NONE,
- 1, G_TYPE_BOOLEAN);
-
+@@ -1003,6 +1029,17 @@ gsm_xsmp_client_class_init (GsmXSMPClien
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
++ G_TYPE_NONE,
++ 1, G_TYPE_BOOLEAN);
++
+ signals[SAVE_REQUEST] =
+ g_signal_new ("save-request",
+ G_OBJECT_CLASS_TYPE (object_class),
@@ -285,16 +288,13 @@
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
-+ G_TYPE_NONE,
-+ 1, G_TYPE_BOOLEAN);
-+
- g_object_class_install_property (object_class,
- PROP_ICE_CONNECTION,
- g_param_spec_pointer ("ice-connection",
-Index: gnome-session-2.28.0/gnome-session/gsm-xsmp-client.h
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-xsmp-client.h 2009-04-19 20:26:52.000000000 +0200
-+++ gnome-session-2.28.0/gnome-session/gsm-xsmp-client.h 2009-10-24 12:43:56.861770100 +0200
+ G_TYPE_NONE,
+ 1, G_TYPE_BOOLEAN);
+
+Index: gnome-session-2.30.0/gnome-session/gsm-xsmp-client.h
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/gsm-xsmp-client.h 2010-04-13 22:43:47.581740287 +0200
++++ gnome-session-2.30.0/gnome-session/gsm-xsmp-client.h 2010-04-13 22:45:09.773737032 +0200
@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass
char **client_id);
gboolean (*logout_request) (GsmXSMPClient *client,
@@ -305,10 +305,10 @@
void (*saved_state) (GsmXSMPClient *client);
-Index: gnome-session-2.28.0/gnome-session/org.gnome.SessionManager.xml
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/org.gnome.SessionManager.xml 2009-04-19 20:26:52.000000000 +0200
-+++ gnome-session-2.28.0/gnome-session/org.gnome.SessionManager.xml 2009-10-24 12:43:56.865763345 +0200
+Index: gnome-session-2.30.0/gnome-session/org.gnome.SessionManager.xml
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/org.gnome.SessionManager.xml 2010-04-13 22:43:47.573736685 +0200
++++ gnome-session-2.30.0/gnome-session/org.gnome.SessionManager.xml 2010-04-13 22:45:09.773737032 +0200
@@ -256,6 +256,14 @@
</doc:doc>
</method>
@@ -324,10 +324,10 @@
<method name="CanShutdown">
<arg name="is_available" direction="out" type="b">
<doc:doc>
-Index: gnome-session-2.28.0/capplet/gsm-properties-dialog.c
-===================================================================
---- gnome-session-2.28.0.orig/capplet/gsm-properties-dialog.c 2009-08-25 10:03:42.000000000 +0200
-+++ gnome-session-2.28.0/capplet/gsm-properties-dialog.c 2009-10-24 13:21:57.910268989 +0200
+Index: gnome-session-2.30.0/capplet/gsm-properties-dialog.c
+===================================================================
+--- gnome-session-2.30.0.orig/capplet/gsm-properties-dialog.c 2010-04-13 22:43:47.513740722 +0200
++++ gnome-session-2.30.0/capplet/gsm-properties-dialog.c 2010-04-13 22:45:09.773737032 +0200
@@ -35,6 +35,12 @@
#include "gsm-util.h"
#include "gsp-app.h"
@@ -415,11 +415,11 @@
}
static void
-Index: gnome-session-2.28.0/configure.in
-===================================================================
---- gnome-session-2.28.0.orig/configure.in 2009-09-09 02:21:06.000000000 +0200
-+++ gnome-session-2.28.0/configure.in 2009-10-24 12:46:15.021757805 +0200
-@@ -59,6 +59,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
+Index: gnome-session-2.30.0/configure.in
+===================================================================
+--- gnome-session-2.30.0.orig/configure.in 2010-04-13 22:43:50.193234971 +0200
++++ gnome-session-2.30.0/configure.in 2010-04-13 22:45:09.773737032 +0200
+@@ -57,6 +57,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
PKG_CHECK_MODULES(SESSION_PROPERTIES,
glib-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
@@ -427,10 +427,10 @@
)
PKG_CHECK_MODULES(SPLASH,
-Index: gnome-session-2.28.0/gnome-session/gsm-client.h
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-client.h 2009-04-19 20:26:52.000000000 +0200
-+++ gnome-session-2.28.0/gnome-session/gsm-client.h 2009-10-24 12:43:56.873765479 +0200
+Index: gnome-session-2.30.0/gnome-session/gsm-client.h
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/gsm-client.h 2010-04-13 22:43:47.561735927 +0200
++++ gnome-session-2.30.0/gnome-session/gsm-client.h 2010-04-13 22:45:09.773737032 +0200
@@ -92,6 +92,9 @@ struct _GsmClientClass
GError **error);
gboolean (*impl_stop) (GsmClient *client,
@@ -451,10 +451,10 @@
GKeyFile *gsm_client_save (GsmClient *client,
GError **error);
/* exported to bus */
-Index: gnome-session-2.28.0/gnome-session/gsm-dbus-client.c
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-dbus-client.c 2009-04-19 20:26:52.000000000 +0200
-+++ gnome-session-2.28.0/gnome-session/gsm-dbus-client.c 2009-10-24 12:43:56.873765479 +0200
+Index: gnome-session-2.30.0/gnome-session/gsm-dbus-client.c
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/gsm-dbus-client.c 2010-04-13 22:43:47.549737125 +0200
++++ gnome-session-2.30.0/gnome-session/gsm-dbus-client.c 2010-04-13 22:45:09.773737032 +0200
@@ -413,6 +413,19 @@ gsm_dbus_client_finalize (GObject *objec
G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
}
@@ -483,10 +483,10 @@
client_class->impl_save = dbus_client_save;
client_class->impl_stop = dbus_client_stop;
client_class->impl_query_end_session = dbus_client_query_end_session;
-Index: gnome-session-2.28.0/gnome-session/gsm-client.c
-===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-client.c 2009-04-19 20:26:52.000000000 +0200
-+++ gnome-session-2.28.0/gnome-session/gsm-client.c 2009-10-24 12:43:56.877763612 +0200
+Index: gnome-session-2.30.0/gnome-session/gsm-client.c
+===================================================================
+--- gnome-session-2.30.0.orig/gnome-session/gsm-client.c 2010-04-13 22:43:47.537738813 +0200
++++ gnome-session-2.30.0/gnome-session/gsm-client.c 2010-04-13 22:45:09.777736633 +0200
@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *clie
g_signal_emit (client, signals[DISCONNECTED], 0);
}
@@ -504,10 +504,10 @@
GKeyFile *
gsm_client_save (GsmClient *client,
GError **error)
-Index: gnome-session-2.28.0/data/session-properties.ui
-===================================================================
---- gnome-session-2.28.0.orig/data/session-properties.ui 2009-10-24 12:55:01.946268673 +0200
-+++ gnome-session-2.28.0/data/session-properties.ui 2009-10-24 12:54:11.638268279 +0200
+Index: gnome-session-2.30.0/data/session-properties.ui
+===================================================================
+--- gnome-session-2.30.0.orig/data/session-properties.ui 2010-04-13 22:43:47.461741519 +0200
++++ gnome-session-2.30.0/data/session-properties.ui 2010-04-13 22:45:09.777736633 +0200
@@ -148,6 +148,7 @@
<property name="visible">True</property>
<child>
Modified: desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch?rev=23782&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch [utf-8] Tue Apr 13 21:04:55 2010
@@ -5,11 +5,11 @@
autoconf
rm -rf autom4te.cache/ config.h.in~
-Index: gnome-session-2.28.0/INSTALL
+Index: gnome-session-2.30.0/INSTALL
===================================================================
---- gnome-session-2.28.0.orig/INSTALL 2009-11-06 13:54:08.535682503 +0100
-+++ gnome-session-2.28.0/INSTALL 2009-11-06 13:58:51.356182603 +0100
-@@ -2,15 +2,15 @@ Installation Instructions
+--- gnome-session-2.30.0.orig/INSTALL 2009-07-21 18:20:22.000000000 +0200
++++ gnome-session-2.30.0/INSTALL 2010-04-13 22:50:53.685239203 +0200
+@@ -2,18 +2,24 @@ Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
@@ -17,8 +17,11 @@
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
-+ This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
+-unlimited permission to copy, distribute and modify it.
++ Copying and distribution of this file, with or without modification,
++are permitted in any medium without royalty provided the copyright
++notice and this notice are preserved. This file is offered as-is,
++without warranty of any kind.
Basic Installation
==================
@@ -27,8 +30,66 @@
+ Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
- instructions specific to this package.
-@@ -73,9 +73,9 @@ The simplest way to compile this package
+-instructions specific to this package.
++instructions specific to this package. Some packages provide this
++`INSTALL' file but do not implement all of the features documented
++below. The lack of an optional feature in a given package is not
++necessarily a bug. More recommendations for GNU packages can be found
++in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The `configure' shell script attempts to guess correct values for
+ various system-dependent variables used during compilation. It uses
+@@ -42,7 +48,7 @@ may remove or edit it.
+ you want to change it or regenerate `configure' using a newer version
+ of `autoconf'.
+
+-The simplest way to compile this package is:
++ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+@@ -53,12 +59,22 @@ The simplest way to compile this package
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+- the package.
++ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+- documentation.
++ documentation. When installing into a prefix owned by root, it is
++ recommended that the package be configured and built as a regular
++ user, and only the `make install' phase executed with root
++ privileges.
++
++ 5. Optionally, type `make installcheck' to repeat any self-tests, but
++ this time using the binaries in their final installed location.
++ This target does not install anything. Running this target as a
++ regular user, particularly if the prior `make install' required
++ root privileges, verifies that the installation completed
++ correctly.
+
+- 5. You can remove the program binaries and object files from the
++ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+@@ -67,15 +83,22 @@ The simplest way to compile this package
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+- 6. Often, you can also type `make uninstall' to remove the installed
+- files again.
++ 7. Often, you can also type `make uninstall' to remove the installed
++ files again. In practice, not all packages have tested that
++ uninstallation works correctly, even though it is required by the
++ GNU Coding Standards.
++
++ 8. Some packages, particularly those that use Automake, provide `make
++ distcheck', which can by used by developers to test that all other
++ targets like `make install' and `make uninstall' work correctly.
++ This target is generally not run by end users.
+
Compilers and Options
=====================
@@ -41,7 +102,7 @@
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
-@@ -88,7 +88,7 @@ is an example:
+@@ -88,25 +111,41 @@ is an example:
Compiling For Multiple Architectures
====================================
@@ -50,7 +111,13 @@
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
-@@ -100,10 +100,24 @@ architecture at a time in the source cod
+ the `configure' script. `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.
++source code in the directory that `configure' is in and in `..'. This
++is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+ architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
@@ -75,20 +142,76 @@
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
- `configure' the option `--prefix=PREFIX'.
-@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
- Optional Features
- =================
-
+-`configure' the option `--prefix=PREFIX'.
++`configure' the option `--prefix=PREFIX', where PREFIX must be an
++absolute file name.
+
+ You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files. If you
+@@ -117,16 +156,47 @@ Documentation and other data files still
+ In addition, if you use an unusual directory layout you can give
+ options like `--bindir=DIR' to specify different values for particular
+ kinds of files. Run `configure --help' for a list of the directories
+-you can set and what kinds of files go in them.
++you can set and what kinds of files go in them. In general, the
++default for these options is expressed in terms of `${prefix}', so that
++specifying just `--prefix' will affect all of the other directory
++specifications that were not explicitly provided.
++
++ The most portable way to affect installation locations is to pass the
++correct locations to `configure'; however, many packages provide one or
++both of the following shortcuts of passing variable assignments to the
++`make install' command line to change installation locations without
++having to reconfigure or recompile.
++
++ The first method involves providing an override variable for each
++affected directory. For example, `make install
++prefix=/alternate/directory' will choose an alternate location for all
++directory configuration variables that were expressed in terms of
++`${prefix}'. Any directories that were specified during `configure',
++but not in terms of `${prefix}', must each be overridden at install
++time for the entire installation to be relocated. The approach of
++makefile variable overrides for each directory variable is required by
++the GNU Coding Standards, and ideally causes no recompilation.
++However, some platforms have known limitations with the semantics of
++shared libraries that end up requiring recompilation when using this
++method, particularly noticeable in packages that use GNU Libtool.
++
++ The second method involves providing the `DESTDIR' variable. For
++example, `make install DESTDIR=/alternate/directory' will prepend
++`/alternate/directory' before all installation names. The approach of
++`DESTDIR' overrides is not required by the GNU Coding Standards, and
++does not work on platforms that have drive letters. On the other hand,
++it does better at avoiding recompilation issues, and works well even
++when some directory options were not specified in terms of `${prefix}'
++at `configure' time.
++
++Optional Features
++=================
+
+ If the package supports it, you can cause programs to be installed
+ with an extra prefix or suffix on their names by giving `configure' the
+ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+-Optional Features
+-=================
+-
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
-@@ -138,14 +152,46 @@ find the X include and library files aut
+@@ -138,14 +208,53 @@ find the X include and library files aut
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
++ Some packages offer the ability to configure how verbose the
++execution of `make' will be. For these packages, running `./configure
++--enable-silent-rules' sets the default to minimal output, which can be
++overridden with `make V=1'; while running `./configure
++--disable-silent-rules' sets the default to verbose, which can be
++overridden with `make V=0'.
++
+Particular systems
+==================
+
@@ -137,7 +260,7 @@
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
-@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical nam
+@@ -153,7 +262,8 @@ type, such as `sun4', or a canonical nam
where SYSTEM can have one of these forms:
@@ -147,7 +270,7 @@
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
-@@ -171,9 +218,9 @@ eventually be run) with `--host=TYPE'.
+@@ -171,9 +281,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
@@ -160,7 +283,7 @@
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
-@@ -182,7 +229,7 @@ A warning: not all `configure' scripts l
+@@ -182,7 +292,7 @@ A warning: not all `configure' scripts l
Defining Variables
==================
@@ -169,7 +292,7 @@
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
-@@ -201,11 +248,19 @@ an Autoconf bug. Until the bug is fixed
+@@ -201,11 +311,19 @@ an Autoconf bug. Until the bug is fixed
`configure' Invocation
======================
@@ -191,12 +314,12 @@
`--version'
`-V'
-@@ -232,6 +287,16 @@ an Autoconf bug. Until the bug is fixed
+@@ -232,6 +350,16 @@ an Autoconf bug. Until the bug is fixed
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
-+ Use DIR as the installation prefix. *Note Installation Names::
++ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
@@ -208,10 +331,16 @@
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-Index: gnome-session-2.28.0/Makefile.in
+Index: gnome-session-2.30.0/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/Makefile.in 2009-11-06 13:54:08.519680678 +0100
-+++ gnome-session-2.28.0/Makefile.in 2009-11-06 13:58:51.424178250 +0100
+--- gnome-session-2.30.0.orig/Makefile.in 2010-03-30 02:04:30.000000000 +0200
++++ gnome-session-2.30.0/Makefile.in 2010-04-13 22:50:53.749234283 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -139,6 +139,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -229,7 +358,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -225,6 +228,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -206,6 +209,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -237,18 +366,74 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/aclocal.m4
+@@ -382,7 +386,7 @@ distclean-libtool:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -407,7 +411,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -571,7 +575,8 @@ distdir: $(DISTFILES)
+ fi; \
+ done
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -614,17 +619,17 @@ dist dist-all: distdir
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+Index: gnome-session-2.30.0/aclocal.m4
===================================================================
---- gnome-session-2.28.0.orig/aclocal.m4 2009-11-06 13:54:08.503680319 +0100
-+++ gnome-session-2.28.0/aclocal.m4 2009-11-06 13:58:48.219681811 +0100
+--- gnome-session-2.30.0.orig/aclocal.m4 2010-03-30 02:04:23.000000000 +0200
++++ gnome-session-2.30.0/aclocal.m4 2010-04-13 22:50:50.373239503 +0200
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,1866 +13,1869 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-+[m4_warning([this file was generated for autoconf 2.64.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -502,17 +687,15 @@
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
--
++AC_SUBST($1)dnl
++])
+
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+AC_SUBST($1)dnl
-+])
-
--# serial 10
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
@@ -520,16 +703,21 @@
+ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
+-# serial 10
++ gt_cv_have_gettext=no
+
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+ gt_cv_have_gettext=no
-
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
+
++ AC_CHECK_HEADER(libintl.h,
++ [gt_cv_func_dgettext_libintl="no"
++ libintl_extra_libs=""
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
@@ -546,16 +734,84 @@
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-+ AC_CHECK_HEADER(libintl.h,
-+ [gt_cv_func_dgettext_libintl="no"
-+ libintl_extra_libs=""
-
+-
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+-
+-AC_CACHE_CHECK([dependency style of $depcc],
+- [am_cv_$1_dependencies_compiler_type],
+-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+- # We make a subdir and do the tests there. Otherwise we can end up
+- # making bogus files that we don't know about and never remove. For
+- # instance it was reported that on HP-UX the gcc test will end up
+- # making a dummy file named `D' -- because `-MD' means `put the output
+- # in D'.
+- mkdir conftest.dir
+- # Copy depcomp to subdir because otherwise we won't find it if we're
+- # using a relative directory.
+- cp "$am_depcomp" conftest.dir
+- cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+-
+- am_cv_$1_dependencies_compiler_type=none
+- if test "$am_compiler_list" = ""; then
+- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+- fi
+- am__universal=false
+- m4_case([$1], [CC],
+- [case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac],
+- [CXX],
+- [case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac])
+-
+- for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+- # We need to recreate these files for each test, as the compiler may
+- # overwrite some of them when testing with obscure command lines.
+- # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+-
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this. Also, some Intel
+- # versions had trouble with output in subdirs
+- am__obj=sub/conftest.${OBJEXT-o}
+- am__minus_obj="-o $am__obj"
+- case $depmode in
+- gcc)
+- # This depmode causes a compiler race in universal mode.
+- test "$am__universal" = false || continue
+- ;;
+- nosideeffect)
+- # after this tag, mechanisms are not by side-effect, so they'll
+- # only be used when explicitly requested
+- if test "x$enable_dependency_tracking" = xyes; then
+- continue
+- else
+- break
+ #
+ # First check in libc
+ #
@@ -577,123 +833,6 @@
+ gt_cv_func_dgettext_libc=yes,
+ gt_cv_func_dgettext_libc=no)
+ ])
-+ fi
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ fi
-
--AC_CACHE_CHECK([dependency style of $depcc],
-- [am_cv_$1_dependencies_compiler_type],
--[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-- # We make a subdir and do the tests there. Otherwise we can end up
-- # making bogus files that we don't know about and never remove. For
-- # instance it was reported that on HP-UX the gcc test will end up
-- # making a dummy file named `D' -- because `-MD' means `put the output
-- # in D'.
-- mkdir conftest.dir
-- # Copy depcomp to subdir because otherwise we won't find it if we're
-- # using a relative directory.
-- cp "$am_depcomp" conftest.dir
-- cd conftest.dir
-- # We will build objects and dependencies in a subdirectory because
-- # it helps to detect inapplicable dependency modes. For instance
-- # both Tru64's cc and ICC support -MD to output dependencies as a
-- # side effect of compilation, but ICC will put the dependencies in
-- # the current directory while Tru64 will put them in the object
-- # directory.
-- mkdir sub
-+ #
-+ # If we don't have everything we want, check in libintl
-+ #
-+ if test "$gt_cv_func_dgettext_libc" != "yes" \
-+ || test "$gt_cv_func_ngettext_libc" != "yes" \
-+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-+
-+ AC_CHECK_LIB(intl, bindtextdomain,
-+ [AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dgettext,
-+ gt_cv_func_dgettext_libintl=yes)])])
-
-- am_cv_$1_dependencies_compiler_type=none
-- if test "$am_compiler_list" = ""; then
-- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-- fi
-- am__universal=false
-- m4_case([$1], [CC],
-- [case " $depcc " in #(
-- *\ -arch\ *\ -arch\ *) am__universal=true ;;
-- esac],
-- [CXX],
-- [case " $depcc " in #(
-- *\ -arch\ *\ -arch\ *) am__universal=true ;;
-- esac])
-+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+ AC_MSG_RESULT([])
-+ AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dcgettext,
-+ [gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv],
-+ :,-liconv)],
-+ :,-liconv)
-+ fi
-
-- for depmode in $am_compiler_list; do
-- # Setup a source with many dependencies, because some compilers
-- # like to wrap large dependency lists on column 80 (with \), and
-- # we should not choose a depcomp mode which is confused by this.
-- #
-- # We need to recreate these files for each test, as the compiler may
-- # overwrite some of them when testing with obscure command lines.
-- # This happens at least with the AIX C compiler.
-- : > sub/conftest.c
-- for i in 1 2 3 4 5 6; do
-- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-- touch sub/conftst$i.h
-- done
-- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ #
-+ # If we found libintl, then check in it for bind_textdomain_codeset();
-+ # we'll prefer libc if neither have bind_textdomain_codeset(),
-+ # and both have dgettext and ngettext
-+ #
-+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS -lintl $libintl_extra_libs"
-+ unset ac_cv_func_bind_textdomain_codeset
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ LIBS="$glib_save_LIBS"
-
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this. Also, some Intel
-- # versions had trouble with output in subdirs
-- am__obj=sub/conftest.${OBJEXT-o}
-- am__minus_obj="-o $am__obj"
-- case $depmode in
-- gcc)
-- # This depmode causes a compiler race in universal mode.
-- test "$am__universal" = false || continue
-- ;;
-- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-- if test "x$enable_dependency_tracking" = xyes; then
-- continue
-- else
-- break
-+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-+ gt_cv_func_dgettext_libc=no
-+ else
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
-+ gt_cv_func_dgettext_libintl=no
-+ fi
-+ fi
-+ fi
fi
- ;;
- msvisualcpp | msvcmsys)
@@ -725,7 +864,103 @@
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
-+
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ fi
+- fi
+- done
+-
+- cd ..
+- rm -rf conftest.dir
+-else
+- am_cv_$1_dependencies_compiler_type=none
+-fi
+-])
+-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+-AM_CONDITIONAL([am__fastdep$1], [
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+-])
+-
+-
+-# AM_SET_DEPDIR
+-# -------------
+-# Choose a directory name for dependency files.
+-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+-AC_DEFUN([AM_SET_DEPDIR],
+-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+-])
+
++ #
++ # If we don't have everything we want, check in libintl
++ #
++ if test "$gt_cv_func_dgettext_libc" != "yes" \
++ || test "$gt_cv_func_ngettext_libc" != "yes" \
++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++
++ AC_CHECK_LIB(intl, bindtextdomain,
++ [AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dgettext,
++ gt_cv_func_dgettext_libintl=yes)])])
+
+-# AM_DEP_TRACK
+-# ------------
+-AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE(dependency-tracking,
+-[ --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors])
+-if test "x$enable_dependency_tracking" != xno; then
+- am_depcomp="$ac_aux_dir/depcomp"
+- AMDEPBACKSLASH='\'
+-fi
+-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])dnl
+-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+-])
++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++ AC_MSG_CHECKING([if -liconv is needed to use gettext])
++ AC_MSG_RESULT([])
++ AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dcgettext,
++ [gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv],
++ :,-liconv)],
++ :,-liconv)
++ fi
+
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
++ #
++ # If we found libintl, then check in it for bind_textdomain_codeset();
++ # we'll prefer libc if neither have bind_textdomain_codeset(),
++ # and both have dgettext and ngettext
++ #
++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $libintl_extra_libs"
++ unset ac_cv_func_bind_textdomain_codeset
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ LIBS="$glib_save_LIBS"
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++ gt_cv_func_dgettext_libc=no
++ else
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ && test "$gt_cv_func_ngettext_libc" = "yes"; then
++ gt_cv_func_dgettext_libintl=no
++ fi
++ fi
++ fi
++ fi
+
+-#serial 5
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+ gt_cv_have_gettext=yes
@@ -733,7 +968,7 @@
+
+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+ INTLLIBS="-lintl $libintl_extra_libs"
- fi
++ fi
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+ AC_DEFINE(HAVE_GETTEXT,1,
@@ -790,24 +1025,65 @@
+ fi
+ fi
+ ])
-+
+
+-# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-# ------------------------------
+-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[{
+- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+- # are listed without --file. Let's play safe and only enable the eval
+- # if we detect the quoting.
+- case $CONFIG_FILES in
+- *\'*) eval set x "$CONFIG_FILES" ;;
+- *) set x $CONFIG_FILES ;;
+- esac
+- shift
+- for mf
+- do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
+- else
+- continue
+ if test "$gt_cv_have_gettext" = "yes" ; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [always defined to indicate that i18n is enabled])
fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
- done
-
-- cd ..
-- rm -rf conftest.dir
--else
-- am_cv_$1_dependencies_compiler_type=none
--fi
--])
--AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
--AM_CONDITIONAL([am__fastdep$1], [
-- test "x$enable_dependency_tracking" != xno \
-- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
--])
+-}
+-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is not GNU xgettext we define it as : so that the
@@ -821,22 +1097,33 @@
+ fi
+ fi
+-# AM_OUTPUT_DEPENDENCY_COMMANDS
+-# -----------------------------
+-# This macro should only be invoked once -- use via AC_REQUIRE.
+-#
+-# This code is only required when automatic dependency tracking
+-# is enabled. FIXME. This creates each `.P' file that we will
+-# need in order to bootstrap the dependency handling code.
+-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[AC_CONFIG_COMMANDS([depfiles],
+- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+-])
+ # We need to process the po/ directory.
+ POSUB=po
--# AM_SET_DEPDIR
--# -------------
--# Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
--AC_DEFUN([AM_SET_DEPDIR],
--[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
--])
+-# Do all the work for Automake. -*- Autoconf -*-
+ AC_OUTPUT_COMMANDS(
+ [case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac])
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+ dnl in configure.in.
@@ -845,20 +1132,7 @@
+ POFILES="$POFILES $lang.po"
+ done
--# AM_DEP_TRACK
--# ------------
--AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[ --disable-dependency-tracking speeds up one-time build
-- --enable-dependency-tracking do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
-- am_depcomp="$ac_aux_dir/depcomp"
-- AMDEPBACKSLASH='\'
--fi
--AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])dnl
--_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
--])
+-# serial 16
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
@@ -872,7 +1146,8 @@
+ AC_SUBST(POSUB)
+ ])
--# Generate code to set up dependency tracking. -*- Autoconf -*-
+-# This macro actually does too much. Some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation
@@ -890,12 +1165,33 @@
+ GLIB_LC_MESSAGES
+ GLIB_WITH_NLS
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out. PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition. After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.62])dnl
+-dnl Autoconf wants to disallow AM_ names. We explicitly allow
+-dnl the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])dnl
+-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+- # is not polluted with repeated "-I."
+- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+- # test to see if srcdir already configured
+- if test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+- fi
+-fi
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
@@ -927,67 +1223,33 @@
+ AC_MSG_RESULT($LINGUAS)
+ fi
--#serial 5
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
+- else
+- CYGPATH_W=echo
+- fi
+-fi
+-AC_SUBST([CYGPATH_W])
+ dnl Construct list of names of catalog files to be constructed.
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
--# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# ------------------------------
--AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[{
-- # Autoconf 2.62 quotes --file arguments for eval, but not when files
-- # are listed without --file. Let's play safe and only enable the eval
-- # if we detect the quoting.
-- case $CONFIG_FILES in
-- *\'*) eval set x "$CONFIG_FILES" ;;
-- *) set x $CONFIG_FILES ;;
-- esac
-- shift
-- for mf
-- do
-- # Strip MF so we end up with the name of the file.
-- mf=`echo "$mf" | sed -e 's/:.*$//'`
-- # Check whether this is an Automake generated Makefile or not.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # Grep'ing the whole file is not good either: AIX grep has a line
-- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-- dirpart=`AS_DIRNAME("$mf")`
-- else
-- continue
-- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-- test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-- # Make sure the directory exists.
-- test -f "$dirpart/$file" && continue
-- fdir=`AS_DIRNAME(["$file"])`
-- AS_MKDIR_P([$dirpart/$fdir])
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-- done
-- done
--}
--])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
@@ -1000,6 +1262,9 @@
+ fi
+ AC_SUBST(MKINSTALLDIRS)
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
@@ -1016,145 +1281,6 @@
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+ ])
-
--# AM_OUTPUT_DEPENDENCY_COMMANDS
--# -----------------------------
--# This macro should only be invoked once -- use via AC_REQUIRE.
--#
--# This code is only required when automatic dependency tracking
--# is enabled. FIXME. This creates each `.P' file that we will
--# need in order to bootstrap the dependency handling code.
--AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
--[AC_CONFIG_COMMANDS([depfiles],
-- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-+# -------------------------------
-+# Define VARIABLE to the location where catalog files will
-+# be installed by po/Makefile.
-+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-+glib_save_prefix="$prefix"
-+glib_save_exec_prefix="$exec_prefix"
-+glib_save_datarootdir="$datarootdir"
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-+datarootdir=`eval echo "${datarootdir}"`
-+if test "x$CATOBJEXT" = "x.mo" ; then
-+ localedir=`eval echo "${libdir}/locale"`
-+else
-+ localedir=`eval echo "${datadir}/locale"`
-+fi
-+prefix="$glib_save_prefix"
-+exec_prefix="$glib_save_exec_prefix"
-+datarootdir="$glib_save_datarootdir"
-+AC_DEFINE_UNQUOTED($1, "$localedir",
-+ [Define the location where the catalogs will be installed])
- ])
-
--# Do all the work for Automake. -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl Now the definitions that aclocal will find
-+dnl
-+ifdef(glib_configure_in,[],[
-+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-+])dnl
-
--# serial 16
-+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-+#
-+# Create a temporary file with TEST-FILE as its contents and pass the
-+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
-+# 0 and perform ACTION-IF-FAIL for any other exit status.
-+AC_DEFUN([GLIB_RUN_PROG],
-+[cat >conftest.foo <<_ACEOF
-+$2
-+_ACEOF
-+if AC_RUN_LOG([$1 conftest.foo]); then
-+ m4_ifval([$3], [$3], [:])
-+m4_ifvaln([$4], [else $4])dnl
-+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-+fi])
-
--# This macro actually does too much. Some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
-
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out. PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition. After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.62])dnl
--dnl Autoconf wants to disallow AM_ names. We explicitly allow
--dnl the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
--AC_REQUIRE([AC_PROG_INSTALL])dnl
--if test "`cd $srcdir && pwd`" != "`pwd`"; then
-- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-- # is not polluted with repeated "-I."
-- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-- # test to see if srcdir already configured
-- if test -f $srcdir/config.status; then
-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-- fi
--fi
-+# gnome-common.m4
-+#
-
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
-- if (cygpath --version) >/dev/null 2>/dev/null; then
-- CYGPATH_W='cygpath -w'
-- else
-- CYGPATH_W=echo
-- fi
--fi
--AC_SUBST([CYGPATH_W])
-+dnl GNOME_COMMON_INIT
-
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
--dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
--m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+AC_DEFUN([GNOME_COMMON_INIT],
-+[
-+ dnl this macro should come after AC_CONFIG_MACRO_DIR
-+ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+ dnl ensure that when the Automake generated makefile calls aclocal,
-+ dnl it honours the $ACLOCAL_FLAGS environment variable
-+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-+ if test -n "$ac_macro_dir"; then
-+ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
-+ fi
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
@@ -1196,7 +1322,28 @@
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-+ AC_SUBST([ACLOCAL_AMFLAGS])
++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
++# -------------------------------
++# Define VARIABLE to the location where catalog files will
++# be installed by po/Makefile.
++glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
++glib_save_prefix="$prefix"
++glib_save_exec_prefix="$exec_prefix"
++glib_save_datarootdir="$datarootdir"
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++datarootdir=`eval echo "${datarootdir}"`
++if test "x$CATOBJEXT" = "x.mo" ; then
++ localedir=`eval echo "${libdir}/locale"`
++else
++ localedir=`eval echo "${datadir}/locale"`
++fi
++prefix="$glib_save_prefix"
++exec_prefix="$glib_save_exec_prefix"
++datarootdir="$glib_save_datarootdir"
++AC_DEFINE_UNQUOTED($1, "$localedir",
++ [Define the location where the catalogs will be installed])
])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
@@ -1204,28 +1351,33 @@
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-+AC_DEFUN([GNOME_DEBUG_CHECK],
-+[
-+ AC_ARG_ENABLE([debug],
-+ AC_HELP_STRING([--enable-debug],
-+ [turn on debugging]),,
-+ [enable_debug=no])
-
-+ if test x$enable_debug = xyes ; then
-+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-+ [Enable additional debugging at the expense of performance and size])
-+ fi
-+])
++dnl
++dnl Now the definitions that aclocal will find
++dnl
++ifdef(glib_configure_in,[],[
++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
++])dnl
+
++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
++#
++# Create a temporary file with TEST-FILE as its contents and pass the
++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
++# 0 and perform ACTION-IF-FAIL for any other exit status.
++AC_DEFUN([GLIB_RUN_PROG],
++[cat >conftest.foo <<_ACEOF
++$2
++_ACEOF
++if AC_RUN_LOG([$1 conftest.foo]); then
++ m4_ifval([$3], [$3], [:])
++m4_ifvaln([$4], [else $4])dnl
++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
++fi])
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-+dnl GNOME_MAINTAINER_MODE_DEFINES ()
-+dnl define DISABLE_DEPRECATED
-+dnl
-+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
-+[
-+ AC_REQUIRE([AM_MAINTAINER_MODE])
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
@@ -1243,21 +1395,15 @@
- esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+ DISABLE_DEPRECATED=""
-+ if test $USE_MAINTAINER_MODE = yes; then
-+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
-+ for DOMAIN in $DOMAINS; do
-+ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-+ done
-+ fi
++# gnome-common.m4
++#
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+ AC_SUBST(DISABLE_DEPRECATED)
-+])
++dnl GNOME_COMMON_INIT
-# AM_PROG_INSTALL_SH
-# ------------------
@@ -1273,29 +1419,26 @@
- esac
-fi
-AC_SUBST(install_sh)])
-+dnl GNOME_COMPILE_WARNINGS
-+dnl Turn on many useful compiler warnings
-+dnl For now, only works on GCC
-+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-+ dnl ******************************
-+ dnl More compiler warnings
-+ dnl ******************************
++AC_DEFUN([GNOME_COMMON_INIT],
++[
++ dnl this macro should come after AC_CONFIG_MACRO_DIR
++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+ AC_ARG_ENABLE(compile-warnings,
-+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-+ [Turn on compiler warnings]),,
-+ [enable_compile_warnings="m4_default([$1],[yes])"])
++ dnl ensure that when the Automake generated makefile calls aclocal,
++ dnl it honours the $ACLOCAL_FLAGS environment variable
++ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
++ if test -n "$ac_macro_dir"; then
++ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
++ fi
-# serial 2
-+ warnCFLAGS=
-+ if test "x$GCC" != xyes; then
-+ enable_compile_warnings=no
-+ fi
++ AC_SUBST([ACLOCAL_AMFLAGS])
++])
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
@@ -1309,11 +1452,100 @@
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
++AC_DEFUN([GNOME_DEBUG_CHECK],
++[
++ AC_ARG_ENABLE([debug],
++ AC_HELP_STRING([--enable-debug],
++ [turn on debugging]),,
++ [enable_debug=no])
++
++ if test x$enable_debug = xyes ; then
++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
++ [Enable additional debugging at the expense of performance and size])
++ fi
++])
+
+-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+-# From Jim Meyering
++dnl GNOME_MAINTAINER_MODE_DEFINES ()
++dnl define DISABLE_DEPRECATED
++dnl
++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
++[
++ AC_REQUIRE([AM_MAINTAINER_MODE])
+
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ DISABLE_DEPRECATED=""
++ if test $USE_MAINTAINER_MODE = yes; then
++ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
++ for DOMAIN in $DOMAINS; do
++ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
++ done
++ fi
+
+-# serial 5
++ AC_SUBST(DISABLE_DEPRECATED)
++])
+
+-# AM_MAINTAINER_MODE([DEFAULT-MODE])
+-# ----------------------------------
+-# Control maintainer-specific portions of Makefiles.
+-# Default is to disable them, unless `enable' is passed literally.
+-# For symmetry, `disable' may be passed as well. Anyway, the user
+-# can override the default with the --enable/--disable switch.
+-AC_DEFUN([AM_MAINTAINER_MODE],
+-[m4_case(m4_default([$1], [disable]),
+- [enable], [m4_define([am_maintainer_other], [disable])],
+- [disable], [m4_define([am_maintainer_other], [enable])],
+- [m4_define([am_maintainer_other], [enable])
+- m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+- AC_ARG_ENABLE([maintainer-mode],
+-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
+- (and sometimes confusing) to the casual installer],
+- [USE_MAINTAINER_MODE=$enableval],
+- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+- MAINT=$MAINTAINER_MODE_TRUE
+- AC_SUBST([MAINT])dnl
+-]
+-)
++dnl GNOME_COMPILE_WARNINGS
++dnl Turn on many useful compiler warnings
++dnl For now, only works on GCC
++AC_DEFUN([GNOME_COMPILE_WARNINGS],[
++ dnl ******************************
++ dnl More compiler warnings
++ dnl ******************************
+
+-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++ AC_ARG_ENABLE(compile-warnings,
++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
++ [Turn on compiler warnings]),,
++ [enable_compile_warnings="m4_default([$1],[yes])"])
+
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
++ warnCFLAGS=
++ if test "x$GCC" != xyes; then
++ enable_compile_warnings=no
++ fi
+
+-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ warning_flags=
+ realsave_CFLAGS="$CFLAGS"
--# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
--# From Jim Meyering
+-# serial 4
+ case "$enable_compile_warnings" in
+ no)
+ warning_flags=
@@ -1355,100 +1587,6 @@
+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+ AC_MSG_RESULT($warning_flags)
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ AC_ARG_ENABLE(iso-c,
-+ AC_HELP_STRING([--enable-iso-c],
-+ [Try to warn if code is not ISO C ]),,
-+ [enable_iso_c=no])
-
--# serial 5
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-+ complCFLAGS=
-+ if test "x$enable_iso_c" != "xno"; then
-+ if test "x$GCC" = "xyes"; then
-+ case " $CFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCFLAGS="$complCFLAGS -ansi" ;;
-+ esac
-+ case " $CFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
-+ AC_MSG_RESULT($complCFLAGS)
-
--# AM_MAINTAINER_MODE([DEFAULT-MODE])
--# ----------------------------------
--# Control maintainer-specific portions of Makefiles.
--# Default is to disable them, unless `enable' is passed literally.
--# For symmetry, `disable' may be passed as well. Anyway, the user
--# can override the default with the --enable/--disable switch.
--AC_DEFUN([AM_MAINTAINER_MODE],
--[m4_case(m4_default([$1], [disable]),
-- [enable], [m4_define([am_maintainer_other], [disable])],
-- [disable], [m4_define([am_maintainer_other], [enable])],
-- [m4_define([am_maintainer_other], [enable])
-- m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
--AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
-- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-- AC_ARG_ENABLE([maintainer-mode],
--[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
-- (and sometimes confusing) to the casual installer],
-- [USE_MAINTAINER_MODE=$enableval],
-- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-- MAINT=$MAINTAINER_MODE_TRUE
-- AC_SUBST([MAINT])dnl
--]
--)
-+ WARN_CFLAGS="$warning_flags $complCFLAGS"
-+ AC_SUBST(WARN_CFLAGS)
-+])
-
--AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+dnl For C++, do basically the same thing.
-
--# Check to see how 'make' treats includes. -*- Autoconf -*-
-+AC_DEFUN([GNOME_CXX_WARNINGS],[
-+ AC_ARG_ENABLE(cxx-warnings,
-+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-+ [Turn on compiler warnings.]),,
-+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
--# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-+ warnCXXFLAGS=
-+ if test "x$GXX" != xyes; then
-+ enable_cxx_warnings=no
-+ fi
-+ if test "x$enable_cxx_warnings" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-Wall[\ \ ]*) ;;
-+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-+ esac
-
--# serial 4
-+ ## -W is not all that useful. And it cannot be controlled
-+ ## with individual -Wno-xxx flags, unlike -Wall
-+ if test "x$enable_cxx_warnings" = "xyes"; then
-+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-+ fi
-+ fi
-+ fi
-+ AC_MSG_RESULT($warnCXXFLAGS)
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
@@ -1489,21 +1627,33 @@
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
--])
-+ AC_ARG_ENABLE(iso-cxx,
-+ AC_HELP_STRING([--enable-iso-cxx],
-+ [Try to warn if code is not ISO C++ ]),,
-+ [enable_iso_cxx=no])
++ AC_ARG_ENABLE(iso-c,
++ AC_HELP_STRING([--enable-iso-c],
++ [Try to warn if code is not ISO C ]),,
++ [enable_iso_c=no])
++
++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
++ complCFLAGS=
++ if test "x$enable_iso_c" != "xno"; then
++ if test "x$GCC" = "xyes"; then
++ case " $CFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -ansi" ;;
++ esac
++ case " $CFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCFLAGS)
++
++ WARN_CFLAGS="$warning_flags $complCFLAGS"
++ AC_SUBST(WARN_CFLAGS)
+ ])
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-+ complCXXFLAGS=
-+ if test "x$enable_iso_cxx" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-+ esac
++dnl For C++, do basically the same thing.
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
@@ -1511,18 +1661,24 @@
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
++AC_DEFUN([GNOME_CXX_WARNINGS],[
++ AC_ARG_ENABLE(cxx-warnings,
++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
++ [Turn on compiler warnings.]),,
++ [enable_cxx_warnings="m4_default([$1],[minimum])"])
+
+-# serial 6
++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
++ warnCXXFLAGS=
++ if test "x$GXX" != xyes; then
++ enable_cxx_warnings=no
++ fi
++ if test "x$enable_cxx_warnings" != "xno"; then
++ if test "x$GXX" = "xyes"; then
+ case " $CXXFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
++ *[\ \ ]-Wall[\ \ ]*) ;;
++ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+ esac
-+ fi
-+ fi
-+ AC_MSG_RESULT($complCXXFLAGS)
-
--# serial 6
-+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-+ AC_SUBST(WARN_CXXFLAGS)
-+])
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
@@ -1530,37 +1686,19 @@
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-+# nls.m4 serial 3 (gettext-0.15)
-+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-+dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-+
-+AC_PREREQ(2.50)
-
-+AC_DEFUN([AM_NLS],
-+[
-+ AC_MSG_CHECKING([whether NLS is requested])
-+ dnl Default is enabled NLS
-+ AC_ARG_ENABLE(nls,
-+ [ --disable-nls do not use Native Language Support],
-+ USE_NLS=$enableval, USE_NLS=yes)
-+ AC_MSG_RESULT($USE_NLS)
-+ AC_SUBST(USE_NLS)
-+])
++ ## -W is not all that useful. And it cannot be controlled
++ ## with individual -Wno-xxx flags, unlike -Wall
++ if test "x$enable_cxx_warnings" = "xyes"; then
++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
++ fi
++ fi
++ fi
++ AC_MSG_RESULT($warnCXXFLAGS)
+
++ AC_ARG_ENABLE(iso-cxx,
++ AC_HELP_STRING([--enable-iso-cxx],
++ [Try to warn if code is not ISO C++ ]),,
++ [enable_iso_cxx=no])
-# AM_MISSING_HAS_RUN
-# ------------------
@@ -1583,74 +1721,47 @@
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+#
-+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
+-fi
++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
++ complCXXFLAGS=
++ if test "x$enable_iso_cxx" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
++ esac
+
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
- fi
--])
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
++ case " $CXXFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCXXFLAGS)
++
++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
++ AC_SUBST(WARN_CXXFLAGS)
+ ])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
- #
+-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+# Check to see whether a particular set of modules exists. Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-+#
-+#
-+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-+# this or PKG_CHECK_MODULES is called, or make sure to call
-+# PKG_CHECK_EXISTS manually
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_ifval([$2], [$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
++# nls.m4 serial 3 (gettext-0.15)
++dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
-# AM_PROG_MKDIR_P
-# ---------------
@@ -1671,8 +1782,108 @@
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
++dnl Authors:
++dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
++dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-# Helper functions for option handling. -*- Autoconf -*-
++AC_PREREQ(2.50)
+
+-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
++AC_DEFUN([AM_NLS],
++[
++ AC_MSG_CHECKING([whether NLS is requested])
++ dnl Default is enabled NLS
++ AC_ARG_ENABLE(nls,
++ [ --disable-nls do not use Native Language Support],
++ USE_NLS=$enableval, USE_NLS=yes)
++ AC_MSG_RESULT($USE_NLS)
++ AC_SUBST(USE_NLS)
++])
++
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+ #
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
+
+-# serial 4
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
+
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
+
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME. Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# OPTIONS is a space-separated list of Automake options.
+-AC_DEFUN([_AM_SET_OPTIONS],
+-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
@@ -1689,11 +1900,11 @@
+fi[]dnl
+])# _PKG_CONFIG
--# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
@@ -1705,15 +1916,16 @@
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
--# serial 4
-
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+-# Free Software Foundation, Inc.
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
-+#
+ #
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
@@ -1726,53 +1938,9 @@
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME. Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+-# serial 5
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
-
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-
--# Check to make sure that the build environment is sane. -*- Autoconf -*-
-+if test $pkg_failed = yes; then
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
-
--# serial 5
-+$$1_PKG_ERRORS
-# AM_SANITY_CHECK
-# ---------------
@@ -1793,8 +1961,8 @@
- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
@@ -1810,15 +1978,9 @@
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+_PKG_TEXT
-+])],
-+ [AC_MSG_RESULT([no])
-+ $4])
-+elif test $pkg_failed = untried; then
-+ ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[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.
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -1827,36 +1989,40 @@
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-+_PKG_TEXT
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-+ [$4])
- else
+-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
-# Copyright (C) 2009 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++$$1_PKG_ERRORS
-# serial 1
--
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
@@ -1874,30 +2040,23 @@
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.11'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.11], [],
-+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
+-])
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[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.
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
++_PKG_TEXT
-# AM_PROG_INSTALL_STRIP
-# ---------------------
@@ -1920,19 +2079,67 @@
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
+
+-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 2
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.11'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version. Point them to the right macro.
++m4_if([$1], [1.11.1], [],
++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++])
+
+-# _AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+-# This macro is traced by Automake.
+-AC_DEFUN([_AM_SUBST_NOTMAKE])
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too. Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
+
+-# AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Public sister of _AM_SUBST_NOTMAKE.
+-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+-# Check how to create a tarball. -*- Autoconf -*-
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-+
+
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -1941,15 +2148,18 @@
-# serial 2
-
--# _AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
--# This macro is traced by Automake.
--AC_DEFUN([_AM_SUBST_NOTMAKE])
+-# _AM_PROG_TAR(FORMAT)
+-# --------------------
+-# Check how to create a tarball in format FORMAT.
+-# FORMAT should be one of `v7', `ustar', or `pax'.
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
+ #
+-# Substitute a variable $(am__tar) that is a command
+-# writing to stdout a FORMAT-tarball containing the directory
+-# $tardir.
+-# tardir=directory && $(am__tar) > result.tar
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
@@ -1957,67 +2167,7 @@
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+# fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+# fails if $ac_aux_dir is absolute,
-+# fails when called from a subdirectory in a VPATH build with
-+# a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir. In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+# MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH. The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-
--# AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Public sister of _AM_SUBST_NOTMAKE.
--AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-
--# Check how to create a tarball. -*- Autoconf -*-
-+# AM_CONDITIONAL -*- Autoconf -*-
-
--# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-+# Free Software Foundation, Inc.
#
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 2
--
--# _AM_PROG_TAR(FORMAT)
--# --------------------
--# Check how to create a tarball in format FORMAT.
--# FORMAT should be one of `v7', `ustar', or `pax'.
--#
--# Substitute a variable $(am__tar) that is a command
--# writing to stdout a FORMAT-tarball containing the directory
--# $tardir.
--# tardir=directory && $(am__tar) > result.tar
--#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-# $(am__untar) < result.tar
@@ -2070,11 +2220,42 @@
- am__untar=false
- ;;
- esac
--
++# $ac_aux_dir/missing
++# fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++# fails if $ac_aux_dir is absolute,
++# fails when called from a subdirectory in a VPATH build with
++# a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir. In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++# MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH. The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
+
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
--
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
+
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
@@ -2087,13 +2268,20 @@
- fi
-done
-rm -rf conftest.dir
--
++# AM_CONDITIONAL -*- Autoconf -*-
+
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
--
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl (i.e. pass to gconftool-2
@@ -3759,10 +3947,16 @@
m4_include([m4/intltool.m4])
m4_include([m4/libtool.m4])
-Index: gnome-session-2.28.0/capplet/Makefile.in
+Index: gnome-session-2.30.0/capplet/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/capplet/Makefile.in 2009-11-06 13:54:08.491683473 +0100
-+++ gnome-session-2.28.0/capplet/Makefile.in 2009-11-06 13:58:49.720180268 +0100
+--- gnome-session-2.30.0.orig/capplet/Makefile.in 2010-03-30 02:04:28.000000000 +0200
++++ gnome-session-2.30.0/capplet/Makefile.in 2010-04-13 22:50:52.093737979 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -122,6 +122,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -3780,7 +3974,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -208,6 +211,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -189,6 +192,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3788,10 +3982,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/compat/Makefile.in
+Index: gnome-session-2.30.0/compat/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/compat/Makefile.in 2009-11-06 13:54:08.475680181 +0100
-+++ gnome-session-2.28.0/compat/Makefile.in 2009-11-06 13:58:49.844179123 +0100
+--- gnome-session-2.30.0.orig/compat/Makefile.in 2010-03-30 02:04:28.000000000 +0200
++++ gnome-session-2.30.0/compat/Makefile.in 2010-04-13 22:50:52.229236978 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -143,6 +143,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -3809,7 +4009,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -229,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -210,6 +213,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3817,24 +4017,58 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/config.guess
+Index: gnome-session-2.30.0/config.guess
===================================================================
---- gnome-session-2.28.0.orig/config.guess 2009-11-06 13:54:08.451681110 +0100
-+++ gnome-session-2.28.0/config.guess 2009-11-06 13:58:49.583679041 +0100
+--- gnome-session-2.30.0.orig/config.guess 2010-03-30 02:04:28.000000000 +0200
++++ gnome-session-2.30.0/config.guess 2010-04-13 22:50:51.881238494 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-04-27'
-+timestamp='2009-06-10'
++timestamp='2009-12-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -27,16 +27,16 @@ timestamp='2009-04-27'
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -56,8 +56,9 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -3843,7 +4077,17 @@
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@ EOF
+@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+@@ -656,7 +660,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -3852,7 +4096,22 @@
then
HP_ARCH="hppa2.0w"
else
-@@ -822,6 +822,9 @@ EOF
+@@ -807,12 +811,12 @@ EOF
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- *:Interix*:[3456]*)
++ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd | genuineintel)
++ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -822,6 +826,9 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -3862,24 +4121,59 @@
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@ EOF
+@@ -851,6 +858,20 @@ EOF
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -873,6 +894,17 @@ EOF
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
++ i*86:Linux:*:*)
++ LIBC=gnu
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+@@ -882,78 +914,34 @@ EOF
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #undef CPU
- #undef mips
- #undef mipsel
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- #else
+- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
@@ -3894,33 +4188,99 @@
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
++ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
- #undef mips64
- #undef mips64el
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++ #undef ${UNAME_MACHINE}
++ #undef ${UNAME_MACHINE}el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++ CPU=${UNAME_MACHINE}el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
-@@ -947,7 +927,7 @@ EOF
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
+- exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
exit ;;
-@@ -1001,14 +981,6 @@ EOF
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-gnu
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -962,8 +950,11 @@ EOF
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+@@ -986,66 +977,6 @@ EOF
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- i*86:Linux:*:*)
+- # The BFD linker knows what the default object file format is, so
+- # first see if it will tell us. cd to the root directory to prevent
+- # problems with other programs or directories called `ld' in the path.
+- # Set LC_ALL=C to ensure ld outputs messages in English.
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+- | sed -ne '/supported targets:/!d
+- s/[ ][ ]*/ /g
+- s/.*supported targets: *//
+- s/ .*//
+- p'`
+- case "$ld_supported_targets" in
+- elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
@@ -3929,10 +4289,47 @@
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@ EOF
+- esac
+- # Determine whether the default compiler is a.out or elf
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include <features.h>
+- #ifdef __ELF__
+- # ifdef __GLIBC__
+- # if __GLIBC__ >= 2
+- LIBC=gnu
+- # else
+- LIBC=gnulibc1
+- # endif
+- # else
+- LIBC=gnulibc1
+- # endif
+- #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+- LIBC=gnu
+- #else
+- LIBC=gnuaout
+- #endif
+- #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^LIBC/{
+- s: ::g
+- p
+- }'`"
+- test x"${LIBC}" != x && {
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+- exit
+- }
+- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+- ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1074,7 +1005,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
@@ -3941,7 +4338,7 @@
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@ EOF
+@@ -1182,7 +1113,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -3950,24 +4347,76 @@
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
-Index: gnome-session-2.28.0/config.sub
+@@ -1275,6 +1206,16 @@ EOF
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ i386)
++ eval $set_cc_for_build
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ UNAME_PROCESSOR="x86_64"
++ fi
++ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+Index: gnome-session-2.30.0/config.sub
===================================================================
---- gnome-session-2.28.0.orig/config.sub 2009-11-06 13:54:08.435680752 +0100
-+++ gnome-session-2.28.0/config.sub 2009-11-06 13:58:49.587679619 +0100
+--- gnome-session-2.30.0.orig/config.sub 2010-03-30 02:04:28.000000000 +0200
++++ gnome-session-2.30.0/config.sub 2010-04-13 22:50:51.885235161 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-04-17'
-+timestamp='2009-06-11'
++timestamp='2010-01-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@ case $os in
+@@ -32,13 +32,16 @@ timestamp='2009-04-17'
+
+
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -149,10 +153,13 @@ case $os in
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray)
++ -apple | -axis | -knuth | -cray | -microblaze)
os=
basic_machine=$1
;;
@@ -3977,7 +4426,60 @@
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
-@@ -467,6 +470,10 @@ case $basic_machine in
+@@ -281,6 +288,7 @@ case $basic_machine in
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -288,13 +296,14 @@ case $basic_machine in
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
++ | ubicom32 \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12)
++ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+@@ -337,7 +346,7 @@ case $basic_machine in
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -365,15 +374,17 @@ case $basic_machine in
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+- | romp-* | rs6000-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile-* | tilegx-* \
+ | tron-* \
++ | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -467,6 +478,10 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
@@ -3988,16 +4490,70 @@
c90)
basic_machine=c90-cray
os=-unicos
-@@ -1260,7 +1267,7 @@ case $os in
+@@ -719,6 +734,9 @@ case $basic_machine in
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
++ microblaze)
++ basic_machine=microblaze-xilinx
++ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+@@ -1069,6 +1087,11 @@ case $basic_machine in
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+@@ -1240,6 +1263,9 @@ case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
++ -auroraux)
++ os=-auroraux
++ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1260,9 +1286,9 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+- | -kopensolaris* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@ case $basic_machine in
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1283,7 +1309,7 @@ case $os in
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1416,6 +1442,8 @@ case $os in
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1613,7 +1641,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
@@ -4006,22 +4562,24 @@
vendor=ibm
;;
-beos*)
-Index: gnome-session-2.28.0/configure
+Index: gnome-session-2.30.0/configure
===================================================================
---- gnome-session-2.28.0.orig/configure 2009-11-06 13:54:08.423682439 +0100
-+++ gnome-session-2.28.0/configure 2009-11-06 13:58:52.692177266 +0100
-@@ -1,20 +1,22 @@
+--- gnome-session-2.30.0.orig/configure 2010-03-30 02:04:26.000000000 +0200
++++ gnome-session-2.30.0/configure 2010-04-13 22:50:54.933233856 +0200
+@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for gnome-session 2.28.0.
-+# Generated by GNU Autoconf 2.64 for gnome-session 2.28.0.
+-# Generated by GNU Autoconf 2.63 for gnome-session 2.30.0.
++# Generated by GNU Autoconf 2.65 for gnome-session 2.30.0.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session>.
#
++#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@@ -4039,7 +4597,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -22,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -4068,7 +4626,7 @@
as_nl='
'
export as_nl
-@@ -46,7 +40,13 @@ export as_nl
+@@ -46,7 +42,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -4083,7 +4641,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -57,7 +57,7 @@ else
+@@ -57,7 +59,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -4092,7 +4650,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -4106,7 +4664,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -96,15 +89,15 @@ fi
+@@ -96,15 +91,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -4125,7 +4683,7 @@
IFS=$as_save_IFS
;;
-@@ -116,12 +109,16 @@ if test "x$as_myself" = x; then
+@@ -116,12 +111,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -4146,7 +4704,7 @@
done
PS1='$ '
PS2='> '
-@@ -133,330 +130,301 @@ export LC_ALL
+@@ -133,330 +132,301 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -4724,7 +5282,7 @@
sed -n '
p
/[$]LINENO/=
-@@ -473,8 +441,7 @@ test \$exitcode = 0") || {
+@@ -473,8 +443,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -4734,7 +5292,7 @@
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +451,18 @@ test \$exitcode = 0") || {
+@@ -484,29 +453,18 @@ test \$exitcode = 0") || {
exit
}
@@ -4769,7 +5327,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -536,7 +492,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
+@@ -536,7 +494,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
@@ -4778,7 +5336,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -555,10 +511,10 @@ else
+@@ -555,10 +513,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -4791,7 +5349,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -573,7 +529,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -573,7 +531,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
@@ -4799,7 +5357,17 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -740,7 +695,6 @@ cross_compiling=no
+@@ -722,7 +679,8 @@ fi
+
+
+
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -740,7 +698,6 @@ cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -4807,15 +5375,15 @@
# Identity of this package.
PACKAGE_NAME='gnome-session'
-@@ -748,6 +702,7 @@ PACKAGE_TARNAME='gnome-session'
- PACKAGE_VERSION='2.28.0'
- PACKAGE_STRING='gnome-session 2.28.0'
+@@ -748,6 +705,7 @@ PACKAGE_TARNAME='gnome-session'
+ PACKAGE_VERSION='2.30.0'
+ PACKAGE_STRING='gnome-session 2.30.0'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session'
+PACKAGE_URL=''
ac_unique_file="gnome-session"
# Factoring default headers for most tests.
-@@ -833,6 +788,9 @@ ENABLE_SPLASH_TRUE
+@@ -833,6 +791,9 @@ ENABLE_SPLASH_TRUE
USE_GNOME_WM_FALSE
USE_GNOME_WM_TRUE
DEFAULT_WM
@@ -4825,7 +5393,7 @@
EGG_SMCLIENT_LIBS
EGG_SMCLIENT_CFLAGS
GCONF_LIBS
-@@ -989,6 +947,7 @@ bindir
+@@ -989,6 +950,7 @@ bindir
program_transform_name
prefix
exec_prefix
@@ -4833,7 +5401,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1051,6 +1010,8 @@ GCONF_CFLAGS
+@@ -1051,6 +1013,8 @@ GCONF_CFLAGS
GCONF_LIBS
EGG_SMCLIENT_CFLAGS
EGG_SMCLIENT_LIBS
@@ -4842,7 +5410,7 @@
XMKMF
XTEST_CFLAGS
XTEST_LIBS
-@@ -1164,8 +1125,7 @@ do
+@@ -1164,8 +1128,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4852,7 +5420,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1191,8 +1151,7 @@ do
+@@ -1191,8 +1154,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4862,7 +5430,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1396,8 +1355,7 @@ do
+@@ -1396,8 +1358,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4872,7 +5440,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1413,8 +1371,7 @@ do
+@@ -1413,8 +1374,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -4882,7 +5450,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1444,17 +1401,17 @@ do
+@@ -1444,17 +1404,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -4906,7 +5474,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1471,15 +1428,13 @@ done
+@@ -1471,15 +1431,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -4924,7 +5492,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1502,8 +1457,7 @@ do
+@@ -1502,8 +1460,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -4934,7 +5502,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1533,11 +1487,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1533,11 +1490,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -4948,7 +5516,7 @@
# Find the source files, if location was not specified.
-@@ -1576,13 +1528,11 @@ else
+@@ -1576,13 +1531,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -4964,7 +5532,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1708,7 +1658,8 @@ Optional Features:
+@@ -1708,7 +1661,8 @@ Optional Features:
--enable-iso-c Try to warn if code is not ISO C
--enable-deprecations warn about deprecated usages [default=no]
--enable-splash enable splash screen [default=no]
@@ -4974,7 +5542,16 @@
--enable-docbook-docs build documentation (requires xmlto)
--enable-ipv6 enable IPv6 extensions
--disable-rebuilds disable all source autogeneration rules
-@@ -1766,6 +1717,10 @@ Some influential environment variables:
+@@ -1733,7 +1687,7 @@ Some influential environment variables:
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+@@ -1766,6 +1720,10 @@ Some influential environment variables:
C compiler flags for EGG_SMCLIENT, overriding pkg-config
EGG_SMCLIENT_LIBS
linker flags for EGG_SMCLIENT, overriding pkg-config
@@ -4985,12 +5562,12 @@
XMKMF Path to xmkmf, Makefile generator for X Window System
XTEST_CFLAGS
C compiler flags for XTEST, overriding pkg-config
-@@ -1842,21 +1797,378 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1842,21 +1800,378 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
- gnome-session configure 2.28.0
+ gnome-session configure 2.30.0
-generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.65
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -5039,7 +5616,7 @@
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
@@ -5085,7 +5662,7 @@
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
@@ -5189,7 +5766,7 @@
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
@@ -5231,7 +5808,7 @@
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
@@ -5362,13 +5939,13 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by gnome-session $as_me 2.28.0, which was
+ It was created by gnome-session $as_me 2.30.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -1892,8 +2204,8 @@ for as_dir in $PATH
+@@ -1892,8 +2207,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5379,7 +5956,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1930,9 +2242,9 @@ do
+@@ -1930,9 +2245,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -5391,7 +5968,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1948,13 +2260,13 @@ do
+@@ -1948,13 +2263,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -5408,7 +5985,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1979,13 +2291,13 @@ _ASBOX
+@@ -1979,13 +2294,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -5424,7 +6001,7 @@
esac ;;
esac
done
-@@ -2057,39 +2369,41 @@ _ASBOX
+@@ -2057,39 +2372,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -5471,25 +6048,33 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2108,7 +2422,7 @@ for ac_site_file in "$ac_site_file1" "$a
+@@ -2107,8 +2424,8 @@ fi
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2119,7 +2433,7 @@ if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+@@ -2116,10 +2433,10 @@ $as_echo "$as_me: loading site script $a
+ done
+
+ if test -r "$cache_file"; then
+- # Some versions of bash will fail to source /dev/null (special
+- # files actually), so we avoid doing that.
+- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
++ # Some versions of bash will fail to source /dev/null (special files
++ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2127,7 +2441,7 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -2127,7 +2444,7 @@ $as_echo "$as_me: loading cache $cache_f
esac
fi
else
@@ -5498,7 +6083,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2142,11 +2456,11 @@ for ac_var in $ac_precious_vars; do
+@@ -2142,11 +2459,11 @@ for ac_var in $ac_precious_vars; do
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -5512,7 +6097,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2156,17 +2470,17 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2156,17 +2473,17 @@ $as_echo "$as_me: error: \`$ac_var' was
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -5534,7 +6119,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2178,43 +2492,20 @@ $as_echo "$as_me: current value: \`$ac
+@@ -2178,43 +2495,20 @@ $as_echo "$as_me: current value: \`$ac
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -5585,7 +6170,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2231,24 +2522,16 @@ am__api_version='1.11'
+@@ -2231,24 +2525,16 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -5618,7 +6203,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2274,10 +2557,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2274,10 +2560,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -5631,7 +6216,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2285,11 +2568,11 @@ for as_dir in $PATH
+@@ -2285,11 +2571,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5647,7 +6232,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2326,7 +2609,7 @@ case $as_dir/ in
+@@ -2326,7 +2612,7 @@ case $as_dir/ in
;;
esac
@@ -5656,7 +6241,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2342,7 +2625,7 @@ fi
+@@ -2342,7 +2628,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -5665,7 +6250,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2353,7 +2636,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2353,7 +2639,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5674,7 +6259,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2364,15 +2647,11 @@ am_lf='
+@@ -2364,15 +2650,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -5692,7 +6277,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2394,11 +2673,8 @@ if (
+@@ -2394,11 +2676,8 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -5706,7 +6291,7 @@
fi
test "$2" = conftest.file
-@@ -2407,13 +2683,10 @@ then
+@@ -2407,13 +2686,10 @@ then
# Ok.
:
else
@@ -5723,7 +6308,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2441,7 +2714,7 @@ if eval "$MISSING --run true"; then
+@@ -2441,7 +2717,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -5732,7 +6317,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2462,9 +2735,9 @@ if test "$cross_compiling" != no; then
+@@ -2462,9 +2738,9 @@ if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5744,7 +6329,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2475,24 +2748,24 @@ for as_dir in $PATH
+@@ -2475,24 +2751,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5774,7 +6359,7 @@
$as_echo "no" >&6; }
fi
-@@ -2502,9 +2775,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2502,9 +2778,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -5786,7 +6371,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2515,24 +2788,24 @@ for as_dir in $PATH
+@@ -2515,24 +2791,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5816,7 +6401,7 @@
$as_echo "no" >&6; }
fi
-@@ -2541,7 +2814,7 @@ fi
+@@ -2541,7 +2817,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5825,7 +6410,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2554,10 +2827,10 @@ fi
+@@ -2554,10 +2830,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -5838,7 +6423,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2565,7 +2838,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
+@@ -2565,7 +2841,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5847,7 +6432,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2577,7 +2850,7 @@ do
+@@ -2577,11 +2853,12 @@ do
esac
done
done
@@ -5856,7 +6441,16 @@
IFS=$as_save_IFS
fi
-@@ -2593,7 +2866,7 @@ fi
+
++ test -d ./--version && rmdir ./--version
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+@@ -2589,11 +2866,10 @@ fi
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -5865,7 +6459,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2606,9 +2879,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2606,9 +2882,9 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5877,7 +6471,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2619,24 +2892,24 @@ for as_dir in $PATH
+@@ -2619,24 +2895,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5907,7 +6501,7 @@
$as_echo "no" >&6; }
fi
-@@ -2644,11 +2917,11 @@ fi
+@@ -2644,11 +2920,11 @@ fi
test -n "$AWK" && break
done
@@ -5921,7 +6515,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2666,11 +2939,11 @@ esac
+@@ -2666,11 +2942,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5935,7 +6529,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2690,9 +2963,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2690,9 +2966,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -5946,7 +6540,7 @@
fi
fi
-@@ -2749,7 +3020,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2749,7 +3023,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
# Check whether --enable-silent-rules was given.
@@ -5955,7 +6549,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2763,16 +3034,16 @@ AM_BACKSLASH='\'
+@@ -2763,16 +3037,16 @@ AM_BACKSLASH='\'
@@ -5975,7 +6569,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2798,7 +3069,7 @@ fi
+@@ -2798,7 +3072,7 @@ fi
# Check whether --enable-debug was given.
@@ -5984,7 +6578,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -2807,24 +3078,22 @@ fi
+@@ -2807,24 +3081,22 @@ fi
if test x$enable_debug = xyes ; then
@@ -6013,7 +6607,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -2840,7 +3109,7 @@ am__doit:
+@@ -2840,7 +3112,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -6022,7 +6616,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2868,12 +3137,12 @@ if test "$am__include" = "#"; then
+@@ -2868,12 +3140,12 @@ if test "$am__include" = "#"; then
fi
@@ -6037,7 +6631,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2898,9 +3167,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2898,9 +3170,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -6049,7 +6643,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2911,24 +3180,24 @@ for as_dir in $PATH
+@@ -2911,24 +3183,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6079,7 +6673,7 @@
$as_echo "no" >&6; }
fi
-@@ -2938,9 +3207,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2938,9 +3210,9 @@ if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -6091,7 +6685,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2951,24 +3220,24 @@ for as_dir in $PATH
+@@ -2951,24 +3223,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6121,7 +6715,7 @@
$as_echo "no" >&6; }
fi
-@@ -2977,7 +3246,7 @@ fi
+@@ -2977,7 +3249,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6130,7 +6724,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2991,9 +3260,9 @@ if test -z "$CC"; then
+@@ -2991,9 +3263,9 @@ if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -6142,7 +6736,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3004,24 +3273,24 @@ for as_dir in $PATH
+@@ -3004,24 +3276,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6172,7 +6766,7 @@
$as_echo "no" >&6; }
fi
-@@ -3031,9 +3300,9 @@ fi
+@@ -3031,9 +3303,9 @@ fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -6184,7 +6778,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3045,18 +3314,18 @@ for as_dir in $PATH
+@@ -3045,18 +3317,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6206,7 +6800,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3075,10 +3344,10 @@ fi
+@@ -3075,10 +3347,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6219,7 +6813,7 @@
$as_echo "no" >&6; }
fi
-@@ -3090,9 +3359,9 @@ if test -z "$CC"; then
+@@ -3090,9 +3362,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6231,7 +6825,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3103,24 +3372,24 @@ for as_dir in $PATH
+@@ -3103,24 +3375,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6261,7 +6855,7 @@
$as_echo "no" >&6; }
fi
-@@ -3134,9 +3403,9 @@ if test -z "$CC"; then
+@@ -3134,9 +3406,9 @@ if test -z "$CC"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6273,7 +6867,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3147,24 +3416,24 @@ for as_dir in $PATH
+@@ -3147,24 +3419,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6303,7 +6897,7 @@
$as_echo "no" >&6; }
fi
-@@ -3177,7 +3446,7 @@ done
+@@ -3177,7 +3449,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6312,1572 +6906,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3188,73 +3457,55 @@ fi
- fi
-
-
--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
-
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
- set X $ac_compile
- ac_compiler=$2
--{ (ac_try="$ac_compiler --version >&5"
-+for ac_option in --version -v -V -qversion; do
-+ { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler --version >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler -v >&5") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compiler -V >&5") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
-+ if test -s conftest.err; then
-+ sed '10a\
-+... rest of stderr output deleted ...
-+ 10q' conftest.err >conftest.er1
-+ cat conftest.er1 >&5
-+ rm -f conftest.er1 conftest.err
-+ fi
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }
-+done
-
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--
-+#include <stdio.h>
- int
- main ()
- {
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
- $as_echo_n "checking for C compiler default output file name... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-@@ -3271,17 +3522,17 @@ do
- done
- rm -f $ac_rmfiles
-
--if { (ac_try="$ac_link_default"
-+if { { ac_try="$ac_link_default"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link_default") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
- # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
- # in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3298,7 +3549,7 @@ do
- # certainly right.
- break;;
- *.* )
-- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
- then :; else
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- fi
-@@ -3317,84 +3568,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
- else
- ac_file=''
- fi
--
--{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
- $as_echo "$ac_file" >&6; }
--if test -z "$ac_file"; then
-+if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C compiler cannot create executables
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }; }
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
- fi
--
- ac_exeext=$ac_cv_exeext
-
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
--# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
-- { (case "(($ac_try" in
-+ { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
- ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
-
--{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
--if { (ac_try="$ac_link"
-+if { { ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then :
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
- # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3409,32 +3651,24 @@ for ac_file in conftest.exe conftest con
- esac
- done
- else
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--
- rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
--if test "${ac_cv_objext+set}" = set; then
-+if test "${ac_cv_objext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -3446,17 +3680,17 @@ main ()
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (ac_try="$ac_compile"
-+if { { ac_try="$ac_compile"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_compile") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then :
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
-@@ -3469,31 +3703,23 @@ else
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
- $as_echo "$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -3507,37 +3733,16 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_compiler_gnu=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
- $as_echo "$ac_cv_c_compiler_gnu" >&6; }
- if test $ac_compiler_gnu = yes; then
- GCC=yes
-@@ -3546,20 +3751,16 @@ else
- fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- ac_cv_prog_cc_g=no
- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -3570,35 +3771,11 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- CFLAGS=""
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ CFLAGS=""
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -3609,36 +3786,12 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- :
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
-
-- ac_c_werror_flag=$ac_save_c_werror_flag
-+else
-+ ac_c_werror_flag=$ac_save_c_werror_flag
- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -3649,42 +3802,17 @@ main ()
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_g=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
- $as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
-@@ -3701,18 +3829,14 @@ else
- CFLAGS=
- fi
- fi
--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <stdarg.h>
- #include <stdio.h>
-@@ -3769,32 +3893,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
-- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-+ if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_prog_cc_c89=$ac_arg
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
-@@ -3805,17 +3906,19 @@ fi
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
- x)
-- { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
- $as_echo "none needed" >&6; } ;;
- xno)
-- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
- $as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
-- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-+fi
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -3825,9 +3928,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- depcc="$CC" am_compiler_list=
-
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3935,7 +4038,7 @@ else
- fi
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
- $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-@@ -3955,35 +4058,31 @@ fi
-
- case "$am__api_version" in
- 1.01234)
-- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
--$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
- ;;
- *)
- ;;
- esac
-
- if test -n "0.40.0"; then
-- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
- $as_echo_n "checking for intltool >= 0.40.0... " >&6; }
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
- $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5
--$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
- fi
-
- # Extract the first word of "intltool-update", so it can be a program name with args.
- set dummy intltool-update; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_UPDATE in
-@@ -3996,14 +4095,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4011,19 +4110,19 @@ esac
- fi
- INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
- if test -n "$INTLTOOL_UPDATE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
- $as_echo "$INTLTOOL_UPDATE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "intltool-merge", so it can be a program name with args.
- set dummy intltool-merge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_MERGE in
-@@ -4036,14 +4135,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4051,19 +4150,19 @@ esac
- fi
- INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
- if test -n "$INTLTOOL_MERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
- $as_echo "$INTLTOOL_MERGE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "intltool-extract", so it can be a program name with args.
- set dummy intltool-extract; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_EXTRACT in
-@@ -4076,14 +4175,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4091,18 +4190,16 @@ esac
- fi
- INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
- if test -n "$INTLTOOL_EXTRACT"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
- $as_echo "$INTLTOOL_EXTRACT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
--$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
- fi
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -4148,9 +4245,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
- # Check the gettext tools to make sure they are GNU
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $XGETTEXT in
-@@ -4163,14 +4260,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4178,19 +4275,19 @@ esac
- fi
- XGETTEXT=$ac_cv_path_XGETTEXT
- if test -n "$XGETTEXT"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
- $as_echo "$XGETTEXT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "msgmerge", so it can be a program name with args.
- set dummy msgmerge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGMERGE+set}" = set; then
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $MSGMERGE in
-@@ -4203,14 +4300,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4218,19 +4315,19 @@ esac
- fi
- MSGMERGE=$ac_cv_path_MSGMERGE
- if test -n "$MSGMERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
- $as_echo "$MSGMERGE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $MSGFMT in
-@@ -4243,14 +4340,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4258,19 +4355,19 @@ esac
- fi
- MSGFMT=$ac_cv_path_MSGFMT
- if test -n "$MSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_GMSGFMT+set}" = set; then
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GMSGFMT in
-@@ -4283,14 +4380,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -4299,33 +4396,29 @@ esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
- $as_echo "$GMSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
- xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
- mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
- mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
- if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
-
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_PERL in
-@@ -4338,14 +4431,14 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -4353,34 +4446,28 @@ esac
- fi
- INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
- if test -n "$INTLTOOL_PERL"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
- $as_echo "$INTLTOOL_PERL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$INTLTOOL_PERL"; then
-- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
--$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "perl not found; required for intltool" "$LINENO" 5
- fi
- if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
--$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "perl 5.x required for intltool" "$LINENO" 5
- fi
- if test "x" != "xno-xml"; then
-- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
- $as_echo_n "checking for XML::Parser... " >&6; }
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- { $as_echo "$as_me:$LINENO: result: ok" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
- $as_echo "ok" >&6; }
- else
-- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
- fi
- fi
-
-@@ -4390,11 +4477,7 @@ fi
- # Set DATADIRNAME correctly if it is not set yet
- # (copied from glib-gettext.m4)
- if test -z "$DATADIRNAME"; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -4406,120 +4489,13 @@ extern int _nl_msg_cat_cntr;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- DATADIRNAME=share
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-+ case $host in
- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
--
--int
--main ()
--{
--return bind_textdomain_codeset ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_bind_textdomain_codeset=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
--if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- DATADIRNAME=share
- else
- DATADIRNAME=lib
-@@ -4531,10 +4507,8 @@ fi
- ;;
- esac
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
-
-
-@@ -4542,17 +4516,13 @@ fi
-
-
-
--{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
- $as_echo_n "checking for library containing strerror... " >&6; }
--if test "${ac_cv_search_strerror+set}" = set; then
-+if test "${ac_cv_search_strerror+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_func_search_save_LIBS=$LIBS
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -4577,54 +4547,27 @@ for ac_lib in '' cposix; do
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+ if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_strerror=$ac_res
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext
-- if test "${ac_cv_search_strerror+set}" = set; then
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_strerror+set}" = set; then :
- break
- fi
- done
--if test "${ac_cv_search_strerror+set}" = set; then
-- :
-+if test "${ac_cv_search_strerror+set}" = set; then :
-+
- else
- ac_cv_search_strerror=no
- fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
- $as_echo "$ac_cv_search_strerror" >&6; }
- ac_res=$ac_cv_search_strerror
--if test "$ac_res" != no; then
-+if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-@@ -4637,9 +4580,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -4650,24 +4593,24 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4677,9 +4620,9 @@ if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
-@@ -4690,24 +4633,24 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4716,7 +4659,7 @@ fi
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -4730,9 +4673,9 @@ if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -4743,24 +4686,24 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4770,9 +4713,9 @@ fi
- if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -4784,18 +4727,18 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
-@@ -4814,10 +4757,10 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4829,9 +4772,9 @@ if test -z "$CC"; then
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
-@@ -4842,24 +4785,24 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4873,9 +4816,9 @@ if test -z "$CC"; then
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
-@@ -4886,24 +4829,24 @@ for as_dir in $PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -4916,7 +4859,7 @@ done
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -4927,62 +4870,42 @@ fi
+@@ -3188,57 +3460,37 @@ fi
fi
@@ -7940,17 +6969,259 @@
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
-+ rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -3254,8 +3506,8 @@ ac_clean_files="$ac_clean_files a.out a.
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+ # The possible output files:
+@@ -3271,17 +3523,17 @@ do
+ done
+ rm -f $ac_rmfiles
+
+-if { (ac_try="$ac_link_default"
++if { { ac_try="$ac_link_default"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link_default") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then :
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+ # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+ # in a Makefile. We should not override ac_cv_exeext if it was cached,
+@@ -3298,7 +3550,7 @@ do
+ # certainly right.
+ break;;
+ *.* )
+- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+@@ -3317,84 +3569,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
+ else
+ ac_file=''
+ fi
+-
+-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+-if test -z "$ac_file"; then
+- $as_echo "$as_me: failed program was:" >&5
++if test -z "$ac_file"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C compiler cannot create executables
+-See \`config.log' for more details." >&2;}
+- { (exit 77); exit 77; }; }; }
++{ as_fn_set_status 77
++as_fn_error "C compiler cannot create executables
++See \`config.log' for more details." "$LINENO" 5; }; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+- if { ac_try='./$ac_file'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- cross_compiling=no
+- else
+- if test "$cross_compiling" = maybe; then
+- cross_compiling=yes
+- else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
+- fi
+- fi
+-fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+-if { (ac_try="$ac_link"
++if { { ac_try="$ac_link"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then :
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+ # work properly (i.e., refer to `conftest.exe'), while it won't with
+@@ -3409,32 +3619,83 @@ for ac_file in conftest.exe conftest con
+ esac
+ done
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++as_fn_error "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-
+-rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++rm -f conftest conftest$ac_cv_exeext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++ { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if { ac_try='./conftest$ac_cv_exeext'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ cross_compiling=no
++ else
++ if test "$cross_compiling" = maybe; then
++ cross_compiling=yes
++ else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++ fi
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then
++if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -7962,7 +7233,69 @@
/* end confdefs.h. */
int
-@@ -4996,37 +4919,16 @@ main ()
+@@ -3446,17 +3707,17 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (ac_try="$ac_compile"
++if { { ac_try="$ac_compile"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then :
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
+ case $ac_file in
+@@ -3469,31 +3730,23 @@ else
+ $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++as_fn_error "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+ $as_echo "$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -3507,37 +3760,16 @@ main ()
return 0;
}
_ACEOF
@@ -8003,7 +7336,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5035,20 +4937,16 @@ else
+@@ -3546,20 +3778,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -8027,7 +7360,7 @@
/* end confdefs.h. */
int
-@@ -5059,35 +4957,11 @@ main ()
+@@ -3570,35 +3798,11 @@ main ()
return 0;
}
_ACEOF
@@ -8066,7 +7399,7 @@
/* end confdefs.h. */
int
-@@ -5098,36 +4972,12 @@ main ()
+@@ -3609,36 +3813,12 @@ main ()
return 0;
}
_ACEOF
@@ -8107,7 +7440,7 @@
/* end confdefs.h. */
int
-@@ -5138,42 +4988,17 @@ main ()
+@@ -3649,42 +3829,17 @@ main ()
return 0;
}
_ACEOF
@@ -8152,7 +7485,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5190,18 +5015,14 @@ else
+@@ -3701,18 +3856,14 @@ else
CFLAGS=
fi
fi
@@ -8174,7 +7507,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5258,32 +5079,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -3769,32 +3920,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8208,7 +7541,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5294,17 +5092,19 @@ fi
+@@ -3805,17 +3933,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8231,7 +7564,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5314,9 +5114,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3825,9 +3955,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -8243,7 +7576,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5424,7 +5224,7 @@ else
+@@ -3935,7 +4065,7 @@ else
fi
fi
@@ -8252,7 +7585,1361 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5444,14 +5244,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -3955,35 +4085,31 @@ fi
+
+ case "$am__api_version" in
+ 1.01234)
+- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ ;;
+ *)
+ ;;
+ esac
+
+ if test -n "0.40.0"; then
+- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
+ $as_echo_n "checking for intltool >= 0.40.0... " >&6; }
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5
+-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
+ fi
+
+ # Extract the first word of "intltool-update", so it can be a program name with args.
+ set dummy intltool-update; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_UPDATE in
+@@ -3996,14 +4122,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4011,19 +4137,19 @@ esac
+ fi
+ INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+ if test -n "$INTLTOOL_UPDATE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
+ $as_echo "$INTLTOOL_UPDATE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-merge", so it can be a program name with args.
+ set dummy intltool-merge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_MERGE in
+@@ -4036,14 +4162,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4051,19 +4177,19 @@ esac
+ fi
+ INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+ if test -n "$INTLTOOL_MERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
+ $as_echo "$INTLTOOL_MERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-extract", so it can be a program name with args.
+ set dummy intltool-extract; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_EXTRACT in
+@@ -4076,14 +4202,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4091,18 +4217,16 @@ esac
+ fi
+ INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+ if test -n "$INTLTOOL_EXTRACT"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
+ $as_echo "$INTLTOOL_EXTRACT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -4224,9 +4348,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+ # Check the gettext tools to make sure they are GNU
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $XGETTEXT in
+@@ -4239,14 +4363,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4254,19 +4378,19 @@ esac
+ fi
+ XGETTEXT=$ac_cv_path_XGETTEXT
+ if test -n "$XGETTEXT"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ $as_echo "$XGETTEXT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "msgmerge", so it can be a program name with args.
+ set dummy msgmerge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGMERGE+set}" = set; then
++if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGMERGE in
+@@ -4279,14 +4403,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4294,19 +4418,19 @@ esac
+ fi
+ MSGMERGE=$ac_cv_path_MSGMERGE
+ if test -n "$MSGMERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+ $as_echo "$MSGMERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGFMT in
+@@ -4319,14 +4443,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4334,19 +4458,19 @@ esac
+ fi
+ MSGFMT=$ac_cv_path_MSGFMT
+ if test -n "$MSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GMSGFMT in
+@@ -4359,14 +4483,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+@@ -4375,33 +4499,29 @@ esac
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ $as_echo "$GMSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+ xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+ mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+ mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_PERL in
+@@ -4414,14 +4534,14 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -4429,41 +4549,35 @@ esac
+ fi
+ INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+ if test -n "$INTLTOOL_PERL"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
+ $as_echo "$INTLTOOL_PERL" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$INTLTOOL_PERL"; then
+- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+-$as_echo "$as_me: error: perl not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "perl not found" "$LINENO" 5
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+ $as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+ else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ $as_echo "$IT_PERL_VERSION" >&6; }
+ fi
+ if test "x" != "xno-xml"; then
+- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+ $as_echo_n "checking for XML::Parser... " >&6; }
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- { $as_echo "$as_me:$LINENO: result: ok" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+ else
+- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+ fi
+ fi
+
+@@ -4473,11 +4587,7 @@ fi
+ # Set DATADIRNAME correctly if it is not set yet
+ # (copied from glib-gettext.m4)
+ if test -z "$DATADIRNAME"; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -4489,61 +4599,41 @@ extern int _nl_msg_cat_cntr;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- case $host in
++ case $host in
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++ DATADIRNAME=share
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
++ DATADIRNAME=lib
++fi
++
++ ;;
++ *)
++ DATADIRNAME=lib
++ ;;
++ esac
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++fi
+
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char bind_textdomain_codeset (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef bind_textdomain_codeset
++
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
++$as_echo_n "checking for library containing strerror... " >&6; }
++if test "${ac_cv_search_strerror+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_func_search_save_LIBS=$LIBS
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+@@ -4551,104 +4641,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
+-
++char strerror ();
+ int
+ main ()
+ {
+-return bind_textdomain_codeset ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_bind_textdomain_codeset=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_bind_textdomain_codeset=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+- DATADIRNAME=share
+-else
+- DATADIRNAME=lib
+-fi
+-
+- ;;
+- *)
+- DATADIRNAME=lib
+- ;;
+- esac
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-
+-
+-
+-
+-
+-
+-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
+-$as_echo_n "checking for library containing strerror... " >&6; }
+-if test "${ac_cv_search_strerror+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char strerror ();
+-int
+-main ()
+-{
+-return strerror ();
++return strerror ();
+ ;
+ return 0;
+ }
+@@ -4660,54 +4657,27 @@ for ac_lib in '' cposix; do
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_strerror=$ac_res
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext
+- if test "${ac_cv_search_strerror+set}" = set; then
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext
++ if test "${ac_cv_search_strerror+set}" = set; then :
+ break
+ fi
+ done
+-if test "${ac_cv_search_strerror+set}" = set; then
+- :
++if test "${ac_cv_search_strerror+set}" = set; then :
++
+ else
+ ac_cv_search_strerror=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
+ $as_echo "$ac_cv_search_strerror" >&6; }
+ ac_res=$ac_cv_search_strerror
+-if test "$ac_res" != no; then
++if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+ fi
+@@ -4720,9 +4690,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4733,24 +4703,24 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4760,9 +4730,9 @@ if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -4773,24 +4743,24 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4799,7 +4769,7 @@ fi
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -4813,9 +4783,9 @@ if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4826,24 +4796,24 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4853,9 +4823,9 @@ fi
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4867,18 +4837,18 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ if test $ac_prog_rejected = yes; then
+@@ -4897,10 +4867,10 @@ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4912,9 +4882,9 @@ if test -z "$CC"; then
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC"; then
+@@ -4925,24 +4895,24 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+- { $as_echo "$as_me:$LINENO: result: $CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4956,9 +4926,9 @@ if test -z "$CC"; then
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$ac_ct_CC"; then
+@@ -4969,24 +4939,24 @@ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -4999,7 +4969,7 @@ done
+ else
+ case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -5010,62 +4980,42 @@ fi
+ fi
+
+
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&5"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler --version >&5") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler -v >&5") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compiler -V >&5") 2>&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
++ if test -s conftest.err; then
++ sed '10a\
++... rest of stderr output deleted ...
++ 10q' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ fi
++ rm -f conftest.er1 conftest.err
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++done
+
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -5079,37 +5029,16 @@ main ()
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_compiler_gnu=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_compiler_gnu=no
++ ac_compiler_gnu=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+ GCC=yes
+@@ -5118,20 +5047,16 @@ else
+ fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -5142,35 +5067,11 @@ main ()
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- CFLAGS=""
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ CFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -5181,36 +5082,12 @@ main ()
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- :
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+
+- ac_c_werror_flag=$ac_save_c_werror_flag
++else
++ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -5221,42 +5098,17 @@ main ()
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+@@ -5273,18 +5125,14 @@ else
+ CFLAGS=
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -5341,32 +5189,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+ CC="$ac_save_CC $ac_arg"
+- rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+@@ -5377,17 +5202,19 @@ fi
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+ x)
+- { $as_echo "$as_me:$LINENO: result: none needed" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
+ xno)
+- { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+
++fi
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -5397,9 +5224,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ depcc="$CC" am_compiler_list=
+
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -5507,7 +5334,7 @@ else
+ fi
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+@@ -5527,14 +5354,14 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8269,7 +8956,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5466,11 +5266,7 @@ do
+@@ -5549,11 +5376,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8282,7 +8969,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5479,78 +5275,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5562,78 +5385,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8366,7 +9053,7 @@
break
fi
-@@ -5562,7 +5314,7 @@ fi
+@@ -5645,7 +5424,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -8375,7 +9062,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -5573,11 +5325,7 @@ do
+@@ -5656,11 +5435,7 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -8388,7 +9075,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5586,87 +5334,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5669,87 +5444,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8485,7 +9172,7 @@
fi
ac_ext=c
-@@ -5676,9 +5377,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5759,9 +5487,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8497,7 +9184,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -5689,7 +5390,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5772,7 +5500,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8506,7 +9193,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -5709,7 +5410,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -5792,7 +5520,7 @@ case `"$ac_path_GREP" --version 2>&1` in
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8515,7 +9202,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -5724,26 +5425,24 @@ esac
+@@ -5807,26 +5535,24 @@ esac
$ac_path_GREP_found && break 3
done
done
@@ -8547,7 +9234,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5757,7 +5456,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5840,7 +5566,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8556,7 +9243,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -5777,7 +5476,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -5860,7 +5586,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8565,7 +9252,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -5792,12 +5491,10 @@ esac
+@@ -5875,12 +5601,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
@@ -8580,7 +9267,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5805,21 +5502,17 @@ fi
+@@ -5888,21 +5612,17 @@ fi
fi
fi
@@ -8606,7 +9293,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -5834,48 +5527,23 @@ main ()
+@@ -5917,48 +5637,23 @@ main ()
return 0;
}
_ACEOF
@@ -8660,7 +9347,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5885,18 +5553,14 @@ fi
+@@ -5968,18 +5663,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8682,7 +9369,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5906,14 +5570,10 @@ fi
+@@ -5989,14 +5680,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -8699,7 +9386,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -5940,57 +5600,28 @@ main ()
+@@ -6023,64 +5710,35 @@ main ()
return 0;
}
_ACEOF
@@ -8765,7 +9452,16 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -6015,35 +5646,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
+
+
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+
+
+
+@@ -6098,35 +5756,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8808,7 +9504,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6059,28 +5682,24 @@ IFS=$ac_save_IFS
+@@ -6142,28 +5792,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8842,7 +9538,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6096,9 +5715,9 @@ IFS=$ac_save_IFS
+@@ -6179,9 +5825,9 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -8854,7 +9550,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6106,7 +5725,7 @@ else
+@@ -6189,7 +5835,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -8863,7 +9559,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6115,7 +5734,7 @@ for as_dir in $PATH
+@@ -6198,7 +5844,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8872,7 +9568,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -6135,7 +5754,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -6218,7 +5864,7 @@ case `"$ac_path_SED" --version 2>&1` in
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8881,7 +9577,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -6150,19 +5769,17 @@ esac
+@@ -6233,19 +5879,17 @@ esac
$ac_path_SED_found && break 3
done
done
@@ -8904,7 +9600,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6180,9 +5797,9 @@ Xsed="$SED -e 1s/^X//"
+@@ -6263,9 +5907,9 @@ Xsed="$SED -e 1s/^X//"
@@ -8916,7 +9612,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6196,7 +5813,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -6279,7 +5923,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8925,7 +9621,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -6216,7 +5833,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -6299,7 +5943,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -8934,7 +9630,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6231,12 +5848,10 @@ esac
+@@ -6314,12 +5958,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
@@ -8949,7 +9645,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6244,7 +5859,7 @@ fi
+@@ -6327,7 +5969,7 @@ fi
fi
fi
@@ -8958,7 +9654,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6270,7 +5885,7 @@ test -z "$GREP" && GREP=grep
+@@ -6353,7 +5995,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
@@ -8967,7 +9663,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6279,7 +5894,7 @@ fi
+@@ -6362,7 +6004,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -8976,7 +9672,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6309,13 +5924,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -6392,13 +6034,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -8993,7 +9689,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6346,18 +5961,16 @@ fi
+@@ -6429,18 +6071,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9017,7 +9713,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6370,7 +5983,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -6453,7 +6093,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -9026,7 +9722,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -6382,9 +5995,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -6465,9 +6105,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -9038,7 +9734,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6431,7 +6044,7 @@ else
+@@ -6514,7 +6154,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -9047,7 +9743,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -6442,9 +6055,9 @@ else
+@@ -6525,9 +6165,9 @@ else
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -9059,7 +9755,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -6455,24 +6068,24 @@ for as_dir in $PATH
+@@ -6538,24 +6178,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9089,7 +9785,7 @@
$as_echo "no" >&6; }
fi
-@@ -6486,9 +6099,9 @@ if test -z "$DUMPBIN"; then
+@@ -6569,9 +6209,9 @@ if test -z "$DUMPBIN"; then
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -9101,7 +9797,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6499,24 +6112,24 @@ for as_dir in $PATH
+@@ -6582,24 +6222,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9131,7 +9827,7 @@
$as_echo "no" >&6; }
fi
-@@ -6529,7 +6142,7 @@ done
+@@ -6612,7 +6252,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9140,7 +9836,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6549,44 +6162,44 @@ test -z "$NM" && NM=nm
+@@ -6632,44 +6272,44 @@ test -z "$NM" && NM=nm
@@ -9153,16 +9849,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:6559: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6172: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:6642: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6282: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6562: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6175: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:6645: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6285: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6565: output\"" >&5)
-+ (eval echo "\"\$as_me:6178: output\"" >&5)
+- (eval echo "\"\$as_me:6648: output\"" >&5)
++ (eval echo "\"\$as_me:6288: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9196,7 +9892,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -6704,10 +6317,10 @@ else
+@@ -6787,10 +6427,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -9209,7 +9905,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -6721,7 +6334,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -6804,7 +6444,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -9218,7 +9914,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -6731,17 +6344,17 @@ xsi_shell=no
+@@ -6814,17 +6454,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -9239,7 +9935,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -6776,14 +6389,14 @@ esac
+@@ -6859,14 +6499,14 @@ esac
@@ -9257,7 +9953,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -6812,9 +6425,9 @@ esac
+@@ -6895,9 +6535,9 @@ esac
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -9269,7 +9965,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6825,24 +6438,24 @@ for as_dir in $PATH
+@@ -6908,24 +6548,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9299,7 +9995,7 @@
$as_echo "no" >&6; }
fi
-@@ -6852,9 +6465,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -6935,9 +6575,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -9311,7 +10007,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6865,24 +6478,24 @@ for as_dir in $PATH
+@@ -6948,24 +6588,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9341,7 +10037,7 @@
$as_echo "no" >&6; }
fi
-@@ -6891,7 +6504,7 @@ fi
+@@ -6974,7 +6614,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9350,7 +10046,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6911,9 +6524,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -6994,9 +6634,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -9362,7 +10058,12 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7032,7 +6645,7 @@ linux* | k*bsd*-gnu)
+@@ -7111,11 +6751,11 @@ irix5* | irix6* | nonstopux*)
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -9371,7 +10072,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7107,7 +6720,7 @@ tpf*)
+@@ -7190,7 +6830,7 @@ tpf*)
esac
fi
@@ -9380,7 +10081,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7127,9 +6740,9 @@ test -z "$deplibs_check_method" && depli
+@@ -7210,9 +6850,9 @@ test -z "$deplibs_check_method" && depli
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -9392,7 +10093,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7140,24 +6753,24 @@ for as_dir in $PATH
+@@ -7223,24 +6863,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9422,7 +10123,7 @@
$as_echo "no" >&6; }
fi
-@@ -7167,9 +6780,9 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -7250,9 +6890,9 @@ if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -9434,7 +10135,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7180,24 +6793,24 @@ for as_dir in $PATH
+@@ -7263,24 +6903,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9464,7 +10165,7 @@
$as_echo "no" >&6; }
fi
-@@ -7206,7 +6819,7 @@ fi
+@@ -7289,7 +6929,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9473,7 +10174,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7232,9 +6845,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -7315,9 +6955,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -9485,7 +10186,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7245,24 +6858,24 @@ for as_dir in $PATH
+@@ -7328,24 +6968,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9515,7 +10216,7 @@
$as_echo "no" >&6; }
fi
-@@ -7272,9 +6885,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -7355,9 +6995,9 @@ if test -z "$ac_cv_prog_STRIP"; then
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -9527,7 +10228,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7285,24 +6898,24 @@ for as_dir in $PATH
+@@ -7368,24 +7008,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9557,7 +10258,7 @@
$as_echo "no" >&6; }
fi
-@@ -7311,7 +6924,7 @@ fi
+@@ -7394,7 +7034,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9566,7 +10267,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7331,9 +6944,9 @@ test -z "$STRIP" && STRIP=:
+@@ -7414,9 +7054,9 @@ test -z "$STRIP" && STRIP=:
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -9578,7 +10279,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7344,24 +6957,24 @@ for as_dir in $PATH
+@@ -7427,24 +7067,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9608,7 +10309,7 @@
$as_echo "no" >&6; }
fi
-@@ -7371,9 +6984,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -7454,9 +7094,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -9620,7 +10321,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -7384,24 +6997,24 @@ for as_dir in $PATH
+@@ -7467,24 +7107,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9650,7 +10351,7 @@
$as_echo "no" >&6; }
fi
-@@ -7410,7 +7023,7 @@ fi
+@@ -7493,7 +7133,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9659,7 +10360,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7488,9 +7101,9 @@ compiler=$CC
+@@ -7571,9 +7211,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -9671,7 +10372,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -7606,18 +7219,18 @@ void nm_test_func(void){}
+@@ -7689,18 +7329,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -9696,7 +10397,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -7670,11 +7283,11 @@ _LT_EOF
+@@ -7753,11 +7393,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -9711,7 +10412,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -7708,10 +7321,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -7791,10 +7431,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -9724,7 +10425,7 @@
$as_echo "ok" >&6; }
fi
-@@ -7737,7 +7350,7 @@ fi
+@@ -7820,7 +7460,7 @@ fi
# Check whether --enable-libtool-lock was given.
@@ -9733,7 +10434,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -7749,11 +7362,11 @@ case $host in
+@@ -7832,11 +7472,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9748,13 +10449,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -7767,12 +7380,12 @@ ia64-*-hpux*)
+@@ -7850,12 +7490,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7770 "configure"' > conftest.$ac_ext
+- echo '#line 7853 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7383 "configure"' > conftest.$ac_ext
++ echo '#line 7493 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9765,7 +10466,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -7806,11 +7419,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
+@@ -7889,11 +7529,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9780,7 +10481,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -7859,9 +7472,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -7942,9 +7582,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -9792,7 +10493,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -7870,11 +7483,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -7953,11 +7593,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9805,7 +10506,7 @@
/* end confdefs.h. */
int
-@@ -7885,38 +7494,13 @@ main ()
+@@ -7968,38 +7604,13 @@ main ()
return 0;
}
_ACEOF
@@ -9848,7 +10549,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7924,7 +7508,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -8007,7 +7618,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -9857,7 +10558,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -7934,11 +7518,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -8017,11 +7628,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9872,7 +10573,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -7964,9 +7548,9 @@ need_locks="$enable_libtool_lock"
+@@ -8047,9 +7658,9 @@ need_locks="$enable_libtool_lock"
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -9884,7 +10585,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -7977,24 +7561,24 @@ for as_dir in $PATH
+@@ -8060,24 +7671,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9914,7 +10615,7 @@
$as_echo "no" >&6; }
fi
-@@ -8004,9 +7588,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -8087,9 +7698,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -9926,7 +10627,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8017,24 +7601,24 @@ for as_dir in $PATH
+@@ -8100,24 +7711,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9956,7 +10657,7 @@
$as_echo "no" >&6; }
fi
-@@ -8043,7 +7627,7 @@ fi
+@@ -8126,7 +7737,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9965,7 +10666,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8056,9 +7640,9 @@ fi
+@@ -8139,9 +7750,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -9977,7 +10678,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8069,24 +7653,24 @@ for as_dir in $PATH
+@@ -8152,24 +7763,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10007,7 +10708,7 @@
$as_echo "no" >&6; }
fi
-@@ -8096,9 +7680,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -8179,9 +7790,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -10019,7 +10720,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8109,24 +7693,24 @@ for as_dir in $PATH
+@@ -8192,24 +7803,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10049,7 +10750,7 @@
$as_echo "no" >&6; }
fi
-@@ -8135,7 +7719,7 @@ fi
+@@ -8218,7 +7829,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10058,7 +10759,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8148,9 +7732,9 @@ fi
+@@ -8231,9 +7842,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -10070,7 +10771,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8161,24 +7745,24 @@ for as_dir in $PATH
+@@ -8244,24 +7855,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10100,7 +10801,7 @@
$as_echo "no" >&6; }
fi
-@@ -8188,9 +7772,9 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -8271,9 +7882,9 @@ if test -z "$ac_cv_prog_LIPO"; then
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -10112,7 +10813,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8201,24 +7785,24 @@ for as_dir in $PATH
+@@ -8284,24 +7895,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10142,7 +10843,7 @@
$as_echo "no" >&6; }
fi
-@@ -8227,7 +7811,7 @@ fi
+@@ -8310,7 +7921,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10151,7 +10852,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8240,9 +7824,9 @@ fi
+@@ -8323,9 +7934,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -10163,7 +10864,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8253,24 +7837,24 @@ for as_dir in $PATH
+@@ -8336,24 +7947,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10193,7 +10894,7 @@
$as_echo "no" >&6; }
fi
-@@ -8280,9 +7864,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -8363,9 +7974,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -10205,7 +10906,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8293,24 +7877,24 @@ for as_dir in $PATH
+@@ -8376,24 +7987,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10235,7 +10936,7 @@
$as_echo "no" >&6; }
fi
-@@ -8319,7 +7903,7 @@ fi
+@@ -8402,7 +8013,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10244,7 +10945,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8332,9 +7916,9 @@ fi
+@@ -8415,9 +8026,9 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -10256,7 +10957,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8345,24 +7929,24 @@ for as_dir in $PATH
+@@ -8428,24 +8039,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10286,7 +10987,7 @@
$as_echo "no" >&6; }
fi
-@@ -8372,9 +7956,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -8455,9 +8066,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -10298,7 +10999,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -8385,24 +7969,24 @@ for as_dir in $PATH
+@@ -8468,24 +8079,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10328,7 +11029,7 @@
$as_echo "no" >&6; }
fi
-@@ -8411,7 +7995,7 @@ fi
+@@ -8494,7 +8105,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10337,7 +11038,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8447,9 +8031,9 @@ fi
+@@ -8530,9 +8141,9 @@ fi
@@ -10349,7 +11050,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -8474,22 +8058,18 @@ else
+@@ -8557,22 +8168,18 @@ else
rm -f conftest.*
fi
fi
@@ -10376,7 +11077,7 @@
/* end confdefs.h. */
int
-@@ -8500,42 +8080,17 @@ main ()
+@@ -8583,42 +8190,17 @@ main ()
return 0;
}
_ACEOF
@@ -10424,7 +11125,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -8573,69 +8128,14 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -8656,69 +8238,14 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
esac
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
@@ -10500,7 +11201,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -8645,62 +8145,13 @@ fi
+@@ -8728,62 +8255,13 @@ fi
done
@@ -10568,7 +11269,7 @@
_ACEOF
fi
-@@ -8720,7 +8171,7 @@ done
+@@ -8803,7 +8281,7 @@ done
# Check whether --enable-shared was given.
@@ -10577,7 +11278,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -8751,7 +8202,7 @@ fi
+@@ -8834,7 +8312,7 @@ fi
# Check whether --enable-static was given.
@@ -10586,7 +11287,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -8783,7 +8234,7 @@ fi
+@@ -8866,7 +8344,7 @@ fi
# Check whether --with-pic was given.
@@ -10595,7 +11296,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -8799,7 +8250,7 @@ test -z "$pic_mode" && pic_mode=default
+@@ -8882,7 +8360,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
@@ -10604,7 +11305,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -8880,9 +8331,9 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -8963,9 +8441,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -10616,7 +11317,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -8895,7 +8346,7 @@ else
+@@ -8978,7 +8456,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -10625,7 +11326,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -8988,9 +8439,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -9071,9 +8549,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -10637,7 +11338,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9041,10 +8492,10 @@ fi
+@@ -9124,10 +8602,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10650,7 +11351,7 @@
$as_echo "no" >&6; }
fi
-@@ -9054,9 +8505,9 @@ fi
+@@ -9137,9 +8615,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -10662,7 +11363,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9107,10 +8558,10 @@ fi
+@@ -9190,10 +8668,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10675,7 +11376,7 @@
$as_echo "no" >&6; }
fi
-@@ -9191,9 +8642,9 @@ lt_prog_compiler_no_builtin_flag=
+@@ -9274,9 +8752,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -10687,21 +11388,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9209,11 +8660,11 @@ else
+@@ -9292,11 +8770,11 @@ else
-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:9212: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8663: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9295: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8773: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9216: \$? = $ac_status" >&5
-+ echo "$as_me:8667: \$? = $ac_status" >&5
+- echo "$as_me:9299: \$? = $ac_status" >&5
++ echo "$as_me:8777: \$? = $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.
-@@ -9226,7 +8677,7 @@ else
+@@ -9309,7 +8787,7 @@ else
$RM conftest*
fi
@@ -10710,7 +11411,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9246,7 +8697,7 @@ fi
+@@ -9329,7 +8807,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -10719,7 +11420,16 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9518,7 +8969,7 @@ case $host_os in
+@@ -9461,7 +8939,7 @@ $as_echo_n "checking for $compiler optio
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -9601,7 +9079,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -10728,7 +11438,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -9530,9 +8981,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -9613,9 +9091,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -10740,21 +11450,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -9548,11 +8999,11 @@ else
+@@ -9631,11 +9109,11 @@ else
-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:9551: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9002: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9634: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9112: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9555: \$? = $ac_status" >&5
-+ echo "$as_me:9006: \$? = $ac_status" >&5
+- echo "$as_me:9638: \$? = $ac_status" >&5
++ echo "$as_me:9116: \$? = $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.
-@@ -9565,7 +9016,7 @@ else
+@@ -9648,7 +9126,7 @@ else
$RM conftest*
fi
@@ -10763,7 +11473,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -9589,9 +9040,9 @@ fi
+@@ -9672,9 +9150,9 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -10775,7 +11485,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -9617,7 +9068,7 @@ else
+@@ -9700,7 +9178,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -10784,7 +11494,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -9632,9 +9083,9 @@ fi
+@@ -9715,9 +9193,9 @@ fi
@@ -10796,21 +11506,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9653,11 +9104,11 @@ else
+@@ -9736,11 +9214,11 @@ else
-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:9656: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9107: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9739: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9217: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9660: \$? = $ac_status" >&5
-+ echo "$as_me:9111: \$? = $ac_status" >&5
+- echo "$as_me:9743: \$? = $ac_status" >&5
++ echo "$as_me:9221: \$? = $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
-@@ -9679,7 +9130,7 @@ else
+@@ -9762,7 +9240,7 @@ else
$RM conftest*
fi
@@ -10819,7 +11529,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9687,9 +9138,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -9770,9 +9248,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
@@ -10831,21 +11541,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9708,11 +9159,11 @@ else
+@@ -9791,11 +9269,11 @@ else
-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:9711: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9162: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9794: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9272: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9715: \$? = $ac_status" >&5
-+ echo "$as_me:9166: \$? = $ac_status" >&5
+- echo "$as_me:9798: \$? = $ac_status" >&5
++ echo "$as_me:9276: \$? = $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
-@@ -9734,7 +9185,7 @@ else
+@@ -9817,7 +9295,7 @@ else
$RM conftest*
fi
@@ -10854,7 +11564,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9743,7 +9194,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -9826,7 +9304,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -10863,7 +11573,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -9751,10 +9202,10 @@ $as_echo_n "checking if we can lock with
+@@ -9834,10 +9312,10 @@ $as_echo_n "checking if we can lock with
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -10876,7 +11586,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -9767,7 +9218,7 @@ fi
+@@ -9850,7 +9328,7 @@ fi
@@ -10885,7 +11595,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -9827,6 +9278,9 @@ $as_echo_n "checking whether the $compil
+@@ -9910,6 +9388,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -10895,7 +11605,24 @@
esac
ld_shlibs=yes
-@@ -10009,7 +9463,7 @@ _LT_EOF
+@@ -9931,6 +9412,7 @@ $as_echo_n "checking whether the $compil
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -10022,7 +9504,7 @@ _LT_EOF
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -10092,7 +9574,7 @@ _LT_EOF
fi
;;
@@ -10904,7 +11631,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10184,6 +9638,7 @@ _LT_EOF
+@@ -10267,6 +9749,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10912,7 +11639,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10209,11 +9664,7 @@ _LT_EOF
+@@ -10292,11 +9775,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10925,7 +11652,7 @@
/* end confdefs.h. */
int
-@@ -10224,27 +9675,7 @@ main ()
+@@ -10307,27 +9786,7 @@ main ()
return 0;
}
_ACEOF
@@ -10954,7 +11681,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10258,16 +9689,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10341,16 +9800,9 @@ aix_libpath=`dump -H conftest$ac_exeext
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -10973,7 +11700,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10280,11 +9704,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10363,11 +9815,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10986,7 +11713,7 @@
/* end confdefs.h. */
int
-@@ -10295,27 +9715,7 @@ main ()
+@@ -10378,27 +9826,7 @@ main ()
return 0;
}
_ACEOF
@@ -11015,7 +11742,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10329,16 +9729,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10412,16 +9840,9 @@ aix_libpath=`dump -H conftest$ac_exeext
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -11034,7 +11761,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10550,42 +9943,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10633,42 +10054,16 @@ if test -z "$aix_libpath"; then aix_libp
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -11082,7 +11809,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10598,7 +9965,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10681,7 +10076,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -11091,7 +11818,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10841,7 +10208,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10924,7 +10319,7 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -11100,7 +11827,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -10878,16 +10245,16 @@ x|xyes)
+@@ -10961,16 +10356,16 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -11121,7 +11848,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -10901,11 +10268,11 @@ $as_echo_n "checking whether -lc should
+@@ -10984,11 +10379,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -11136,7 +11863,7 @@
then
archive_cmds_need_lc=no
else
-@@ -10916,7 +10283,7 @@ $as_echo_n "checking whether -lc should
+@@ -10999,7 +10394,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -11145,7 +11872,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11080,7 +10447,7 @@ esac
+@@ -11163,7 +10558,7 @@ esac
@@ -11154,7 +11881,16 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11502,11 +10869,7 @@ linux* | k*bsd*-gnu)
+@@ -11571,7 +10966,7 @@ linux*oldld* | linux*aout* | linux*coff*
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -11585,11 +10980,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -11167,7 +11903,7 @@
/* end confdefs.h. */
int
-@@ -11517,41 +10880,13 @@ main ()
+@@ -11600,41 +10991,13 @@ main ()
return 0;
}
_ACEOF
@@ -11213,10 +11949,12 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -11575,6 +10910,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11658,8 +11021,20 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
+-netbsd*)
+- version_type=sunos
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -11229,10 +11967,12 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
- netbsd*)
- version_type=sunos
++netbsd*)
++ version_type=sunos
need_lib_prefix=no
-@@ -11763,7 +11110,7 @@ uts4*)
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+@@ -11846,7 +11221,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -11241,7 +11981,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -11865,7 +11212,7 @@ fi
+@@ -11948,7 +11323,7 @@ fi
@@ -11250,7 +11990,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -11890,7 +11237,7 @@ else
+@@ -11973,7 +11348,7 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -11259,7 +11999,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -11935,18 +11282,14 @@ else
+@@ -12018,18 +11393,14 @@ else
darwin*)
# if libdl is installed we need to link against it
@@ -11281,7 +12021,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11964,43 +11307,18 @@ return dlopen ();
+@@ -12047,43 +11418,18 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11331,31 +12071,21 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12013,33 +11331,19 @@ fi
+@@ -12096,106 +11442,18 @@ fi
;;
*)
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load"
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
@@ -11372,13 +12102,14 @@
-#endif
-
-#undef shl_load
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -12048,13 +11352,6 @@ cat >>conftest.$ac_ext <<_ACEOF
- extern "C"
- #endif
- char shl_load ();
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
@@ -11386,10 +12117,73 @@
-choke me
-#endif
-
- int
- main ()
- {
-@@ -12063,56 +11360,32 @@ return shl_load ();
+-int
+-main ()
+-{
+-return shl_load ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_shl_load=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_shl_load=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-$as_echo "$ac_cv_func_shl_load" >&6; }
+-if test "x$ac_cv_func_shl_load" = x""yes; then
++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
++if test "x$ac_cv_func_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load"
+ else
+- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12213,145 +11471,32 @@ return shl_load ();
return 0;
}
_ACEOF
@@ -11414,102 +12208,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_shl_load=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dld_shl_load=yes
+ ac_cv_lib_dld_shl_load=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_func_shl_load=no
+- ac_cv_lib_dld_shl_load=no
+ ac_cv_lib_dld_shl_load=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--$as_echo "$ac_cv_func_shl_load" >&6; }
--if test "x$ac_cv_func_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
-- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--$as_echo_n "checking for shl_load in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen"
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-ldl $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -12121,222 +11394,37 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char shl_load ();
-+char dlopen ();
- int
- main ()
- {
--return shl_load ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_dld_shl_load=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_dld_shl_load=no
-+ ac_cv_lib_dl_dlopen=no
fi
-
-rm -rf conftest.dSYM
@@ -11520,22 +12226,17 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -11617,37 +12318,32 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
-- lt_cv_dlopen="dlopen"
--else
++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
++if test "x$ac_cv_func_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen"
+ else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char dlopen ();
--int
--main ()
--{
--return dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12369,57 +11514,28 @@ return dlopen ();
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -11669,43 +12365,49 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dl_dlopen=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
--fi
++ ac_cv_lib_dl_dlopen=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--$as_echo_n "checking for dlopen in -lsvld... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsvld $LIBS"
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12354,57 +11442,28 @@ return dlopen ();
+@@ -12437,57 +11553,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11772,7 +12474,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12422,43 +11481,18 @@ return dld_link ();
+@@ -12505,43 +11592,18 @@ return dld_link ();
return 0;
}
_ACEOF
@@ -11822,7 +12524,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12497,9 +11531,9 @@ fi
+@@ -12580,9 +11642,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -11834,16 +12536,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12508,7 +11542,7 @@ else
+@@ -12591,7 +11653,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12511 "configure"
-+#line 11545 "configure"
+-#line 12594 "configure"
++#line 11656 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12567,11 +11601,11 @@ int main ()
+@@ -12650,11 +11712,11 @@ int main ()
return status;
}
_LT_EOF
@@ -11858,7 +12560,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12588,14 +11622,14 @@ rm -fr conftest*
+@@ -12671,14 +11733,14 @@ rm -fr conftest*
fi
@@ -11876,16 +12578,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12604,7 +11638,7 @@ else
+@@ -12687,7 +11749,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12607 "configure"
-+#line 11641 "configure"
+-#line 12690 "configure"
++#line 11752 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12663,11 +11697,11 @@ int main ()
+@@ -12746,11 +11808,11 @@ int main ()
return status;
}
_LT_EOF
@@ -11900,7 +12602,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12684,7 +11718,7 @@ rm -fr conftest*
+@@ -12767,7 +11829,7 @@ rm -fr conftest*
fi
@@ -11909,7 +12611,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -12723,12 +11757,12 @@ fi
+@@ -12806,12 +11868,12 @@ fi
striplib=
old_striplib=
@@ -11924,7 +12626,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -12737,15 +11771,15 @@ else
+@@ -12820,15 +11882,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -11943,7 +12645,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -12763,12 +11797,12 @@ fi
+@@ -12846,12 +11908,12 @@ fi
# Report which library types will actually be built
@@ -11959,7 +12661,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -12789,14 +11823,14 @@ $as_echo_n "checking whether to build sh
+@@ -12872,14 +11934,14 @@ $as_echo_n "checking whether to build sh
fi
;;
esac
@@ -11977,7 +12679,7 @@
$as_echo "$enable_static" >&6; }
-@@ -12833,9 +11867,9 @@ CC="$lt_save_CC"
+@@ -12916,9 +11978,9 @@ CC="$lt_save_CC"
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -11989,7 +12691,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -12848,14 +11882,14 @@ for as_dir in $PATH
+@@ -12931,14 +11993,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12007,7 +12709,7 @@
IFS=$as_save_IFS
;;
-@@ -12863,10 +11897,10 @@ esac
+@@ -12946,10 +12008,10 @@ esac
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -12020,7 +12722,7 @@
$as_echo "no" >&6; }
fi
-@@ -12892,7 +11926,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+@@ -12975,7 +12037,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
# Check whether --enable-compile-warnings was given.
@@ -12029,7 +12731,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -12923,13 +11957,9 @@ fi
+@@ -13006,13 +12068,9 @@ fi
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -12045,7 +12747,7 @@
/* end confdefs.h. */
int
-@@ -12940,35 +11970,14 @@ main ()
+@@ -13023,35 +12081,14 @@ main ()
return 0;
}
_ACEOF
@@ -12084,7 +12786,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -12982,26 +11991,24 @@ $as_echo "$has_option" >&6; }
+@@ -13065,26 +12102,24 @@ $as_echo "$has_option" >&6; }
fi
;;
*)
@@ -12116,7 +12818,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -13016,7 +12023,7 @@ $as_echo_n "checking what language compl
+@@ -13099,7 +12134,7 @@ $as_echo_n "checking what language compl
esac
fi
fi
@@ -12125,7 +12827,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -13024,7 +12031,7 @@ $as_echo "$complCFLAGS" >&6; }
+@@ -13107,7 +12142,7 @@ $as_echo "$complCFLAGS" >&6; }
# Check whether --enable-deprecations was given.
@@ -12134,7 +12836,7 @@
enableval=$enable_deprecations;
else
enable_deprecations=no
-@@ -13048,9 +12055,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
+@@ -13130,9 +12165,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -12146,7 +12848,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13063,14 +12070,14 @@ for as_dir in $PATH
+@@ -13145,14 +12180,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12164,7 +12866,7 @@
IFS=$as_save_IFS
;;
-@@ -13078,10 +12085,10 @@ esac
+@@ -13160,10 +12195,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -12177,7 +12879,7 @@
$as_echo "no" >&6; }
fi
-@@ -13091,9 +12098,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -13173,9 +12208,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -12189,7 +12891,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -13106,14 +12113,14 @@ for as_dir in $PATH
+@@ -13188,14 +12223,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12207,7 +12909,7 @@
IFS=$as_save_IFS
;;
-@@ -13121,10 +12128,10 @@ esac
+@@ -13203,10 +12238,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -12220,7 +12922,7 @@
$as_echo "no" >&6; }
fi
-@@ -13133,7 +12140,7 @@ fi
+@@ -13215,7 +12250,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12229,7 +12931,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -13146,13 +12153,13 @@ fi
+@@ -13228,13 +12263,13 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -12246,7 +12948,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -13161,70 +12168,68 @@ fi
+@@ -13243,70 +12278,68 @@ fi
pkg_failed=no
@@ -12342,7 +13044,7 @@
fi
-@@ -13237,44 +12242,25 @@ else
+@@ -13319,44 +12352,25 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12392,7 +13094,7 @@
) were not met:
$GNOME_SESSION_PKG_ERRORS
-@@ -13285,22 +12271,11 @@ installed software in a non-standard pre
+@@ -13367,22 +12381,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables GNOME_SESSION_CFLAGS
and GNOME_SESSION_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12418,7 +13120,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -13309,64 +12284,73 @@ and GNOME_SESSION_LIBS to avoid the need
+@@ -13391,64 +12394,73 @@ and GNOME_SESSION_LIBS to avoid the need
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12445,14 +13147,15 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED
+- gtk+-2.0 >= \$GTK_REQUIRED
+-\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SESSION_PROPERTIES_CFLAGS"; then
+ pkg_cv_SESSION_PROPERTIES_CFLAGS="$SESSION_PROPERTIES_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED
- gtk+-2.0 >= \$GTK_REQUIRED
--\"") >&5
++ gtk+-2.0 >= \$GTK_REQUIRED
+ dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
+\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
@@ -12516,7 +13219,7 @@
fi
-@@ -13379,32 +12363,22 @@ else
+@@ -13461,32 +12473,22 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12557,7 +13260,7 @@
) were not met:
$SESSION_PROPERTIES_PKG_ERRORS
-@@ -13415,22 +12389,11 @@ installed software in a non-standard pre
+@@ -13497,22 +12499,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables SESSION_PROPERTIES_CFLAGS
and SESSION_PROPERTIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12583,7 +13286,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -13439,38 +12402,38 @@ and SESSION_PROPERTIES_LIBS to avoid the
+@@ -13521,38 +12512,38 @@ and SESSION_PROPERTIES_LIBS to avoid the
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12634,7 +13337,7 @@
pkg_cv_SPLASH_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
-@@ -13479,26 +12442,28 @@ if test -n "$SPLASH_CFLAGS"; then
+@@ -13561,26 +12552,28 @@ if test -n "$SPLASH_CFLAGS"; then
else
pkg_failed=yes
fi
@@ -12673,7 +13376,7 @@
pkg_cv_SPLASH_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
-@@ -13507,8 +12472,9 @@ if test -n "$SPLASH_LIBS"; then
+@@ -13589,8 +12582,9 @@ if test -n "$SPLASH_LIBS"; then
else
pkg_failed=yes
fi
@@ -12685,7 +13388,7 @@
fi
-@@ -13521,37 +12487,22 @@ else
+@@ -13603,37 +12597,22 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12728,7 +13431,7 @@
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
libstartup-notification-1.0
-@@ -13565,22 +12516,11 @@ installed software in a non-standard pre
+@@ -13647,22 +12626,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables SPLASH_CFLAGS
and SPLASH_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12754,7 +13457,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -13589,58 +12529,61 @@ and SPLASH_LIBS to avoid the need to cal
+@@ -13671,58 +12639,61 @@ and SPLASH_LIBS to avoid the need to cal
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12840,7 +13543,7 @@
fi
-@@ -13653,16 +12596,16 @@ else
+@@ -13735,28 +12706,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12858,54 +13561,49 @@
echo "$COMPAT_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
+- dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+-
+-$COMPAT_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 COMPAT_CFLAGS
+-and COMPAT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
+ as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
$COMPAT_PKG_ERRORS
-@@ -13673,88 +12616,68 @@ installed software in a non-standard pre
+@@ -13767,22 +12726,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables COMPAT_CFLAGS
and COMPAT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
-- dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
--
--$COMPAT_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
+-" >&2;}
+- { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: 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 COMPAT_CFLAGS
-and COMPAT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: 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 COMPAT_CFLAGS
--and COMPAT_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." >&5
-$as_echo "$as_me: 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.
-+" "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+ { { $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 COMPAT_CFLAGS
- and COMPAT_LIBS to avoid the need to call pkg-config.
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -13791,52 +12739,55 @@ and COMPAT_LIBS to avoid the need to cal
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12983,7 +13681,7 @@
fi
-@@ -13767,25 +12690,14 @@ else
+@@ -13849,25 +12800,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13012,7 +13710,7 @@
$SM_PKG_ERRORS
-@@ -13795,22 +12707,11 @@ installed software in a non-standard pre
+@@ -13877,22 +12817,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables SM_CFLAGS
and SM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13038,7 +13736,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -13819,51 +12720,54 @@ and SM_LIBS to avoid the need to call pk
+@@ -13901,51 +12830,54 @@ and SM_LIBS to avoid the need to call pk
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13115,7 +13813,7 @@
fi
-@@ -13876,25 +12780,14 @@ else
+@@ -13958,25 +12890,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13144,7 +13842,7 @@
$ICE_PKG_ERRORS
-@@ -13904,22 +12797,11 @@ installed software in a non-standard pre
+@@ -13986,22 +12907,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables ICE_CFLAGS
and ICE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13170,7 +13868,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -13928,52 +12810,55 @@ and ICE_LIBS to avoid the need to call p
+@@ -14010,52 +12920,55 @@ and ICE_LIBS to avoid the need to call p
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13248,7 +13946,7 @@
fi
-@@ -13986,25 +12871,14 @@ else
+@@ -14068,25 +12981,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13277,7 +13975,7 @@
$DBUS_GLIB_PKG_ERRORS
-@@ -14014,22 +12888,11 @@ installed software in a non-standard pre
+@@ -14096,22 +12998,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13303,7 +14001,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14038,51 +12901,54 @@ and DBUS_GLIB_LIBS to avoid the need to
+@@ -14120,51 +13011,54 @@ and DBUS_GLIB_LIBS to avoid the need to
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13380,7 +14078,7 @@
fi
-@@ -14095,25 +12961,14 @@ else
+@@ -14177,25 +13071,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13409,7 +14107,7 @@
$GCONF_PKG_ERRORS
-@@ -14123,22 +12978,11 @@ installed software in a non-standard pre
+@@ -14205,22 +13088,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables GCONF_CFLAGS
and GCONF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13435,7 +14133,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14147,52 +12991,55 @@ and GCONF_LIBS to avoid the need to call
+@@ -14229,52 +13101,55 @@ and GCONF_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13513,7 +14211,7 @@
fi
-@@ -14205,25 +13052,14 @@ else
+@@ -14287,25 +13162,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13542,7 +14240,7 @@
$EGG_SMCLIENT_PKG_ERRORS
-@@ -14233,22 +13069,11 @@ installed software in a non-standard pre
+@@ -14315,22 +13179,11 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -13568,7 +14266,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14257,20 +13082,102 @@ and EGG_SMCLIENT_LIBS to avoid the need
+@@ -14339,60 +13192,142 @@ and EGG_SMCLIENT_LIBS to avoid the need
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13586,11 +14284,22 @@
-+
+-# Check whether --with-default-wm was given.
+-if test "${with_default_wm+set}" = set; then
+- withval=$with_default_wm;
+-else
+- with_default_wm="metacity"
+-fi
+-
+
+-DEFAULT_WM=$with_default_wm
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVKIT_POWER" >&5
+$as_echo_n "checking for DEVKIT_POWER... " >&6; }
-+
+
+- if test x$with_default_wm = xgnome-wm; then
+- USE_GNOME_WM_TRUE=
+- USE_GNOME_WM_FALSE='#'
+if test -n "$PKG_CONFIG"; then
+ if test -n "$DEVKIT_POWER_CFLAGS"; then
+ pkg_cv_DEVKIT_POWER_CFLAGS="$DEVKIT_POWER_CFLAGS"
@@ -13602,13 +14311,26 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DEVKIT_POWER_CFLAGS=`$PKG_CONFIG --cflags "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>/dev/null`
-+else
+ else
+- USE_GNOME_WM_TRUE='#'
+- USE_GNOME_WM_FALSE=
+ pkg_failed=yes
-+fi
+ fi
+-
+-
+-# Check whether --enable-splash was given.
+-if test "${enable_splash+set}" = set; then
+- enableval=$enable_splash;
+ fi
-+else
+ else
+- enable_splash=no
+ pkg_failed=untried
-+fi
+ fi
+-
+-
+- if test x$enable_splash = xyes; then
+- ENABLE_SPLASH_TRUE=
+- ENABLE_SPLASH_FALSE='#'
+if test -n "$PKG_CONFIG"; then
+ if test -n "$DEVKIT_POWER_LIBS"; then
+ pkg_cv_DEVKIT_POWER_LIBS="$DEVKIT_POWER_LIBS"
@@ -13620,15 +14342,23 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DEVKIT_POWER_LIBS=`$PKG_CONFIG --libs "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED" 2>/dev/null`
-+else
+ else
+- ENABLE_SPLASH_TRUE='#'
+- ENABLE_SPLASH_FALSE=
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
-+fi
-+
-+
+ fi
+
+
+-# Extract the first word of "gconftool-2", so it can be a program name with args.
+-set dummy gconftool-2; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GCONFTOOL+set}" = set; then
+- $as_echo_n "(cached) " >&6
+
+if test $pkg_failed = yes; then
+
@@ -13669,34 +14399,52 @@
+
+
+
- # Check whether --with-default-wm was given.
--if test "${with_default_wm+set}" = set; then
++# Check whether --with-default-wm was given.
+if test "${with_default_wm+set}" = set; then :
- withval=$with_default_wm;
- else
- with_default_wm="metacity"
-@@ -14289,7 +13196,7 @@ fi
-
-
- # Check whether --enable-splash was given.
--if test "${enable_splash+set}" = set; then
++ withval=$with_default_wm;
++else
++ with_default_wm="metacity"
++fi
++
++
++DEFAULT_WM=$with_default_wm
++
++ if test x$with_default_wm = xgnome-wm; then
++ USE_GNOME_WM_TRUE=
++ USE_GNOME_WM_FALSE='#'
++else
++ USE_GNOME_WM_TRUE='#'
++ USE_GNOME_WM_FALSE=
++fi
++
++
++# Check whether --enable-splash was given.
+if test "${enable_splash+set}" = set; then :
- enableval=$enable_splash;
- else
- enable_splash=no
-@@ -14307,9 +13214,9 @@ fi
-
- # Extract the first word of "gconftool-2", so it can be a program name with args.
- set dummy gconftool-2; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++ enableval=$enable_splash;
++else
++ enable_splash=no
++fi
++
++
++ if test x$enable_splash = xyes; then
++ ENABLE_SPLASH_TRUE=
++ ENABLE_SPLASH_FALSE='#'
++else
++ ENABLE_SPLASH_TRUE='#'
++ ENABLE_SPLASH_FALSE=
++fi
++
++
++# Extract the first word of "gconftool-2", so it can be a program name with args.
++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 test "${ac_cv_path_GCONFTOOL+set}" = set; then
++$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
- $as_echo_n "(cached) " >&6
++ $as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -14322,14 +13229,14 @@ for as_dir in $PATH
+ [\\/]* | ?:[\\/]*)
+@@ -14404,14 +13339,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13714,7 +14462,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -14338,18 +13245,16 @@ esac
+@@ -14420,18 +13355,16 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -13736,7 +14484,7 @@
fi
-@@ -14361,13 +13266,13 @@ fi
+@@ -14443,13 +13376,13 @@ fi
# Check whether --with-gconf-source was given.
@@ -13752,7 +14500,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -14376,22 +13281,20 @@ $as_echo "Using config source $GCONF_SCH
+@@ -14458,22 +13391,20 @@ $as_echo "Using config source $GCONF_SCH
# Check whether --with-gconf-schema-file-dir was given.
@@ -13779,7 +14527,7 @@
esac
fi
-@@ -14413,9 +13316,9 @@ fi
+@@ -14495,9 +13426,9 @@ fi
# Extract the first word of "gconf-sanity-check-2", so it can be a program name with args.
set dummy gconf-sanity-check-2; ac_word=$2
@@ -13791,7 +14539,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONF_SANITY_CHECK in
-@@ -14428,14 +13331,14 @@ for as_dir in $PATH
+@@ -14510,14 +13441,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13809,7 +14557,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONF_SANITY_CHECK" && ac_cv_path_GCONF_SANITY_CHECK="no"
-@@ -14444,18 +13347,16 @@ esac
+@@ -14526,18 +13457,16 @@ esac
fi
GCONF_SANITY_CHECK=$ac_cv_path_GCONF_SANITY_CHECK
if test -n "$GCONF_SANITY_CHECK"; then
@@ -13831,7 +14579,7 @@
fi
-@@ -14480,12 +13381,12 @@ case x_libs in
+@@ -14562,12 +13491,12 @@ case x_libs in
esac
if test $pango_omitted_x_deps = yes ; then
@@ -13846,7 +14594,7 @@
withval=$with_x;
fi
-@@ -14495,10 +13396,8 @@ if test "x$with_x" = xno; then
+@@ -14577,10 +13506,8 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -13859,7 +14607,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -14546,21 +13445,25 @@ fi
+@@ -14628,21 +13555,25 @@ fi
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -13885,7 +14633,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -14582,37 +13485,14 @@ ac_x_header_dirs='
+@@ -14664,37 +13595,14 @@ ac_x_header_dirs='
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
@@ -13925,7 +14673,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -14620,7 +13500,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -14702,7 +13610,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
done
fi
@@ -13933,7 +14681,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -14630,11 +13509,7 @@ if test "$ac_x_libraries" = no; then
+@@ -14712,11 +13619,7 @@ if test "$ac_x_libraries" = no; then
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -13946,7 +14694,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -14645,35 +13520,12 @@ XrmInitialize ()
+@@ -14727,35 +13630,12 @@ XrmInitialize ()
return 0;
}
_ACEOF
@@ -13984,7 +14732,7 @@
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
-@@ -14685,10 +13537,8 @@ do
+@@ -14767,10 +13647,8 @@ do
done
done
fi
@@ -13997,7 +14745,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -14709,7 +13559,7 @@ fi
+@@ -14791,7 +13669,7 @@ fi
fi # $with_x != no
if test "$have_x" != yes; then
@@ -14006,7 +14754,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -14720,16 +13570,14 @@ else
+@@ -14802,16 +13680,14 @@ else
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -14025,7 +14773,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -14742,16 +13590,12 @@ else
+@@ -14824,16 +13700,12 @@ else
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -14044,7 +14792,7 @@
/* end confdefs.h. */
int
-@@ -14762,40 +13606,13 @@ main ()
+@@ -14844,40 +13716,13 @@ main ()
return 0;
}
_ACEOF
@@ -14089,7 +14837,7 @@
/* end confdefs.h. */
int
-@@ -14806,46 +13623,19 @@ main ()
+@@ -14888,46 +13733,19 @@ main ()
return 0;
}
_ACEOF
@@ -14143,7 +14891,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -14861,11 +13651,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -14943,11 +13761,7 @@ rm -f core conftest.err conftest.$ac_obj
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
@@ -14156,7 +14904,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14883,44 +13669,17 @@ return XOpenDisplay ();
+@@ -14965,44 +13779,17 @@ return XOpenDisplay ();
return 0;
}
_ACEOF
@@ -14206,7 +14954,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14938,59 +13697,30 @@ return dnet_ntoa ();
+@@ -15020,59 +13807,30 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -14275,7 +15023,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15008,52 +13738,25 @@ return dnet_ntoa ();
+@@ -15090,52 +13848,25 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -14336,7 +15084,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -15064,105 +13767,20 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -15146,105 +13877,20 @@ rm -f core conftest.err conftest.$ac_obj
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -14359,9 +15107,7 @@
- which can conflict with char gethostbyname (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-
+-
-#ifdef __STDC__
-# include <limits.h>
-#else
@@ -14420,7 +15166,9 @@
-
- ac_cv_func_gethostbyname=no
-fi
--
++ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -14447,7 +15195,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15180,59 +13798,30 @@ return gethostbyname ();
+@@ -15262,59 +13908,30 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -14516,7 +15264,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15250,43 +13839,18 @@ return gethostbyname ();
+@@ -15332,43 +13949,18 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -14566,33 +15314,21 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -15300,33 +13864,21 @@ fi
+@@ -15382,105 +13974,20 @@ fi
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
- { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+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 test "${ac_cv_lib_socket_connect+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define connect innocuous_connect
@@ -14609,13 +15345,14 @@
-#endif
-
-#undef connect
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -15335,13 +13887,6 @@ cat >>conftest.$ac_ext <<_ACEOF
- extern "C"
- #endif
- char connect ();
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char connect ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
@@ -14623,10 +15360,72 @@
-choke me
-#endif
-
- int
- main ()
- {
-@@ -15350,55 +13895,38 @@ return connect ();
+-int
+-main ()
+-{
+-return connect ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_connect=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_connect=no
+-fi
++ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-$as_echo "$ac_cv_func_connect" >&6; }
+
+ if test $ac_cv_func_connect = no; then
+- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+ $as_echo_n "checking for connect in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_connect+set}" = set; then
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -15498,148 +14005,38 @@ return connect ();
return 0;
}
_ACEOF
@@ -14651,106 +15450,14 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_func_connect=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_socket_connect=yes
+ ac_cv_lib_socket_connect=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_func_connect=no
+- ac_cv_lib_socket_connect=no
+ ac_cv_lib_socket_connect=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
-+{ $as_echo "$as_me:${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" = x""yes; then :
-+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-+fi
-+
-+ fi
-+
-+ # 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" = x""yes; then :
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--$as_echo "$ac_cv_func_connect" >&6; }
-
-- if test $ac_cv_func_connect = no; then
-- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--$as_echo_n "checking for connect in -lsocket... " >&6; }
--if test "${ac_cv_lib_socket_connect+set}" = set; then
-+ 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 test "${ac_cv_lib_posix_remove+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lposix $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -15407,85 +13935,48 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char connect ();
-+char remove ();
- int
- main ()
- {
--return connect ();
-+return remove ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_socket_connect=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_posix_remove=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_socket_connect=no
-+ ac_cv_lib_posix_remove=no
fi
-
-rm -rf conftest.dSYM
@@ -14761,42 +15468,27 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--$as_echo "$ac_cv_lib_socket_connect" >&6; }
++{ $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" = x""yes; then
-- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-+{ $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" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
fi
-- # Guillermo Gomez says -lposix is necessary on A/UX.
+ # Guillermo Gomez says -lposix is necessary on A/UX.
- { $as_echo "$as_me:$LINENO: checking for remove" >&5
-$as_echo_n "checking for remove... " >&6; }
-if test "${ac_cv_func_remove+set}" = set; then
-+ # 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" = 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 test "${ac_cv_lib_ipc_shmat+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lipc $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define remove innocuous_remove
@@ -14813,13 +15505,13 @@
-#endif
-
-#undef remove
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -15493,284 +13984,27 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
-char remove ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
@@ -14828,74 +15520,6 @@
-choke me
-#endif
-
-+char shmat ();
- int
- main ()
- {
--return remove ();
-+return shmat ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_remove=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_remove=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--$as_echo "$ac_cv_func_remove" >&6; }
--
-- if test $ac_cv_func_remove = no; then
-- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--$as_echo_n "checking for remove in -lposix... " >&6; }
--if test "${ac_cv_lib_posix_remove+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lposix $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char remove ();
-int
-main ()
-{
@@ -14925,28 +15549,95 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_posix_remove=yes
+- ac_cv_func_remove=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_posix_remove=no
+- ac_cv_func_remove=no
-fi
--
++ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-$as_echo "$ac_cv_func_remove" >&6; }
+
+ if test $ac_cv_func_remove = no; then
+- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+ $as_echo_n "checking for remove in -lposix... " >&6; }
+-if test "${ac_cv_lib_posix_remove+set}" = set; then
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -15657,148 +14054,38 @@ return remove ();
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_posix_remove=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_posix_remove=no
++ ac_cv_lib_posix_remove=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--$as_echo "$ac_cv_lib_posix_remove" >&6; }
++{ $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" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
--fi
--
-- fi
--
-- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
++if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
-if test "${ac_cv_func_shmat+set}" = set; then
@@ -15025,44 +15716,39 @@
-
- ac_cv_func_shmat=no
-fi
--
++ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
++if test "x$ac_cv_func_shmat" = x""yes; then :
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
--
-- if test $ac_cv_func_shmat = no; then
+
+ if test $ac_cv_func_shmat = no; then
- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--$as_echo_n "checking for shmat in -lipc... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+ $as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lipc $LIBS"
++if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char shmat ();
--int
--main ()
--{
--return shmat ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -15816,43 +14103,18 @@ return shmat ();
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -15109,7 +15795,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -15786,18 +14020,14 @@ fi
+@@ -15868,18 +14130,14 @@ fi
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -15131,7 +15817,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15815,43 +14045,18 @@ return IceConnectionNumber ();
+@@ -15897,43 +14155,18 @@ return IceConnectionNumber ();
return 0;
}
_ACEOF
@@ -15181,7 +15867,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -15861,26 +14066,20 @@ fi
+@@ -15943,26 +14176,20 @@ fi
if test x$no_x = xyes ; then
@@ -15212,7 +15898,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15898,50 +14097,22 @@ return XauFileName ();
+@@ -15980,50 +14207,22 @@ return XauFileName ();
return 0;
}
_ACEOF
@@ -15271,7 +15957,7 @@
fi
-@@ -15949,61 +14120,16 @@ fi
+@@ -16031,61 +14230,16 @@ fi
have_xsync=no
@@ -15337,7 +16023,7 @@
fi
-@@ -16011,40 +14137,44 @@ fi
+@@ -16093,40 +14247,44 @@ fi
have_xtest=no
pkg_failed=no
@@ -15401,7 +16087,7 @@
fi
-@@ -16057,14 +14187,14 @@ else
+@@ -16139,14 +14297,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15419,7 +16105,7 @@
$as_echo "no" >&6; }
have_xtest=no
elif test $pkg_failed = untried; then
-@@ -16072,15 +14202,13 @@ elif test $pkg_failed = untried; then
+@@ -16154,15 +14312,13 @@ elif test $pkg_failed = untried; then
else
XTEST_CFLAGS=$pkg_cv_XTEST_CFLAGS
XTEST_LIBS=$pkg_cv_XTEST_LIBS
@@ -15437,7 +16123,7 @@
fi
-@@ -16090,40 +14218,44 @@ fi
+@@ -16172,40 +14328,44 @@ fi
pkg_failed=no
@@ -15501,7 +16187,7 @@
fi
-@@ -16136,14 +14268,14 @@ else
+@@ -16218,14 +14378,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15519,7 +16205,7 @@
$as_echo "no" >&6; }
have_xrender=no
elif test $pkg_failed = untried; then
-@@ -16151,7 +14283,7 @@ elif test $pkg_failed = untried; then
+@@ -16233,7 +14393,7 @@ elif test $pkg_failed = untried; then
else
XRENDER_CFLAGS=$pkg_cv_XRENDER_CFLAGS
XRENDER_LIBS=$pkg_cv_XRENDER_LIBS
@@ -15528,7 +16214,7 @@
$as_echo "yes" >&6; }
have_xrender=yes
fi
-@@ -16165,9 +14297,7 @@ fi
+@@ -16247,9 +14407,7 @@ fi
if test $have_xrender=yes; then
@@ -15539,7 +16225,7 @@
fi
-@@ -16176,7 +14306,7 @@ fi
+@@ -16258,7 +14416,7 @@ fi
# Check whether --enable-docbook-docs was given.
@@ -15548,7 +16234,7 @@
enableval=$enable_docbook_docs; enable_docbook_docs=$enableval
else
enable_docbook_docs=auto
-@@ -16184,9 +14314,9 @@ fi
+@@ -16266,9 +14424,9 @@ fi
# Extract the first word of "xmlto", so it can be a program name with args.
set dummy xmlto; ac_word=$2
@@ -15560,7 +16246,7 @@
$as_echo_n "(cached) " >&6
else
case $XMLTO in
-@@ -16199,14 +14329,14 @@ for as_dir in $PATH
+@@ -16281,14 +14439,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15578,7 +16264,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_XMLTO" && ac_cv_path_XMLTO="no"
-@@ -16215,15 +14345,15 @@ esac
+@@ -16297,15 +14455,15 @@ esac
fi
XMLTO=$ac_cv_path_XMLTO
if test -n "$XMLTO"; then
@@ -15597,7 +16283,7 @@
$as_echo_n "checking whether to build DocBook documentation... " >&6; }
if test x$XMLTO = xno ; then
have_docbook=no
-@@ -16239,9 +14369,7 @@ if test x$enable_docbook_docs = xauto ;
+@@ -16321,9 +14479,7 @@ if test x$enable_docbook_docs = xauto ;
fi
if test x$enable_docbook_docs = xyes; then
if test x$have_docbook = xno; then
@@ -15608,7 +16294,7 @@
fi
fi
if test x$enable_docbook_docs = xyes; then
-@@ -16252,14 +14380,14 @@ else
+@@ -16334,14 +14490,14 @@ else
DOCBOOK_DOCS_ENABLED_FALSE=
fi
@@ -15626,7 +16312,7 @@
$as_echo_n "(cached) " >&6
else
case $XSLTPROC in
-@@ -16272,14 +14400,14 @@ for as_dir in $PATH
+@@ -16354,14 +14510,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15644,7 +16330,7 @@
IFS=$as_save_IFS
;;
-@@ -16287,10 +14415,10 @@ esac
+@@ -16369,10 +14525,10 @@ esac
fi
XSLTPROC=$ac_cv_path_XSLTPROC
if test -n "$XSLTPROC"; then
@@ -15657,7 +16343,7 @@
$as_echo "no" >&6; }
fi
-@@ -16305,168 +14433,25 @@ _ACEOF
+@@ -16387,151 +14543,12 @@ _ACEOF
@@ -15804,19 +16490,17 @@
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
+ for ac_header in locale.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
+if test "x$ac_cv_header_locale_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LOCALE_H 1
-+_ACEOF
-
- fi
-
+ _ACEOF
+
+ fi
+@@ -16539,16 +14556,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -15836,7 +16520,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -16477,46 +14462,19 @@ return LC_MESSAGES
+@@ -16559,46 +14572,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -15889,7 +16573,7 @@
fi
fi
-@@ -16529,155 +14487,20 @@ _ACEOF
+@@ -16611,155 +14597,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
@@ -16050,7 +16734,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -16690,54 +14513,25 @@ return !ngettext ("","", 1)
+@@ -16772,54 +14623,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -16113,7 +16797,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -16750,141 +14544,26 @@ return !dgettext ("","")
+@@ -16832,167 +14654,48 @@ return !dgettext ("","")
return 0;
}
_ACEOF
@@ -16161,15 +16845,37 @@
fi
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
--
++ for ac_func in bind_textdomain_codeset
++do :
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
++_ACEOF
+
-for ac_func in bind_textdomain_codeset
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++fi
++done
++
++ fi
++
++ #
++ # If we don't have everything we want, check in libintl
++ #
++ if test "$gt_cv_func_dgettext_libc" != "yes" \
++ || test "$gt_cv_func_ngettext_libc" != "yes" \
++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
++$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -16255,39 +16961,41 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in bind_textdomain_codeset
-+do :
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
-
- fi
-@@ -16899,18 +14578,14 @@ done
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
+-_ACEOF
+-
+-fi
+-done
+-
+- fi
+-
+- #
+- # If we don't have everything we want, check in libintl
+- #
+- if test "$gt_cv_func_dgettext_libc" != "yes" \
+- || test "$gt_cv_func_ngettext_libc" != "yes" \
+- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+-
- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
- $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lintl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lintl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16928,55 +14603,26 @@ return bindtextdomain ();
+@@ -17010,55 +14713,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
@@ -16352,7 +17060,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16994,55 +14640,26 @@ return ngettext ();
+@@ -17076,55 +14750,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -16417,7 +17125,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17060,43 +14677,18 @@ return dgettext ();
+@@ -17142,43 +14787,18 @@ return dgettext ();
return 0;
}
_ACEOF
@@ -16467,7 +17175,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -17106,22 +14698,18 @@ fi
+@@ -17188,22 +14808,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -16495,7 +17203,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17139,55 +14727,26 @@ return ngettext ();
+@@ -17221,55 +14837,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -16560,7 +17268,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17205,43 +14764,18 @@ return dcgettext ();
+@@ -17287,43 +14874,18 @@ return dcgettext ();
return 0;
}
_ACEOF
@@ -16610,7 +17318,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -17263,102 +14797,12 @@ fi
+@@ -17345,102 +14907,12 @@ fi
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -16718,7 +17426,7 @@
_ACEOF
fi
-@@ -17388,15 +14832,13 @@ done
+@@ -17470,15 +14942,13 @@ done
if test "$gt_cv_have_gettext" = "yes"; then
@@ -16737,7 +17445,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -17421,118 +14863,28 @@ esac
+@@ -17503,140 +14973,50 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -16763,7 +17471,13 @@
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++ for ac_func in dcgettext
++do :
++ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
++if test "x$ac_cv_func_dcgettext" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DCGETTEXT 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -16775,15 +17489,21 @@
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++fi
++done
+
-#undef $ac_func
--
++ MSGFMT_OPTS=
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
++$as_echo_n "checking if msgfmt accepts -c... " >&6; }
++ cat >conftest.foo <<_ACEOF
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -16797,7 +17517,16 @@
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++"Project-Id-Version: test 1.0\n"
++"PO-Revision-Date: 2007-02-15 12:01+0100\n"
++"Last-Translator: test <foo at bar.xx>\n"
++"Language-Team: C <LL at li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Transfer-Encoding: 8bit\n"
+
-int
-main ()
-{
@@ -16805,7 +17534,7 @@
- ;
- return 0;
-}
--_ACEOF
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -16846,28 +17575,29 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in dcgettext
-+do :
-+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-+if test "x$ac_cv_func_dcgettext" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DCGETTEXT 1
- _ACEOF
-
- fi
- done
-
- MSGFMT_OPTS=
+-_ACEOF
+-
+-fi
+-done
+-
+- MSGFMT_OPTS=
- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
- $as_echo_n "checking if msgfmt accepts -c... " >&6; }
- cat >conftest.foo <<_ACEOF
-
-@@ -17547,14 +14899,14 @@ msgstr ""
- "Content-Transfer-Encoding: 8bit\n"
-
- _ACEOF
+-$as_echo_n "checking if msgfmt accepts -c... " >&6; }
+- cat >conftest.foo <<_ACEOF
+-
+-msgid ""
+-msgstr ""
+-"Content-Type: text/plain; charset=UTF-8\n"
+-"Project-Id-Version: test 1.0\n"
+-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+-"Last-Translator: test <foo at bar.xx>\n"
+-"Language-Team: C <LL at li.org>\n"
+-"MIME-Version: 1.0\n"
+-"Content-Transfer-Encoding: 8bit\n"
+-
+-_ACEOF
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
($MSGFMT -c -o /dev/null conftest.foo) 2>&5
@@ -16884,7 +17614,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -17562,9 +14914,9 @@ fi
+@@ -17644,9 +15024,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -16896,7 +17626,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -17577,14 +14929,14 @@ for as_dir in $PATH
+@@ -17659,14 +15039,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16914,7 +17644,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -17593,19 +14945,19 @@ esac
+@@ -17675,19 +15055,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -16938,7 +17668,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -17630,18 +14982,14 @@ esac
+@@ -17712,18 +15092,14 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -16960,7 +17690,7 @@
/* end confdefs.h. */
int
-@@ -17653,121 +15001,14 @@ extern int _nl_msg_cat_cntr;
+@@ -17735,121 +15111,14 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -17086,7 +17816,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -17782,10 +15023,8 @@ fi
+@@ -17864,10 +15133,8 @@ fi
;;
esac
fi
@@ -17099,7 +17829,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -17799,9 +15038,7 @@ fi
+@@ -17881,9 +15148,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -17110,7 +17840,7 @@
fi
-@@ -17809,7 +15046,7 @@ _ACEOF
+@@ -17891,7 +15156,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -17119,7 +17849,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -17842,7 +15079,7 @@ $as_echo "found xgettext program is not
+@@ -17924,7 +15189,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -17128,7 +17858,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -17867,7 +15104,7 @@ $as_echo_n "checking for catalogs to be
+@@ -17949,7 +15214,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -17137,7 +17867,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -17900,16 +15137,12 @@ $as_echo "$LINGUAS" >&6; }
+@@ -17982,16 +15247,12 @@ $as_echo "$LINGUAS" >&6; }
< $srcdir/po/POTFILES.in > po/POTFILES
@@ -17157,7 +17887,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -17924,48 +15157,23 @@ main ()
+@@ -18006,48 +15267,23 @@ main ()
return 0;
}
_ACEOF
@@ -17211,7 +17941,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -17975,18 +15183,14 @@ fi
+@@ -18057,18 +15293,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -17233,7 +17963,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -17996,14 +15200,10 @@ fi
+@@ -18078,14 +15310,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -17250,7 +17980,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -18030,199 +15230,31 @@ main ()
+@@ -18112,199 +15340,31 @@ main ()
return 0;
}
_ACEOF
@@ -17462,7 +18192,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -18233,169 +15265,26 @@ done
+@@ -18315,169 +15375,26 @@ done
@@ -17639,7 +18369,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18413,43 +15302,18 @@ return backtrace ();
+@@ -18495,43 +15412,18 @@ return backtrace ();
return 0;
}
_ACEOF
@@ -17686,10 +18416,10 @@
$as_echo "$ac_cv_lib_execinfo_backtrace" >&6; }
-if test "x$ac_cv_lib_execinfo_backtrace" = x""yes; then
+if test "x$ac_cv_lib_execinfo_backtrace" = x""yes; then :
- EXECINFO_LIBS="-lexecinfo"
- else
- EXECINFO_LIBS=""
-@@ -18459,151 +15323,12 @@ fi
+ have_backtrace="yes"
+ else
+ have_backtrace="no"
+@@ -18545,151 +15437,12 @@ fi
oCFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
@@ -17845,7 +18575,7 @@
_ACEOF
fi
-@@ -18612,10 +15337,10 @@ done
+@@ -18698,10 +15451,10 @@ done
CFLAGS="$oCFLAGS"
@@ -17858,8 +18588,8 @@
enableval=$enable_ipv6;
else
enable_ipv6=yes
-@@ -18623,11 +15348,7 @@ fi
-
+@@ -18710,11 +15463,7 @@ fi
+ have_full_ipv6=no
if test $enable_ipv6 = yes; then
- cat >conftest.$ac_ext <<_ACEOF
@@ -17871,7 +18601,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -18635,132 +15356,27 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -18722,132 +15471,27 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
@@ -18017,7 +18747,7 @@
have_getaddrinfo=yes
fi
-@@ -18768,18 +15384,14 @@ fi
+@@ -18855,18 +15499,14 @@ fi
# getaddrinfo is not in the default libraries. See if it's in some other.
for lib in bsd socket inet; do
as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_getaddrinfo" | $as_tr_sh`
@@ -18039,7 +18769,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18797,47 +15409,20 @@ return getaddrinfo ();
+@@ -18884,47 +15524,20 @@ return getaddrinfo ();
return 0;
}
_ACEOF
@@ -18095,7 +18825,7 @@
LIBS="$LIBS -l$lib";have_getaddrinfo=yes; break
fi
-@@ -18845,9 +15430,7 @@ fi
+@@ -18932,9 +15545,7 @@ fi
fi
if test $have_getaddrinfo=yes; then
@@ -18104,9 +18834,9 @@
-_ACEOF
+$as_echo "#define ENABLE_IPV6 1" >>confdefs.h
+ have_full_ipv6=yes
fi
- fi
-@@ -18858,9 +15441,9 @@ for ac_prog in mawk gawk nawk awk
+@@ -18946,9 +15557,9 @@ for ac_prog in mawk gawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -18118,7 +18848,7 @@
$as_echo_n "(cached) " >&6
else
case $AWK in
-@@ -18873,14 +15456,14 @@ for as_dir in $PATH
+@@ -18961,14 +15572,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18136,7 +18866,7 @@
IFS=$as_save_IFS
;;
-@@ -18888,10 +15471,10 @@ esac
+@@ -18976,10 +15587,10 @@ esac
fi
AWK=$ac_cv_path_AWK
if test -n "$AWK"; then
@@ -18149,7 +18879,7 @@
$as_echo "no" >&6; }
fi
-@@ -18903,9 +15486,9 @@ for ac_prog in perl5 perl
+@@ -18991,9 +15602,9 @@ for ac_prog in perl5 perl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -18161,7 +18891,7 @@
$as_echo_n "(cached) " >&6
else
case $PERL in
-@@ -18918,14 +15501,14 @@ for as_dir in $PATH
+@@ -19006,14 +15617,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18179,7 +18909,7 @@
IFS=$as_save_IFS
;;
-@@ -18933,10 +15516,10 @@ esac
+@@ -19021,10 +15632,10 @@ esac
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
@@ -18192,7 +18922,7 @@
$as_echo "no" >&6; }
fi
-@@ -18948,7 +15531,7 @@ done
+@@ -19036,7 +15647,7 @@ done
# define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt
# Check whether --enable-rebuilds was given.
@@ -18201,7 +18931,7 @@
enableval=$enable_rebuilds;
else
enable_rebuilds=yes
-@@ -18992,13 +15575,13 @@ _ACEOF
+@@ -19080,13 +15691,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -18217,7 +18947,7 @@
esac ;;
esac
done
-@@ -19006,8 +15589,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -19094,8 +15705,8 @@ $as_echo "$as_me: WARNING: cache variabl
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -18228,7 +18958,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19030,11 +15613,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -19118,11 +15729,11 @@ $as_echo "$as_me: WARNING: cache variabl
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -18242,7 +18972,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -19054,8 +15637,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
+@@ -19142,8 +15753,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -18253,7 +18983,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -19071,80 +15654,54 @@ else
+@@ -19159,80 +15770,54 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -18355,7 +19085,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -19154,17 +15711,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -19242,17 +15827,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -18381,7 +19111,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19172,23 +15730,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -19260,23 +15846,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -18410,7 +19140,7 @@
as_nl='
'
export as_nl
-@@ -19196,7 +15746,13 @@ export as_nl
+@@ -19284,7 +15862,13 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -18425,7 +19155,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -19207,7 +15763,7 @@ else
+@@ -19295,7 +15879,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -18434,7 +19164,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19230,13 +15786,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -19318,13 +15902,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -18448,7 +19178,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -19246,15 +15795,15 @@ fi
+@@ -19334,15 +15911,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -18467,7 +19197,7 @@
IFS=$as_save_IFS
;;
-@@ -19266,12 +15815,16 @@ if test "x$as_myself" = x; then
+@@ -19354,12 +15931,16 @@ if test "x$as_myself" = x; then
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -18488,7 +19218,7 @@
done
PS1='$ '
PS2='> '
-@@ -19283,7 +15836,89 @@ export LC_ALL
+@@ -19371,7 +15952,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -18579,7 +19309,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -19297,8 +15932,12 @@ else
+@@ -19385,8 +16048,12 @@ else
as_basename=false
fi
@@ -18593,7 +19323,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -19318,76 +15957,25 @@ $as_echo X/"$0" |
+@@ -19406,76 +16073,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
@@ -18681,7 +19411,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -19416,8 +16004,56 @@ fi
+@@ -19504,8 +16120,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -18739,7 +19469,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -19436,10 +16072,10 @@ else
+@@ -19524,10 +16188,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -18752,7 +19482,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -19454,13 +16090,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -19542,13 +16206,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
exec 6>&1
@@ -18768,13 +19498,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by gnome-session $as_me 2.28.0, which was
+ This file was extended by gnome-session $as_me 2.30.0, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -19492,10 +16134,11 @@ _ACEOF
+@@ -19580,13 +16250,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -18789,7 +19519,11 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -19517,16 +16160,16 @@ $config_headers
++ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
+ -d, --debug don't remove temporary files
+@@ -19605,16 +16277,17 @@ $config_headers
Configuration commands:
$config_commands
@@ -18798,18 +19532,29 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- gnome-session config.status 2.28.0
+ gnome-session config.status 2.30.0
-configured by $0, generated by GNU Autoconf 2.63,
-+configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++ with options \\"\$ac_cs_config\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -19569,20 +16212,19 @@ do
+@@ -19650,6 +16323,8 @@ do
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
++ --config | --confi | --conf | --con | --co | --c )
++ $as_echo "$ac_cs_config"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+@@ -19657,20 +16332,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -18834,7 +19579,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -19590,11 +16232,10 @@ Try \`$0 --help' for more information."
+@@ -19678,11 +16352,10 @@ Try \`$0 --help' for more information."
ac_cs_silent=: ;;
# This is an error.
@@ -18849,7 +19594,7 @@
ac_need_defaults=false ;;
esac
-@@ -19931,9 +16572,7 @@ do
+@@ -20019,9 +16692,7 @@ do
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -18860,7 +19605,7 @@
esac
done
-@@ -19960,7 +16599,7 @@ $debug ||
+@@ -20048,7 +16719,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -18869,7 +19614,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -19971,11 +16610,7 @@ $debug ||
+@@ -20059,11 +16730,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -18882,7 +19627,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -19983,10 +16618,16 @@ $debug ||
+@@ -20071,10 +16738,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
@@ -18901,7 +19646,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -20000,24 +16641,18 @@ _ACEOF
+@@ -20088,24 +16761,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -18929,7 +19674,25 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20106,9 +16741,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -20127,7 +16794,7 @@ s/'"$ac_delim"'$//
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -20141,7 +16808,7 @@ s/.\{148\}//
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -20194,9 +16861,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -18940,7 +19703,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20149,9 +16782,7 @@ for ac_last_try in false false :; do
+@@ -20237,9 +16902,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -18951,7 +19714,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20236,9 +16867,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -20324,9 +16987,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -18962,7 +19725,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -20251,9 +16880,7 @@ do
+@@ -20339,9 +17000,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -18973,7 +19736,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -20281,12 +16908,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -20369,12 +17028,10 @@ $as_echo "$as_me: error: invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -18988,7 +19751,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20297,7 +16922,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -20385,7 +17042,7 @@ $as_echo "$as_me: error: cannot find inp
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -18997,7 +19760,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -20310,9 +16935,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -20398,9 +17055,7 @@ $as_echo "$as_me: creating $ac_file" >&6
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -19008,7 +19771,7 @@
esac
;;
esac
-@@ -20340,47 +16963,7 @@ $as_echo X"$ac_file" |
+@@ -20428,47 +17083,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
@@ -19057,7 +19820,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -20437,7 +17020,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -20525,7 +17140,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -19065,7 +19828,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -20447,12 +17029,11 @@ ac_sed_dataroot='
+@@ -20535,12 +17149,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -19080,7 +19843,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -20462,7 +17043,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -20550,7 +17163,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -19089,7 +19852,7 @@
esac
_ACEOF
-@@ -20491,14 +17072,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+@@ -20579,14 +17192,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -19106,7 +19869,7 @@
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;}
-@@ -20508,9 +17087,7 @@ which seems to be undefined. Please mak
+@@ -20596,9 +17207,7 @@ which seems to be undefined. Please mak
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -19117,7 +19880,7 @@
;;
:H)
#
-@@ -20521,25 +17098,19 @@ $as_echo "$as_me: error: could not creat
+@@ -20609,25 +17218,19 @@ $as_echo "$as_me: error: could not creat
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -19147,7 +19910,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -20577,7 +17148,7 @@ $as_echo X"$_am_arg" |
+@@ -20665,7 +17268,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -19156,7 +19919,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -20672,47 +17243,7 @@ $as_echo X"$file" |
+@@ -20760,47 +17363,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -19205,10 +19968,10 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -21359,9 +17890,7 @@ _LT_EOF
+@@ -21447,9 +18010,7 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
- { (exit 1); exit 1; }; }
@@ -19216,7 +19979,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -21384,15 +17913,12 @@ $as_echo "$as_me: error: po/Makefile.in.
+@@ -21472,15 +18033,12 @@ $as_echo "$as_me: error: po/Makefile.in.
done # for ac_tag
@@ -19234,7 +19997,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -21413,10 +17939,10 @@ if test "$no_create" != yes; then
+@@ -21501,10 +18059,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -19247,18 +20010,24 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-@@ -21439,6 +17965,7 @@ echo "
- cflags: ${CFLAGS}
+@@ -21528,6 +18086,7 @@ echo "
Maintainer mode: ${USE_MAINTAINER_MODE}
+ Warn about deprecations: ${enable_deprecations}
+ DeviceKit-Power support: ${have_devkit_power}
Default WM: ${with_default_wm}
- PolicyKit support: ${have_polkit}
- XRender support: ${have_xrender}
-Index: gnome-session-2.28.0/data/Makefile.in
+ IPv6 support: ${have_full_ipv6}
+ Backtrace support: ${have_backtrace}
+Index: gnome-session-2.30.0/data/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/Makefile.in 2009-11-06 13:54:08.399682392 +0100
-+++ gnome-session-2.28.0/data/Makefile.in 2009-11-06 13:58:49.964178863 +0100
+--- gnome-session-2.30.0.orig/data/Makefile.in 2010-03-30 02:04:28.000000000 +0200
++++ gnome-session-2.30.0/data/Makefile.in 2010-04-13 22:50:52.361735667 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -153,6 +153,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19276,7 +20045,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -239,6 +242,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -220,6 +223,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19284,10 +20053,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/data/icons/16x16/Makefile.in
+@@ -531,7 +535,7 @@ uninstall-xsessionDATA:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -556,7 +560,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: gnome-session-2.30.0/data/icons/16x16/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/16x16/Makefile.in 2009-11-06 13:54:08.387679191 +0100
-+++ gnome-session-2.28.0/data/icons/16x16/Makefile.in 2009-11-06 13:58:50.055678345 +0100
+--- gnome-session-2.30.0.orig/data/icons/16x16/Makefile.in 2010-03-30 02:04:28.000000000 +0200
++++ gnome-session-2.30.0/data/icons/16x16/Makefile.in 2010-04-13 22:50:52.461733984 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19305,7 +20098,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -172,6 +175,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19313,10 +20106,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/data/icons/22x22/Makefile.in
+Index: gnome-session-2.30.0/data/icons/22x22/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/22x22/Makefile.in 2009-11-06 13:54:08.363682568 +0100
-+++ gnome-session-2.28.0/data/icons/22x22/Makefile.in 2009-11-06 13:58:50.151678052 +0100
+--- gnome-session-2.30.0.orig/data/icons/22x22/Makefile.in 2010-03-30 02:04:28.000000000 +0200
++++ gnome-session-2.30.0/data/icons/22x22/Makefile.in 2010-04-13 22:50:52.541734298 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19334,7 +20133,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -172,6 +175,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19342,10 +20141,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/data/icons/24x24/Makefile.in
+Index: gnome-session-2.30.0/data/icons/24x24/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/24x24/Makefile.in 2009-11-06 13:54:08.347680745 +0100
-+++ gnome-session-2.28.0/data/icons/24x24/Makefile.in 2009-11-06 13:58:50.239678556 +0100
+--- gnome-session-2.30.0.orig/data/icons/24x24/Makefile.in 2010-03-30 02:04:28.000000000 +0200
++++ gnome-session-2.30.0/data/icons/24x24/Makefile.in 2010-04-13 22:50:52.625735690 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19363,7 +20168,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -172,6 +175,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19371,10 +20176,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/data/icons/32x32/Makefile.in
+Index: gnome-session-2.30.0/data/icons/32x32/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/32x32/Makefile.in 2009-11-06 13:54:08.335681944 +0100
-+++ gnome-session-2.28.0/data/icons/32x32/Makefile.in 2009-11-06 13:58:50.319678386 +0100
+--- gnome-session-2.30.0.orig/data/icons/32x32/Makefile.in 2010-03-30 02:04:28.000000000 +0200
++++ gnome-session-2.30.0/data/icons/32x32/Makefile.in 2010-04-13 22:50:52.705734546 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19392,7 +20203,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -172,6 +175,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19400,10 +20211,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/data/icons/48x48/Makefile.in
+Index: gnome-session-2.30.0/data/icons/48x48/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/48x48/Makefile.in 2009-11-06 13:54:08.319682076 +0100
-+++ gnome-session-2.28.0/data/icons/48x48/Makefile.in 2009-11-06 13:58:50.399678698 +0100
+--- gnome-session-2.30.0.orig/data/icons/48x48/Makefile.in 2010-03-30 02:04:29.000000000 +0200
++++ gnome-session-2.30.0/data/icons/48x48/Makefile.in 2010-04-13 22:50:52.785736830 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19421,7 +20238,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -172,6 +175,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19429,10 +20246,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/data/icons/Makefile.in
+Index: gnome-session-2.30.0/data/icons/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/Makefile.in 2009-11-06 13:54:08.303682208 +0100
-+++ gnome-session-2.28.0/data/icons/Makefile.in 2009-11-06 13:58:50.479678530 +0100
+--- gnome-session-2.30.0.orig/data/icons/Makefile.in 2010-03-30 02:04:29.000000000 +0200
++++ gnome-session-2.30.0/data/icons/Makefile.in 2010-04-13 22:50:52.865734219 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -121,6 +121,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19450,7 +20273,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -207,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -188,6 +191,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19458,10 +20281,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/data/icons/scalable/Makefile.in
+@@ -323,7 +327,7 @@ clean-libtool:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -348,7 +352,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: gnome-session-2.30.0/data/icons/scalable/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/scalable/Makefile.in 2009-11-06 13:54:08.291681940 +0100
-+++ gnome-session-2.28.0/data/icons/scalable/Makefile.in 2009-11-06 13:58:50.579678323 +0100
+--- gnome-session-2.30.0.orig/data/icons/scalable/Makefile.in 2010-03-30 02:04:29.000000000 +0200
++++ gnome-session-2.30.0/data/icons/scalable/Makefile.in 2010-04-13 22:50:52.945734536 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19479,7 +20326,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -172,6 +175,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19487,10 +20334,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/doc/Makefile.in
+Index: gnome-session-2.30.0/doc/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/doc/Makefile.in 2009-11-06 13:54:08.263690115 +0100
-+++ gnome-session-2.28.0/doc/Makefile.in 2009-11-06 13:58:50.659678162 +0100
+--- gnome-session-2.30.0.orig/doc/Makefile.in 2010-03-30 02:04:29.000000000 +0200
++++ gnome-session-2.30.0/doc/Makefile.in 2010-04-13 22:50:53.025734361 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -121,6 +121,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19508,7 +20361,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -207,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -188,6 +191,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19516,10 +20369,34 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/doc/dbus/Makefile.in
+@@ -323,7 +327,7 @@ clean-libtool:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -348,7 +352,7 @@ $(RECURSIVE_TARGETS):
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: gnome-session-2.30.0/doc/dbus/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/doc/dbus/Makefile.in 2009-11-06 13:54:08.227692242 +0100
-+++ gnome-session-2.28.0/doc/dbus/Makefile.in 2009-11-06 13:58:50.740179109 +0100
+--- gnome-session-2.30.0.orig/doc/dbus/Makefile.in 2010-03-30 02:04:29.000000000 +0200
++++ gnome-session-2.30.0/doc/dbus/Makefile.in 2010-04-13 22:50:53.109734775 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -106,6 +106,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19537,7 +20414,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -192,6 +195,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -173,6 +176,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19545,10 +20422,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/doc/man/Makefile.in
+Index: gnome-session-2.30.0/doc/man/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/doc/man/Makefile.in 2009-11-06 13:54:08.199685259 +0100
-+++ gnome-session-2.28.0/doc/man/Makefile.in 2009-11-06 13:58:50.860179339 +0100
+--- gnome-session-2.30.0.orig/doc/man/Makefile.in 2010-03-30 02:04:29.000000000 +0200
++++ gnome-session-2.30.0/doc/man/Makefile.in 2010-04-13 22:50:53.189234475 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -106,6 +106,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19566,7 +20449,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -192,6 +195,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -173,6 +176,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19574,10 +20457,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/egg/Makefile.in
+Index: gnome-session-2.30.0/egg/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/egg/Makefile.in 2009-11-06 13:54:08.163685917 +0100
-+++ gnome-session-2.28.0/egg/Makefile.in 2009-11-06 13:58:50.980179082 +0100
+--- gnome-session-2.30.0.orig/egg/Makefile.in 2010-03-30 02:04:29.000000000 +0200
++++ gnome-session-2.30.0/egg/Makefile.in 2010-04-13 22:50:53.313235788 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -130,6 +130,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19595,7 +20484,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -216,6 +219,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -197,6 +200,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19603,10 +20492,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/gnome-session/Makefile.in
+Index: gnome-session-2.30.0/gnome-session/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/gnome-session/Makefile.in 2009-11-06 13:54:08.115699504 +0100
-+++ gnome-session-2.28.0/gnome-session/Makefile.in 2009-11-06 13:58:51.112179103 +0100
+--- gnome-session-2.30.0.orig/gnome-session/Makefile.in 2010-03-30 02:04:29.000000000 +0200
++++ gnome-session-2.30.0/gnome-session/Makefile.in 2010-04-13 22:50:53.445233844 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -80,7 +80,7 @@ gnome_session_DEPENDENCIES = libgsmutil.
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -19633,7 +20528,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -235,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -216,6 +219,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19641,7 +20536,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-@@ -330,6 +334,7 @@ INCLUDES = \
+@@ -311,6 +315,7 @@ INCLUDES = \
$(SM_CFLAGS) \
$(ICE_CFLAGS) \
$(GNOME_SESSION_CFLAGS) \
@@ -19649,7 +20544,7 @@
$(GCONF_CFLAGS) \
-I$(top_srcdir)/egg \
-DLOCALE_DIR=\""$(datadir)/locale"\" \
-@@ -363,6 +368,7 @@ gnome_session_LDADD = \
+@@ -344,6 +349,7 @@ gnome_session_LDADD = \
$(SM_LIBS) \
$(ICE_LIBS) \
$(GNOME_SESSION_LIBS) \
@@ -19657,28 +20552,39 @@
$(GCONF_LIBS) \
$(XRENDER_LIBS) \
$(XTEST_LIBS) \
-Index: gnome-session-2.28.0/ltmain.sh
+Index: gnome-session-2.30.0/ltmain.sh
===================================================================
---- gnome-session-2.28.0.orig/ltmain.sh 2009-11-06 13:54:08.087685187 +0100
-+++ gnome-session-2.28.0/ltmain.sh 2009-11-06 13:58:40.363688566 +0100
+--- gnome-session-2.30.0.orig/ltmain.sh 2010-03-30 02:04:16.000000000 +0200
++++ gnome-session-2.30.0/ltmain.sh 2010-04-13 22:50:41.357240884 +0200
+@@ -1,6 +1,6 @@
+ # Generated from ltmain.m4sh.
+
+-# ltmain.sh (GNU libtool) 2.2.6
++# ltmain.sh (GNU libtool) 2.2.6b
+ # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
-+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
# automake: $automake_version
# autoconf: $autoconf_version
#
-@@ -73,7 +73,7 @@
+@@ -73,9 +73,9 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
-+VERSION="2.2.6 Debian-2.2.6a-4"
++VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
- package_revision=1.3012
-
+-package_revision=1.3012
++package_revision=1.3017
+
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -116,15 +116,15 @@ $lt_unset CDPATH
: ${CP="cp -f"}
@@ -19759,10 +20665,19 @@
esac
;;
no)
-Index: gnome-session-2.28.0/m4/libtool.m4
+Index: gnome-session-2.30.0/m4/libtool.m4
===================================================================
---- gnome-session-2.28.0.orig/m4/libtool.m4 2009-11-06 13:54:08.059686516 +0100
-+++ gnome-session-2.28.0/m4/libtool.m4 2009-11-06 13:58:40.535689971 +0100
+--- gnome-session-2.30.0.orig/m4/libtool.m4 2010-03-30 02:04:17.000000000 +0200
++++ gnome-session-2.30.0/m4/libtool.m4 2010-04-13 22:50:41.485235915 +0200
+@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
@@ -2485,6 +2485,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19782,7 +20697,12 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3076,7 +3088,7 @@ linux* | k*bsd*-gnu)
+@@ -3072,11 +3084,11 @@ irix5* | irix6* | nonstopux*)
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -19791,6 +20711,15 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
+@@ -3693,7 +3705,7 @@ m4_if([$1], [CXX], [
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
@@ -3757,7 +3769,7 @@ m4_if([$1], [CXX], [
;;
esac
@@ -19800,6 +20729,15 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -3977,7 +3989,7 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
@@ -4182,6 +4194,9 @@ m4_if([$1], [CXX], [
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
@@ -19820,7 +20758,24 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4428,7 +4446,7 @@ _LT_EOF
+@@ -4267,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -4358,7 +4377,7 @@ _LT_EOF
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -4428,7 +4447,7 @@ _LT_EOF
fi
;;
@@ -19829,7 +20784,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -4603,6 +4621,7 @@ _LT_EOF
+@@ -4603,6 +4622,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -19837,7 +20792,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -4841,7 +4860,7 @@ _LT_EOF
+@@ -4841,7 +4861,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -19846,10 +20801,25 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-Index: gnome-session-2.28.0/splash/Makefile.in
+@@ -5841,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes;
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+Index: gnome-session-2.30.0/splash/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/splash/Makefile.in 2009-11-06 13:54:08.031687844 +0100
-+++ gnome-session-2.28.0/splash/Makefile.in 2009-11-06 13:58:51.228180237 +0100
+--- gnome-session-2.30.0.orig/splash/Makefile.in 2010-03-30 02:04:30.000000000 +0200
++++ gnome-session-2.30.0/splash/Makefile.in 2010-04-13 22:50:53.553233804 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -143,6 +143,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19867,7 +20837,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -229,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -210,6 +213,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19875,10 +20845,16 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/tools/Makefile.in
+Index: gnome-session-2.30.0/tools/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/tools/Makefile.in 2009-11-06 13:54:07.999686637 +0100
-+++ gnome-session-2.28.0/tools/Makefile.in 2009-11-06 13:58:51.332182557 +0100
+--- gnome-session-2.30.0.orig/tools/Makefile.in 2010-03-30 02:04:30.000000000 +0200
++++ gnome-session-2.30.0/tools/Makefile.in 2010-04-13 22:50:53.653235065 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -116,6 +116,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFAULT_WM = @DEFAULT_WM@
DEFS = @DEFS@
@@ -19896,7 +20872,7 @@
HAVE_XRENDER = @HAVE_XRENDER@
HAVE_XTEST = @HAVE_XTEST@
ICE_CFLAGS = @ICE_CFLAGS@
-@@ -202,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -183,6 +186,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19904,10 +20880,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-Index: gnome-session-2.28.0/config.h.in
+Index: gnome-session-2.30.0/config.h.in
===================================================================
---- gnome-session-2.28.0.orig/config.h.in 2009-11-06 13:58:34.872184247 +0100
-+++ gnome-session-2.28.0/config.h.in 2009-11-06 13:58:51.863680622 +0100
+--- gnome-session-2.30.0.orig/config.h.in 2010-03-30 02:04:27.000000000 +0200
++++ gnome-session-2.30.0/config.h.in 2010-04-13 22:50:29.009246015 +0200
@@ -18,6 +18,9 @@
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
@@ -19928,3 +20904,28 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+Index: gnome-session-2.30.0/m4/ltversion.m4
+===================================================================
+--- gnome-session-2.30.0.orig/m4/ltversion.m4 2010-04-13 22:52:34.625240375 +0200
++++ gnome-session-2.30.0/m4/ltversion.m4 2010-04-13 22:50:41.749741958 +0200
+@@ -9,15 +9,15 @@
+
+ # Generated from ltversion.in.
+
+-# serial 3012 ltversion.m4
++# serial 3017 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=23782&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/series [utf-8] Tue Apr 13 21:04:55 2010
@@ -3,6 +3,4 @@
10_session_save.patch
11_saved_session_name.patch
12_no_gdm_fallback.patch
-13_capplet_always_save.patch
-14_crash_on_exit.patch
90_relibtoolize.patch
Modified: desktop/unstable/gnome-session/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/rules?rev=23782&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/rules [utf-8] Tue Apr 13 21:04:55 2010
@@ -10,6 +10,7 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_CONFIGURE_EXTRA_FLAGS += --localstatedir=/var/lib \
+ --libexecdir=/usr/lib \
--enable-ipv6 \
--with-default-wm=gnome-wm
More information about the pkg-gnome-commits
mailing list