r22247 - in /desktop/unstable/gnome-session/debian: changelog patches/03_devicekit_optional.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Nov 6 13:01:42 UTC 2009
Author: joss
Date: Fri Nov 6 13:01:42 2009
New Revision: 22247
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22247
Log:
* 03_devicekit_optional.patch: new patch. Make DeviceKit-Power support
optional, so that gnome-session builds on non-Linux architectures.
* 90_relibtoolize.patch: regenerated accordingly, add an autoheader
invocation.
Added:
desktop/unstable/gnome-session/debian/patches/03_devicekit_optional.patch
Modified:
desktop/unstable/gnome-session/debian/changelog
desktop/unstable/gnome-session/debian/patches/90_relibtoolize.patch
desktop/unstable/gnome-session/debian/patches/series
Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=22247&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Fri Nov 6 13:01:42 2009
@@ -1,3 +1,12 @@
+gnome-session (2.28.0-3) unstable; urgency=low
+
+ * 03_devicekit_optional.patch: new patch. Make DeviceKit-Power support
+ optional, so that gnome-session builds on non-Linux architectures.
+ * 90_relibtoolize.patch: regenerated accordingly, add an autoheader
+ invocation.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 06 Nov 2009 13:51:37 +0100
+
gnome-session (2.28.0-2) unstable; urgency=low
* Don’t require devicekit-power on non-linux architectures.
Added: 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=22247&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/03_devicekit_optional.patch (added)
+++ desktop/unstable/gnome-session/debian/patches/03_devicekit_optional.patch [utf-8] Fri Nov 6 13:01:42 2009
@@ -1,0 +1,239 @@
+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,
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ )
+
+ PKG_CHECK_MODULES(SESSION_PROPERTIES,
+@@ -82,6 +81,22 @@ PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0
+
+
+ dnl ====================================================================
++dnl Check for DeviceKit-Power
++dnl ====================================================================
++
++PKG_CHECK_MODULES(DEVKIT_POWER,
++ devkit-power-gobject >= $DEVKIT_POWER_REQUIRED,
++ have_devkit_power=yes,
++ have_devkit_power=no
++)
++if test "$have_devkit_power" = yes; then
++ AC_DEFINE(HAVE_DEVKIT_POWER, 1, [Have the DeviceKit-Power library])
++fi
++AC_SUBST(HAVE_DEVKIT_POWER)
++AC_SUBST(DEVKIT_POWER_CFLAGS)
++AC_SUBST(DEVKIT_POWER_LIBS)
++
++dnl ====================================================================
+ dnl Option to set the default window manager
+ dnl ====================================================================
+ AC_ARG_WITH(default-wm,
+@@ -379,6 +394,7 @@ echo "
+ cflags: ${CFLAGS}
+ Maintainer mode: ${USE_MAINTAINER_MODE}
+
++ 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
+@@ -15,6 +15,7 @@ INCLUDES = \
+ $(SM_CFLAGS) \
+ $(ICE_CFLAGS) \
+ $(GNOME_SESSION_CFLAGS) \
++ $(DEVKIT_POWER_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ -I$(top_srcdir)/egg \
+ -DLOCALE_DIR=\""$(datadir)/locale"\" \
+@@ -48,6 +49,7 @@ gnome_session_LDADD = \
+ $(SM_LIBS) \
+ $(ICE_LIBS) \
+ $(GNOME_SESSION_LIBS) \
++ $(DEVKIT_POWER_LIBS) \
+ $(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
+@@ -27,7 +27,9 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+
++#ifdef HAVE_DEVKIT_POWER
+ #include <devkit-power-gobject/devicekit-power.h>
++#endif /* HAVE_DEVKIT_POWER */
+
+ #include "gsm-logout-dialog.h"
+ #include "gsm-consolekit.h"
+@@ -50,7 +52,9 @@ struct _GsmLogoutDialogPrivate
+ {
+ GsmDialogLogoutType type;
+
++#ifdef HAVE_DEVKIT_POWER
+ DkpClient *dkp_client;
++#endif /* HAVE_DEVKIT_POWER */
+ GsmConsolekit *consolekit;
+
+ int timeout;
+@@ -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));
+
++#ifdef HAVE_DEVKIT_POWER
+ logout_dialog->priv->dkp_client = dkp_client_new ();
++#endif /* HAVE_DEVKIT_POWER */
+
+ logout_dialog->priv->consolekit = gsm_get_consolekit ();
+
+@@ -166,10 +172,12 @@ gsm_logout_dialog_destroy (GsmLogoutDial
+ logout_dialog->priv->timeout_id = 0;
+ }
+
++#ifdef HAVE_DEVKIT_POWER
+ if (logout_dialog->priv->dkp_client) {
+ g_object_unref (logout_dialog->priv->dkp_client);
+ logout_dialog->priv->dkp_client = NULL;
+ }
++#endif /* HAVE_DEVKIT_POWER */
+
+ if (logout_dialog->priv->consolekit) {
+ g_object_unref (logout_dialog->priv->consolekit);
+@@ -182,21 +190,29 @@ gsm_logout_dialog_destroy (GsmLogoutDial
+ static gboolean
+ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
+ {
++#ifdef HAVE_DEVKIT_POWER
+ gboolean ret;
+ g_object_get (logout_dialog->priv->dkp_client,
+ "can-suspend", &ret,
+ NULL);
+ return ret;
++#else /* HAVE_DEVKIT_POWER */
++ return FALSE;
++#endif /* HAVE_DEVKIT_POWER */
+ }
+
+ static gboolean
+ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
+ {
++#ifdef HAVE_DEVKIT_POWER
+ gboolean ret;
+ g_object_get (logout_dialog->priv->dkp_client,
+ "can-hibernate", &ret,
+ NULL);
+ return ret;
++#else /* HAVE_DEVKIT_POWER */
++ return FALSE;
++#endif /* HAVE_DEVKIT_POWER */
+ }
+
+ 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
+@@ -38,7 +38,9 @@
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
++#ifdef HAVE_DEVKIT_POWER
+ #include <devkit-power-gobject/devicekit-power.h>
++#endif /* HAVE_DEVKIT_POWER */
+
+ #include <gtk/gtk.h> /* for logout dialog */
+ #include <gconf/gconf-client.h>
+@@ -135,7 +137,9 @@ struct GsmManagerPrivate
+ DBusGConnection *connection;
+
+ /* Interface with other parts of the system */
++#ifdef HAVE_DEVKIT_POWER
+ DkpClient *dkp_client;
++#endif /* HAVE_DEVKIT_POWER */
+ };
+
+ enum {
+@@ -971,6 +975,7 @@ manager_perhaps_lock (GsmManager *manage
+ static void
+ manager_attempt_hibernate (GsmManager *manager)
+ {
++#ifdef HAVE_DEVKIT_POWER
+ gboolean can_hibernate;
+ GError *error;
+ gboolean ret;
+@@ -992,11 +997,15 @@ manager_attempt_hibernate (GsmManager *m
+ g_error_free (error);
+ }
+ }
++#else /* HAVE_DEVKIT_POWER */
++ return;
++#endif /* HAVE_DEVKIT_POWER */
+ }
+
+ static void
+ manager_attempt_suspend (GsmManager *manager)
+ {
++#ifdef HAVE_DEVKIT_POWER
+ gboolean can_suspend;
+ GError *error;
+ gboolean ret;
+@@ -1018,6 +1027,9 @@ manager_attempt_suspend (GsmManager *man
+ g_error_free (error);
+ }
+ }
++#else /* HAVE_DEVKIT_POWER */
++ return;
++#endif /* HAVE_DEVKIT_POWER */
+ }
+
+ static void
+@@ -2190,10 +2202,12 @@ gsm_manager_dispose (GObject *object)
+ manager->priv->gconf_client = NULL;
+ }
+
++#ifdef HAVE_DEVKIT_POWER
+ if (manager->priv->dkp_client != NULL) {
+ g_object_unref (manager->priv->dkp_client);
+ manager->priv->dkp_client = NULL;
+ }
++#endif /* HAVE_DEVKIT_POWER */
+
+ G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
+ }
+@@ -2423,7 +2437,9 @@ gsm_manager_init (GsmManager *manager)
+ G_CALLBACK (on_presence_status_changed),
+ manager);
+
++#ifdef HAVE_DEVKIT_POWER
+ manager->priv->dkp_client = dkp_client_new ();
++#endif /* HAVE_DEVKIT_POWER */
+
+ /* GConf setup */
+ gconf_client_add_dir (manager->priv->gconf_client,
+@@ -2947,10 +2963,15 @@ gsm_manager_can_shutdown (GsmManager *ma
+ gboolean can_suspend;
+ gboolean can_hibernate;
+
++#ifdef HAVE_DEVKIT_POWER
+ g_object_get (manager->priv->dkp_client,
+ "can-suspend", &can_suspend,
+ "can-hibernate", &can_hibernate,
+ NULL);
++#else /* HAVE_DEVKIT_POWER */
++ can_suspend = FALSE;
++ can_hibernate = FALSE;
++#endif /* HAVE_DEVKIT_POWER */
+
+ g_debug ("GsmManager: CanShutdown called");
+
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=22247&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] Fri Nov 6 13:01:42 2009
@@ -1,13 +1,14 @@
libtoolize --force --copy
aclocal -I m4
automake -acf -Wno-portability
+autoheader
autoconf
-rm -rf autom4te.cache/
+rm -rf autom4te.cache/ config.h.in~
Index: gnome-session-2.28.0/INSTALL
===================================================================
---- gnome-session-2.28.0.orig/INSTALL 2009-07-21 18:20:22.000000000 +0200
-+++ gnome-session-2.28.0/INSTALL 2009-10-24 13:26:00.182258877 +0200
+--- 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
*************************
@@ -209,9 +210,26 @@
Index: gnome-session-2.28.0/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/Makefile.in 2009-09-21 18:20:13.000000000 +0200
-+++ gnome-session-2.28.0/Makefile.in 2009-10-24 13:26:00.246258358 +0200
-@@ -225,6 +225,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -139,6 +139,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -165,6 +167,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -225,6 +228,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -221,8 +239,8 @@
PERL = @PERL@
Index: gnome-session-2.28.0/aclocal.m4
===================================================================
---- gnome-session-2.28.0.orig/aclocal.m4 2009-09-21 18:20:05.000000000 +0200
-+++ gnome-session-2.28.0/aclocal.m4 2009-10-24 13:25:56.634262201 +0200
+--- 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
@@ -13,1866 +13,1869 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -3743,9 +3761,26 @@
m4_include([m4/libtool.m4])
Index: gnome-session-2.28.0/capplet/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/capplet/Makefile.in 2009-09-21 18:20:10.000000000 +0200
-+++ gnome-session-2.28.0/capplet/Makefile.in 2009-10-24 13:25:58.442259097 +0200
-@@ -208,6 +208,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -122,6 +122,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -148,6 +150,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -208,6 +211,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3755,9 +3790,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/compat/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/compat/Makefile.in 2009-09-21 18:20:10.000000000 +0200
-+++ gnome-session-2.28.0/compat/Makefile.in 2009-10-24 13:25:58.582258314 +0200
-@@ -229,6 +229,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -143,6 +143,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -169,6 +171,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -229,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -3767,8 +3819,8 @@
PERL = @PERL@
Index: gnome-session-2.28.0/config.guess
===================================================================
---- gnome-session-2.28.0.orig/config.guess 2009-10-24 13:26:35.914266916 +0200
-+++ gnome-session-2.28.0/config.guess 2009-10-24 13:25:58.113759455 +0200
+--- 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
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -3900,8 +3952,8 @@
SM[BE]S:UNIX_SV:*:*)
Index: gnome-session-2.28.0/config.sub
===================================================================
---- gnome-session-2.28.0.orig/config.sub 2009-10-24 13:26:35.798267259 +0200
-+++ gnome-session-2.28.0/config.sub 2009-10-24 13:25:58.117759545 +0200
+--- 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
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -3956,8 +4008,8 @@
-beos*)
Index: gnome-session-2.28.0/configure
===================================================================
---- gnome-session-2.28.0.orig/configure 2009-09-21 18:20:09.000000000 +0200
-+++ gnome-session-2.28.0/configure 2009-10-24 13:26:01.085756944 +0200
+--- 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 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -4763,7 +4815,17 @@
ac_unique_file="gnome-session"
# Factoring default headers for most tests.
-@@ -989,6 +944,7 @@ bindir
+@@ -833,6 +788,9 @@ ENABLE_SPLASH_TRUE
+ USE_GNOME_WM_FALSE
+ USE_GNOME_WM_TRUE
+ DEFAULT_WM
++HAVE_DEVKIT_POWER
++DEVKIT_POWER_LIBS
++DEVKIT_POWER_CFLAGS
+ EGG_SMCLIENT_LIBS
+ EGG_SMCLIENT_CFLAGS
+ GCONF_LIBS
+@@ -989,6 +947,7 @@ bindir
program_transform_name
prefix
exec_prefix
@@ -4771,7 +4833,16 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1164,8 +1120,7 @@ do
+@@ -1051,6 +1010,8 @@ GCONF_CFLAGS
+ GCONF_LIBS
+ EGG_SMCLIENT_CFLAGS
+ EGG_SMCLIENT_LIBS
++DEVKIT_POWER_CFLAGS
++DEVKIT_POWER_LIBS
+ XMKMF
+ XTEST_CFLAGS
+ XTEST_LIBS
+@@ -1164,8 +1125,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 &&
@@ -4781,7 +4852,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1191,8 +1146,7 @@ do
+@@ -1191,8 +1151,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 &&
@@ -4791,7 +4862,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1396,8 +1350,7 @@ do
+@@ -1396,8 +1355,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 &&
@@ -4801,7 +4872,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1413,8 +1366,7 @@ do
+@@ -1413,8 +1371,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 &&
@@ -4811,7 +4882,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1444,17 +1396,17 @@ do
+@@ -1444,17 +1401,17 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -4835,7 +4906,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1471,15 +1423,13 @@ done
+@@ -1471,15 +1428,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -4853,7 +4924,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1502,8 +1452,7 @@ do
+@@ -1502,8 +1457,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -4863,7 +4934,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1533,11 +1482,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1533,11 +1487,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 .` ||
@@ -4877,7 +4948,7 @@
# Find the source files, if location was not specified.
-@@ -1576,13 +1523,11 @@ else
+@@ -1576,13 +1528,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -4893,7 +4964,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1708,7 +1653,8 @@ Optional Features:
+@@ -1708,7 +1658,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]
@@ -4903,7 +4974,18 @@
--enable-docbook-docs build documentation (requires xmlto)
--enable-ipv6 enable IPv6 extensions
--disable-rebuilds disable all source autogeneration rules
-@@ -1842,21 +1788,378 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1766,6 +1717,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
++ DEVKIT_POWER_CFLAGS
++ C compiler flags for DEVKIT_POWER, overriding pkg-config
++ DEVKIT_POWER_LIBS
++ linker flags for DEVKIT_POWER, overriding pkg-config
+ 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
if $ac_init_version; then
cat <<\_ACEOF
gnome-session configure 2.28.0
@@ -5286,7 +5368,7 @@
$ $0 $@
-@@ -1892,8 +2195,8 @@ for as_dir in $PATH
+@@ -1892,8 +2204,8 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5297,7 +5379,7 @@
IFS=$as_save_IFS
} >&5
-@@ -1930,9 +2233,9 @@ do
+@@ -1930,9 +2242,9 @@ do
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -5309,7 +5391,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1948,13 +2251,13 @@ do
+@@ -1948,13 +2260,13 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -5326,7 +5408,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1979,13 +2282,13 @@ _ASBOX
+@@ -1979,13 +2291,13 @@ _ASBOX
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -5342,7 +5424,7 @@
esac ;;
esac
done
-@@ -2057,39 +2360,41 @@ _ASBOX
+@@ -2057,39 +2369,41 @@ _ASBOX
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -5389,7 +5471,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2108,7 +2413,7 @@ for ac_site_file in "$ac_site_file1" "$a
+@@ -2108,7 +2422,7 @@ for ac_site_file in "$ac_site_file1" "$a
do
test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
@@ -5398,7 +5480,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2119,7 +2424,7 @@ if test -r "$cache_file"; then
+@@ -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
@@ -5407,7 +5489,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2127,7 +2432,7 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -2127,7 +2441,7 @@ $as_echo "$as_me: loading cache $cache_f
esac
fi
else
@@ -5416,7 +5498,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2142,11 +2447,11 @@ for ac_var in $ac_precious_vars; do
+@@ -2142,11 +2456,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,)
@@ -5430,7 +5512,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2156,17 +2461,17 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2156,17 +2470,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
@@ -5452,7 +5534,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2178,43 +2483,20 @@ $as_echo "$as_me: current value: \`$ac
+@@ -2178,43 +2492,20 @@ $as_echo "$as_me: current value: \`$ac
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -5503,7 +5585,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2231,24 +2513,16 @@ am__api_version='1.11'
+@@ -2231,24 +2522,16 @@ am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -5536,7 +5618,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2274,10 +2548,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2274,10 +2557,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.
@@ -5549,7 +5631,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2285,11 +2559,11 @@ for as_dir in $PATH
+@@ -2285,11 +2568,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5565,7 +5647,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2326,7 +2600,7 @@ case $as_dir/ in
+@@ -2326,7 +2609,7 @@ case $as_dir/ in
;;
esac
@@ -5574,7 +5656,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2342,7 +2616,7 @@ fi
+@@ -2342,7 +2625,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -5583,7 +5665,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2353,7 +2627,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2353,7 +2636,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5592,7 +5674,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2364,15 +2638,11 @@ am_lf='
+@@ -2364,15 +2647,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -5610,7 +5692,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2394,11 +2664,8 @@ if (
+@@ -2394,11 +2673,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".
@@ -5624,7 +5706,7 @@
fi
test "$2" = conftest.file
-@@ -2407,13 +2674,10 @@ then
+@@ -2407,13 +2683,10 @@ then
# Ok.
:
else
@@ -5641,7 +5723,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2441,7 +2705,7 @@ if eval "$MISSING --run true"; then
+@@ -2441,7 +2714,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -5650,7 +5732,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2462,9 +2726,9 @@ if test "$cross_compiling" != no; then
+@@ -2462,9 +2735,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
@@ -5662,7 +5744,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2475,24 +2739,24 @@ for as_dir in $PATH
+@@ -2475,24 +2748,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5692,7 +5774,7 @@
$as_echo "no" >&6; }
fi
-@@ -2502,9 +2766,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2502,9 +2775,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
@@ -5704,7 +5786,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2515,24 +2779,24 @@ for as_dir in $PATH
+@@ -2515,24 +2788,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5734,7 +5816,7 @@
$as_echo "no" >&6; }
fi
-@@ -2541,7 +2805,7 @@ fi
+@@ -2541,7 +2814,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5743,7 +5825,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2554,10 +2818,10 @@ fi
+@@ -2554,10 +2827,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -5756,7 +5838,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2565,7 +2829,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
+@@ -2565,7 +2838,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5765,7 +5847,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 +2841,7 @@ do
+@@ -2577,7 +2850,7 @@ do
esac
done
done
@@ -5774,7 +5856,7 @@
IFS=$as_save_IFS
fi
-@@ -2593,7 +2857,7 @@ fi
+@@ -2593,7 +2866,7 @@ fi
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -5783,7 +5865,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2606,9 +2870,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2606,9 +2879,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
@@ -5795,7 +5877,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2619,24 +2883,24 @@ for as_dir in $PATH
+@@ -2619,24 +2892,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5825,7 +5907,7 @@
$as_echo "no" >&6; }
fi
-@@ -2644,11 +2908,11 @@ fi
+@@ -2644,11 +2917,11 @@ fi
test -n "$AWK" && break
done
@@ -5839,7 +5921,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2666,11 +2930,11 @@ esac
+@@ -2666,11 +2939,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5853,7 +5935,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2690,9 +2954,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2690,9 +2963,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
@@ -5864,7 +5946,7 @@
fi
fi
-@@ -2749,7 +3011,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2749,7 +3020,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
# Check whether --enable-silent-rules was given.
@@ -5873,7 +5955,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2763,16 +3025,16 @@ AM_BACKSLASH='\'
+@@ -2763,16 +3034,16 @@ AM_BACKSLASH='\'
@@ -5893,7 +5975,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2798,7 +3060,7 @@ fi
+@@ -2798,7 +3069,7 @@ fi
# Check whether --enable-debug was given.
@@ -5902,7 +5984,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -2807,24 +3069,22 @@ fi
+@@ -2807,24 +3078,22 @@ fi
if test x$enable_debug = xyes ; then
@@ -5931,7 +6013,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -2840,7 +3100,7 @@ am__doit:
+@@ -2840,7 +3109,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -5940,7 +6022,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2868,12 +3128,12 @@ if test "$am__include" = "#"; then
+@@ -2868,12 +3137,12 @@ if test "$am__include" = "#"; then
fi
@@ -5955,7 +6037,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -2898,9 +3158,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2898,9 +3167,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
@@ -5967,7 +6049,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2911,24 +3171,24 @@ for as_dir in $PATH
+@@ -2911,24 +3180,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5997,7 +6079,7 @@
$as_echo "no" >&6; }
fi
-@@ -2938,9 +3198,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2938,9 +3207,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
@@ -6009,7 +6091,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -2951,24 +3211,24 @@ for as_dir in $PATH
+@@ -2951,24 +3220,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6039,7 +6121,7 @@
$as_echo "no" >&6; }
fi
-@@ -2977,7 +3237,7 @@ fi
+@@ -2977,7 +3246,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6048,7 +6130,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2991,9 +3251,9 @@ if test -z "$CC"; then
+@@ -2991,9 +3260,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
@@ -6060,7 +6142,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3004,24 +3264,24 @@ for as_dir in $PATH
+@@ -3004,24 +3273,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6090,7 +6172,7 @@
$as_echo "no" >&6; }
fi
-@@ -3031,9 +3291,9 @@ fi
+@@ -3031,9 +3300,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
@@ -6102,7 +6184,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3045,18 +3305,18 @@ for as_dir in $PATH
+@@ -3045,18 +3314,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6124,7 +6206,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3075,10 +3335,10 @@ fi
+@@ -3075,10 +3344,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -6137,7 +6219,7 @@
$as_echo "no" >&6; }
fi
-@@ -3090,9 +3350,9 @@ if test -z "$CC"; then
+@@ -3090,9 +3359,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
@@ -6149,7 +6231,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3103,24 +3363,24 @@ for as_dir in $PATH
+@@ -3103,24 +3372,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6179,7 +6261,7 @@
$as_echo "no" >&6; }
fi
-@@ -3134,9 +3394,9 @@ if test -z "$CC"; then
+@@ -3134,9 +3403,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
@@ -6191,7 +6273,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3147,24 +3407,24 @@ for as_dir in $PATH
+@@ -3147,24 +3416,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6221,7 +6303,7 @@
$as_echo "no" >&6; }
fi
-@@ -3177,7 +3437,7 @@ done
+@@ -3177,7 +3446,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6230,7 +6312,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3188,73 +3448,55 @@ fi
+@@ -3188,73 +3457,55 @@ fi
fi
@@ -6329,7 +6411,7 @@
$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 +3513,17 @@ do
+@@ -3271,17 +3522,17 @@ do
done
rm -f $ac_rmfiles
@@ -6352,7 +6434,7 @@
# 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 +3540,7 @@ do
+@@ -3298,7 +3549,7 @@ do
# certainly right.
break;;
*.* )
@@ -6361,7 +6443,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3317,84 +3559,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
+@@ -3317,84 +3568,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
else
ac_file=''
fi
@@ -6471,7 +6553,7 @@
# 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 +3642,24 @@ for ac_file in conftest.exe conftest con
+@@ -3409,32 +3651,24 @@ for ac_file in conftest.exe conftest con
esac
done
else
@@ -6511,7 +6593,7 @@
/* end confdefs.h. */
int
-@@ -3446,17 +3671,17 @@ main ()
+@@ -3446,17 +3680,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -6534,7 +6616,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3469,31 +3694,23 @@ else
+@@ -3469,31 +3703,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6573,7 +6655,7 @@
/* end confdefs.h. */
int
-@@ -3507,37 +3724,16 @@ main ()
+@@ -3507,37 +3733,16 @@ main ()
return 0;
}
_ACEOF
@@ -6614,7 +6696,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3546,20 +3742,16 @@ else
+@@ -3546,20 +3751,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -6638,7 +6720,7 @@
/* end confdefs.h. */
int
-@@ -3570,35 +3762,11 @@ main ()
+@@ -3570,35 +3771,11 @@ main ()
return 0;
}
_ACEOF
@@ -6677,7 +6759,7 @@
/* end confdefs.h. */
int
-@@ -3609,36 +3777,12 @@ main ()
+@@ -3609,36 +3786,12 @@ main ()
return 0;
}
_ACEOF
@@ -6718,7 +6800,7 @@
/* end confdefs.h. */
int
-@@ -3649,42 +3793,17 @@ main ()
+@@ -3649,42 +3802,17 @@ main ()
return 0;
}
_ACEOF
@@ -6763,7 +6845,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3701,18 +3820,14 @@ else
+@@ -3701,18 +3829,14 @@ else
CFLAGS=
fi
fi
@@ -6785,7 +6867,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3769,32 +3884,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -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"
@@ -6819,7 +6901,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3805,17 +3897,19 @@ fi
+@@ -3805,17 +3906,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -6842,7 +6924,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3825,9 +3919,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3825,9 +3928,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -6854,7 +6936,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3935,7 +4029,7 @@ else
+@@ -3935,7 +4038,7 @@ else
fi
fi
@@ -6863,7 +6945,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3955,35 +4049,31 @@ fi
+@@ -3955,35 +4058,31 @@ fi
case "$am__api_version" in
1.01234)
@@ -6905,7 +6987,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -3996,14 +4086,14 @@ for as_dir in $PATH
+@@ -3996,14 +4095,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6923,7 +7005,7 @@
IFS=$as_save_IFS
;;
-@@ -4011,19 +4101,19 @@ esac
+@@ -4011,19 +4110,19 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -6947,7 +7029,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -4036,14 +4126,14 @@ for as_dir in $PATH
+@@ -4036,14 +4135,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6965,7 +7047,7 @@
IFS=$as_save_IFS
;;
-@@ -4051,19 +4141,19 @@ esac
+@@ -4051,19 +4150,19 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -6989,7 +7071,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -4076,14 +4166,14 @@ for as_dir in $PATH
+@@ -4076,14 +4175,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7007,7 +7089,7 @@
IFS=$as_save_IFS
;;
-@@ -4091,18 +4181,16 @@ esac
+@@ -4091,18 +4190,16 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -7029,7 +7111,7 @@
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 +4236,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -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
@@ -7041,7 +7123,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -4163,14 +4251,14 @@ for as_dir in $PATH
+@@ -4163,14 +4260,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7059,7 +7141,7 @@
IFS=$as_save_IFS
;;
-@@ -4178,19 +4266,19 @@ esac
+@@ -4178,19 +4275,19 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -7083,7 +7165,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -4203,14 +4291,14 @@ for as_dir in $PATH
+@@ -4203,14 +4300,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7101,7 +7183,7 @@
IFS=$as_save_IFS
;;
-@@ -4218,19 +4306,19 @@ esac
+@@ -4218,19 +4315,19 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -7125,7 +7207,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -4243,14 +4331,14 @@ for as_dir in $PATH
+@@ -4243,14 +4340,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7143,7 +7225,7 @@
IFS=$as_save_IFS
;;
-@@ -4258,19 +4346,19 @@ esac
+@@ -4258,19 +4355,19 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -7167,7 +7249,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -4283,14 +4371,14 @@ for as_dir in $PATH
+@@ -4283,14 +4380,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7185,7 +7267,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -4299,33 +4387,29 @@ esac
+@@ -4299,33 +4396,29 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -7225,7 +7307,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -4338,14 +4422,14 @@ for as_dir in $PATH
+@@ -4338,14 +4431,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7243,7 +7325,7 @@
IFS=$as_save_IFS
;;
-@@ -4353,34 +4437,28 @@ esac
+@@ -4353,34 +4446,28 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -7285,7 +7367,7 @@
fi
fi
-@@ -4390,11 +4468,7 @@ 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
@@ -7298,7 +7380,7 @@
/* end confdefs.h. */
int
-@@ -4406,120 +4480,13 @@ extern int _nl_msg_cat_cntr;
+@@ -4406,120 +4489,13 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -7423,7 +7505,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -4531,10 +4498,8 @@ fi
+@@ -4531,10 +4507,8 @@ fi
;;
esac
fi
@@ -7436,7 +7518,7 @@
fi
-@@ -4542,17 +4507,13 @@ fi
+@@ -4542,17 +4516,13 @@ fi
@@ -7457,7 +7539,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -4577,54 +4538,27 @@ for ac_lib in '' cposix; do
+@@ -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
@@ -7520,7 +7602,7 @@
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
fi
-@@ -4637,9 +4571,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -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
@@ -7532,7 +7614,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4650,24 +4584,24 @@ for as_dir in $PATH
+@@ -4650,24 +4593,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7562,7 +7644,7 @@
$as_echo "no" >&6; }
fi
-@@ -4677,9 +4611,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -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
@@ -7574,7 +7656,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4690,24 +4624,24 @@ for as_dir in $PATH
+@@ -4690,24 +4633,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7604,7 +7686,7 @@
$as_echo "no" >&6; }
fi
-@@ -4716,7 +4650,7 @@ fi
+@@ -4716,7 +4659,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7613,7 +7695,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4730,9 +4664,9 @@ if test -z "$CC"; then
+@@ -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
@@ -7625,7 +7707,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4743,24 +4677,24 @@ for as_dir in $PATH
+@@ -4743,24 +4686,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7655,7 +7737,7 @@
$as_echo "no" >&6; }
fi
-@@ -4770,9 +4704,9 @@ 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
@@ -7667,7 +7749,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4784,18 +4718,18 @@ for as_dir in $PATH
+@@ -4784,18 +4727,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7689,7 +7771,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -4814,10 +4748,10 @@ fi
+@@ -4814,10 +4757,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -7702,7 +7784,7 @@
$as_echo "no" >&6; }
fi
-@@ -4829,9 +4763,9 @@ if test -z "$CC"; then
+@@ -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
@@ -7714,7 +7796,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4842,24 +4776,24 @@ for as_dir in $PATH
+@@ -4842,24 +4785,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7744,7 +7826,7 @@
$as_echo "no" >&6; }
fi
-@@ -4873,9 +4807,9 @@ if test -z "$CC"; then
+@@ -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
@@ -7756,7 +7838,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4886,24 +4820,24 @@ for as_dir in $PATH
+@@ -4886,24 +4829,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7786,7 +7868,7 @@
$as_echo "no" >&6; }
fi
-@@ -4916,7 +4850,7 @@ done
+@@ -4916,7 +4859,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7795,7 +7877,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4927,62 +4861,42 @@ fi
+@@ -4927,62 +4870,42 @@ fi
fi
@@ -7880,7 +7962,7 @@
/* end confdefs.h. */
int
-@@ -4996,37 +4910,16 @@ main ()
+@@ -4996,37 +4919,16 @@ main ()
return 0;
}
_ACEOF
@@ -7921,7 +8003,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5035,20 +4928,16 @@ else
+@@ -5035,20 +4937,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -7945,7 +8027,7 @@
/* end confdefs.h. */
int
-@@ -5059,35 +4948,11 @@ main ()
+@@ -5059,35 +4957,11 @@ main ()
return 0;
}
_ACEOF
@@ -7984,7 +8066,7 @@
/* end confdefs.h. */
int
-@@ -5098,36 +4963,12 @@ main ()
+@@ -5098,36 +4972,12 @@ main ()
return 0;
}
_ACEOF
@@ -8025,7 +8107,7 @@
/* end confdefs.h. */
int
-@@ -5138,42 +4979,17 @@ main ()
+@@ -5138,42 +4988,17 @@ main ()
return 0;
}
_ACEOF
@@ -8070,7 +8152,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5190,18 +5006,14 @@ else
+@@ -5190,18 +5015,14 @@ else
CFLAGS=
fi
fi
@@ -8092,7 +8174,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5258,32 +5070,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -5258,32 +5079,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -8126,7 +8208,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5294,17 +5083,19 @@ fi
+@@ -5294,17 +5092,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -8149,7 +8231,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5314,9 +5105,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -5314,9 +5114,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -8161,7 +8243,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5424,7 +5215,7 @@ else
+@@ -5424,7 +5224,7 @@ else
fi
fi
@@ -8170,7 +8252,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5444,14 +5235,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -5444,14 +5244,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
@@ -8187,7 +8269,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -5466,11 +5257,7 @@ do
+@@ -5466,11 +5266,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.
@@ -8200,7 +8282,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5479,78 +5266,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5479,78 +5275,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8284,7 +8366,7 @@
break
fi
-@@ -5562,7 +5305,7 @@ fi
+@@ -5562,7 +5314,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -8293,7 +8375,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -5573,11 +5316,7 @@ do
+@@ -5573,11 +5325,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.
@@ -8306,7 +8388,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -5586,87 +5325,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -5586,87 +5334,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -8403,7 +8485,7 @@
fi
ac_ext=c
-@@ -5676,9 +5368,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5676,9 +5377,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8415,7 +8497,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -5689,7 +5381,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5689,7 +5390,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8424,7 +8506,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 +5401,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -5709,7 +5410,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
@@ -8433,7 +8515,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 +5416,24 @@ esac
+@@ -5724,26 +5425,24 @@ esac
$ac_path_GREP_found && break 3
done
done
@@ -8465,7 +8547,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -5757,7 +5447,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5757,7 +5456,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8474,7 +8556,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 +5467,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -5777,7 +5476,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
@@ -8483,7 +8565,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 +5482,10 @@ esac
+@@ -5792,12 +5491,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
@@ -8498,7 +8580,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -5805,21 +5493,17 @@ fi
+@@ -5805,21 +5502,17 @@ fi
fi
fi
@@ -8524,7 +8606,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -5834,48 +5518,23 @@ main ()
+@@ -5834,48 +5527,23 @@ main ()
return 0;
}
_ACEOF
@@ -8578,7 +8660,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5885,18 +5544,14 @@ fi
+@@ -5885,18 +5553,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -8600,7 +8682,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5906,14 +5561,10 @@ fi
+@@ -5906,14 +5570,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.
@@ -8617,7 +8699,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -5940,57 +5591,28 @@ main ()
+@@ -5940,57 +5600,28 @@ main ()
return 0;
}
_ACEOF
@@ -8683,7 +8765,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -6015,35 +5637,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -6015,35 +5646,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 ||
@@ -8726,7 +8808,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -6059,28 +5673,24 @@ IFS=$ac_save_IFS
+@@ -6059,28 +5682,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -8760,7 +8842,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -6096,9 +5706,9 @@ IFS=$ac_save_IFS
+@@ -6096,9 +5715,9 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -8772,7 +8854,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6106,7 +5716,7 @@ else
+@@ -6106,7 +5725,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -8781,7 +8863,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 +5725,7 @@ for as_dir in $PATH
+@@ -6115,7 +5734,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8790,7 +8872,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 +5745,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -6135,7 +5754,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
@@ -8799,7 +8881,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 +5760,17 @@ esac
+@@ -6150,19 +5769,17 @@ esac
$ac_path_SED_found && break 3
done
done
@@ -8822,7 +8904,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6180,9 +5788,9 @@ Xsed="$SED -e 1s/^X//"
+@@ -6180,9 +5797,9 @@ Xsed="$SED -e 1s/^X//"
@@ -8834,7 +8916,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6196,7 +5804,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -6196,7 +5813,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8843,7 +8925,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 +5824,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -6216,7 +5833,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
@@ -8852,7 +8934,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 +5839,10 @@ esac
+@@ -6231,12 +5848,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
@@ -8867,7 +8949,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6244,7 +5850,7 @@ fi
+@@ -6244,7 +5859,7 @@ fi
fi
fi
@@ -8876,7 +8958,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6270,7 +5876,7 @@ test -z "$GREP" && GREP=grep
+@@ -6270,7 +5885,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
@@ -8885,7 +8967,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6279,7 +5885,7 @@ fi
+@@ -6279,7 +5894,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -8894,7 +8976,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6309,13 +5915,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -6309,13 +5924,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -8911,7 +8993,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6346,18 +5952,16 @@ fi
+@@ -6346,18 +5961,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -8935,7 +9017,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6370,7 +5974,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -6370,7 +5983,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -8944,7 +9026,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -6382,9 +5986,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -6382,9 +5995,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -8956,7 +9038,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6431,7 +6035,7 @@ else
+@@ -6431,7 +6044,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -8965,7 +9047,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -6442,9 +6046,9 @@ else
+@@ -6442,9 +6055,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
@@ -8977,7 +9059,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -6455,24 +6059,24 @@ for as_dir in $PATH
+@@ -6455,24 +6068,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9007,7 +9089,7 @@
$as_echo "no" >&6; }
fi
-@@ -6486,9 +6090,9 @@ if test -z "$DUMPBIN"; then
+@@ -6486,9 +6099,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
@@ -9019,7 +9101,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6499,24 +6103,24 @@ for as_dir in $PATH
+@@ -6499,24 +6112,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9049,7 +9131,7 @@
$as_echo "no" >&6; }
fi
-@@ -6529,7 +6133,7 @@ done
+@@ -6529,7 +6142,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9058,7 +9140,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6549,44 +6153,44 @@ test -z "$NM" && NM=nm
+@@ -6549,44 +6162,44 @@ test -z "$NM" && NM=nm
@@ -9072,15 +9154,15 @@
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:6163: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6172: $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:6166: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6175: $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:6169: output\"" >&5)
++ (eval echo "\"\$as_me:6178: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9114,7 +9196,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -6704,10 +6308,10 @@ else
+@@ -6704,10 +6317,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -9127,7 +9209,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -6721,7 +6325,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -6721,7 +6334,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -9136,7 +9218,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -6731,17 +6335,17 @@ xsi_shell=no
+@@ -6731,17 +6344,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -9157,7 +9239,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -6776,14 +6380,14 @@ esac
+@@ -6776,14 +6389,14 @@ esac
@@ -9175,7 +9257,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -6812,9 +6416,9 @@ esac
+@@ -6812,9 +6425,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
@@ -9187,7 +9269,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6825,24 +6429,24 @@ for as_dir in $PATH
+@@ -6825,24 +6438,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9217,7 +9299,7 @@
$as_echo "no" >&6; }
fi
-@@ -6852,9 +6456,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -6852,9 +6465,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
@@ -9229,7 +9311,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6865,24 +6469,24 @@ for as_dir in $PATH
+@@ -6865,24 +6478,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9259,7 +9341,7 @@
$as_echo "no" >&6; }
fi
-@@ -6891,7 +6495,7 @@ fi
+@@ -6891,7 +6504,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9268,7 +9350,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6911,9 +6515,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -6911,9 +6524,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -9280,7 +9362,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7032,7 +6636,7 @@ linux* | k*bsd*-gnu)
+@@ -7032,7 +6645,7 @@ linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -9289,7 +9371,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 +6711,7 @@ tpf*)
+@@ -7107,7 +6720,7 @@ tpf*)
esac
fi
@@ -9298,7 +9380,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 +6731,9 @@ test -z "$deplibs_check_method" && depli
+@@ -7127,9 +6740,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
@@ -9310,7 +9392,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7140,24 +6744,24 @@ for as_dir in $PATH
+@@ -7140,24 +6753,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9340,7 +9422,7 @@
$as_echo "no" >&6; }
fi
-@@ -7167,9 +6771,9 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -7167,9 +6780,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
@@ -9352,7 +9434,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7180,24 +6784,24 @@ for as_dir in $PATH
+@@ -7180,24 +6793,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9382,7 +9464,7 @@
$as_echo "no" >&6; }
fi
-@@ -7206,7 +6810,7 @@ fi
+@@ -7206,7 +6819,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9391,7 +9473,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7232,9 +6836,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -7232,9 +6845,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
@@ -9403,7 +9485,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7245,24 +6849,24 @@ for as_dir in $PATH
+@@ -7245,24 +6858,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9433,7 +9515,7 @@
$as_echo "no" >&6; }
fi
-@@ -7272,9 +6876,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -7272,9 +6885,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
@@ -9445,7 +9527,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7285,24 +6889,24 @@ for as_dir in $PATH
+@@ -7285,24 +6898,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9475,7 +9557,7 @@
$as_echo "no" >&6; }
fi
-@@ -7311,7 +6915,7 @@ fi
+@@ -7311,7 +6924,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9484,7 +9566,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7331,9 +6935,9 @@ test -z "$STRIP" && STRIP=:
+@@ -7331,9 +6944,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
@@ -9496,7 +9578,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7344,24 +6948,24 @@ for as_dir in $PATH
+@@ -7344,24 +6957,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9526,7 +9608,7 @@
$as_echo "no" >&6; }
fi
-@@ -7371,9 +6975,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -7371,9 +6984,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
@@ -9538,7 +9620,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -7384,24 +6988,24 @@ for as_dir in $PATH
+@@ -7384,24 +6997,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9568,7 +9650,7 @@
$as_echo "no" >&6; }
fi
-@@ -7410,7 +7014,7 @@ fi
+@@ -7410,7 +7023,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9577,7 +9659,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7488,9 +7092,9 @@ compiler=$CC
+@@ -7488,9 +7101,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -9589,7 +9671,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -7606,18 +7210,18 @@ void nm_test_func(void){}
+@@ -7606,18 +7219,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -9614,7 +9696,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -7670,11 +7274,11 @@ _LT_EOF
+@@ -7670,11 +7283,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -9629,7 +9711,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -7708,10 +7312,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -7708,10 +7321,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
@@ -9642,7 +9724,7 @@
$as_echo "ok" >&6; }
fi
-@@ -7737,7 +7341,7 @@ fi
+@@ -7737,7 +7350,7 @@ fi
# Check whether --enable-libtool-lock was given.
@@ -9651,7 +9733,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -7749,11 +7353,11 @@ case $host in
+@@ -7749,11 +7362,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9666,13 +9748,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -7767,12 +7371,12 @@ ia64-*-hpux*)
+@@ -7767,12 +7380,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7770 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7374 "configure"' > conftest.$ac_ext
++ echo '#line 7383 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9683,7 +9765,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -7806,11 +7410,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
+@@ -7806,11 +7419,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
@@ -9698,7 +9780,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -7859,9 +7463,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -7859,9 +7472,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"
@@ -9710,7 +9792,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -7870,11 +7474,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -7870,11 +7483,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
@@ -9723,7 +9805,7 @@
/* end confdefs.h. */
int
-@@ -7885,38 +7485,13 @@ main ()
+@@ -7885,38 +7494,13 @@ main ()
return 0;
}
_ACEOF
@@ -9766,7 +9848,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7924,7 +7499,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -7924,7 +7508,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -9775,7 +9857,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 +7509,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -7934,11 +7518,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -9790,7 +9872,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -7964,9 +7539,9 @@ need_locks="$enable_libtool_lock"
+@@ -7964,9 +7548,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
@@ -9802,7 +9884,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -7977,24 +7552,24 @@ for as_dir in $PATH
+@@ -7977,24 +7561,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9832,7 +9914,7 @@
$as_echo "no" >&6; }
fi
-@@ -8004,9 +7579,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -8004,9 +7588,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
@@ -9844,7 +9926,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8017,24 +7592,24 @@ for as_dir in $PATH
+@@ -8017,24 +7601,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9874,7 +9956,7 @@
$as_echo "no" >&6; }
fi
-@@ -8043,7 +7618,7 @@ fi
+@@ -8043,7 +7627,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9883,7 +9965,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8056,9 +7631,9 @@ fi
+@@ -8056,9 +7640,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
@@ -9895,7 +9977,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8069,24 +7644,24 @@ for as_dir in $PATH
+@@ -8069,24 +7653,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9925,7 +10007,7 @@
$as_echo "no" >&6; }
fi
-@@ -8096,9 +7671,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -8096,9 +7680,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
@@ -9937,7 +10019,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8109,24 +7684,24 @@ for as_dir in $PATH
+@@ -8109,24 +7693,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9967,7 +10049,7 @@
$as_echo "no" >&6; }
fi
-@@ -8135,7 +7710,7 @@ fi
+@@ -8135,7 +7719,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -9976,7 +10058,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8148,9 +7723,9 @@ fi
+@@ -8148,9 +7732,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
@@ -9988,7 +10070,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8161,24 +7736,24 @@ for as_dir in $PATH
+@@ -8161,24 +7745,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10018,7 +10100,7 @@
$as_echo "no" >&6; }
fi
-@@ -8188,9 +7763,9 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -8188,9 +7772,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
@@ -10030,7 +10112,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8201,24 +7776,24 @@ for as_dir in $PATH
+@@ -8201,24 +7785,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10060,7 +10142,7 @@
$as_echo "no" >&6; }
fi
-@@ -8227,7 +7802,7 @@ fi
+@@ -8227,7 +7811,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10069,7 +10151,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8240,9 +7815,9 @@ fi
+@@ -8240,9 +7824,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
@@ -10081,7 +10163,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8253,24 +7828,24 @@ for as_dir in $PATH
+@@ -8253,24 +7837,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10111,7 +10193,7 @@
$as_echo "no" >&6; }
fi
-@@ -8280,9 +7855,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -8280,9 +7864,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
@@ -10123,7 +10205,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8293,24 +7868,24 @@ for as_dir in $PATH
+@@ -8293,24 +7877,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10153,7 +10235,7 @@
$as_echo "no" >&6; }
fi
-@@ -8319,7 +7894,7 @@ fi
+@@ -8319,7 +7903,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10162,7 +10244,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8332,9 +7907,9 @@ fi
+@@ -8332,9 +7916,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
@@ -10174,7 +10256,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8345,24 +7920,24 @@ for as_dir in $PATH
+@@ -8345,24 +7929,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10204,7 +10286,7 @@
$as_echo "no" >&6; }
fi
-@@ -8372,9 +7947,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -8372,9 +7956,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
@@ -10216,7 +10298,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -8385,24 +7960,24 @@ for as_dir in $PATH
+@@ -8385,24 +7969,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10246,7 +10328,7 @@
$as_echo "no" >&6; }
fi
-@@ -8411,7 +7986,7 @@ fi
+@@ -8411,7 +7995,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10255,7 +10337,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8447,9 +8022,9 @@ fi
+@@ -8447,9 +8031,9 @@ fi
@@ -10267,7 +10349,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -8474,22 +8049,18 @@ else
+@@ -8474,22 +8058,18 @@ else
rm -f conftest.*
fi
fi
@@ -10294,7 +10376,7 @@
/* end confdefs.h. */
int
-@@ -8500,42 +8071,17 @@ main ()
+@@ -8500,42 +8080,17 @@ main ()
return 0;
}
_ACEOF
@@ -10342,7 +10424,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -8573,69 +8119,14 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -8573,69 +8128,14 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
esac
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
@@ -10418,7 +10500,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -8645,62 +8136,13 @@ fi
+@@ -8645,62 +8145,13 @@ fi
done
@@ -10486,7 +10568,7 @@
_ACEOF
fi
-@@ -8720,7 +8162,7 @@ done
+@@ -8720,7 +8171,7 @@ done
# Check whether --enable-shared was given.
@@ -10495,7 +10577,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -8751,7 +8193,7 @@ fi
+@@ -8751,7 +8202,7 @@ fi
# Check whether --enable-static was given.
@@ -10504,7 +10586,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -8783,7 +8225,7 @@ fi
+@@ -8783,7 +8234,7 @@ fi
# Check whether --with-pic was given.
@@ -10513,7 +10595,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -8799,7 +8241,7 @@ test -z "$pic_mode" && pic_mode=default
+@@ -8799,7 +8250,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
@@ -10522,7 +10604,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -8880,9 +8322,9 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -8880,9 +8331,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -10534,7 +10616,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -8895,7 +8337,7 @@ else
+@@ -8895,7 +8346,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -10543,7 +10625,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -8988,9 +8430,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -8988,9 +8439,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -10555,7 +10637,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9041,10 +8483,10 @@ fi
+@@ -9041,10 +8492,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10568,7 +10650,7 @@
$as_echo "no" >&6; }
fi
-@@ -9054,9 +8496,9 @@ fi
+@@ -9054,9 +8505,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -10580,7 +10662,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9107,10 +8549,10 @@ fi
+@@ -9107,10 +8558,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -10593,7 +10675,7 @@
$as_echo "no" >&6; }
fi
-@@ -9191,9 +8633,9 @@ lt_prog_compiler_no_builtin_flag=
+@@ -9191,9 +8642,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -10605,21 +10687,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9209,11 +8651,11 @@ else
+@@ -9209,11 +8660,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:8654: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8663: $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:8658: \$? = $ac_status" >&5
++ echo "$as_me:8667: \$? = $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 +8668,7 @@ else
+@@ -9226,7 +8677,7 @@ else
$RM conftest*
fi
@@ -10628,7 +10710,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9246,7 +8688,7 @@ fi
+@@ -9246,7 +8697,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -10637,7 +10719,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9518,7 +8960,7 @@ case $host_os in
+@@ -9518,7 +8969,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -10646,7 +10728,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -9530,9 +8972,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -9530,9 +8981,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
@@ -10658,21 +10740,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -9548,11 +8990,11 @@ else
+@@ -9548,11 +8999,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:8993: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9002: $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:8997: \$? = $ac_status" >&5
++ echo "$as_me:9006: \$? = $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 +9007,7 @@ else
+@@ -9565,7 +9016,7 @@ else
$RM conftest*
fi
@@ -10681,7 +10763,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -9589,9 +9031,9 @@ fi
+@@ -9589,9 +9040,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\"
@@ -10693,7 +10775,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -9617,7 +9059,7 @@ else
+@@ -9617,7 +9068,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -10702,7 +10784,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -9632,9 +9074,9 @@ fi
+@@ -9632,9 +9083,9 @@ fi
@@ -10714,21 +10796,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9653,11 +9095,11 @@ else
+@@ -9653,11 +9104,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:9098: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9107: $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:9102: \$? = $ac_status" >&5
++ echo "$as_me:9111: \$? = $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 +9121,7 @@ else
+@@ -9679,7 +9130,7 @@ else
$RM conftest*
fi
@@ -10737,7 +10819,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9687,9 +9129,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -9687,9 +9138,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
@@ -10749,21 +10831,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9708,11 +9150,11 @@ else
+@@ -9708,11 +9159,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:9153: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9162: $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:9157: \$? = $ac_status" >&5
++ echo "$as_me:9166: \$? = $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 +9176,7 @@ else
+@@ -9734,7 +9185,7 @@ else
$RM conftest*
fi
@@ -10772,7 +10854,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9743,7 +9185,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -9743,7 +9194,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
@@ -10781,7 +10863,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -9751,10 +9193,10 @@ $as_echo_n "checking if we can lock with
+@@ -9751,10 +9202,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
@@ -10794,7 +10876,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 +9209,7 @@ fi
+@@ -9767,7 +9218,7 @@ fi
@@ -10803,7 +10885,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -9827,6 +9269,9 @@ $as_echo_n "checking whether the $compil
+@@ -9827,6 +9278,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -10813,7 +10895,7 @@
esac
ld_shlibs=yes
-@@ -10009,7 +9454,7 @@ _LT_EOF
+@@ -10009,7 +9463,7 @@ _LT_EOF
fi
;;
@@ -10822,7 +10904,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10184,6 +9629,7 @@ _LT_EOF
+@@ -10184,6 +9638,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10830,7 +10912,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10209,11 +9655,7 @@ _LT_EOF
+@@ -10209,11 +9664,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10843,7 +10925,7 @@
/* end confdefs.h. */
int
-@@ -10224,27 +9666,7 @@ main ()
+@@ -10224,27 +9675,7 @@ main ()
return 0;
}
_ACEOF
@@ -10872,7 +10954,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10258,16 +9680,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10258,16 +9689,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
@@ -10891,7 +10973,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10280,11 +9695,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10280,11 +9704,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10904,7 +10986,7 @@
/* end confdefs.h. */
int
-@@ -10295,27 +9706,7 @@ main ()
+@@ -10295,27 +9715,7 @@ main ()
return 0;
}
_ACEOF
@@ -10933,7 +11015,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10329,16 +9720,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10329,16 +9729,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
@@ -10952,7 +11034,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10550,42 +9934,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10550,42 +9943,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"
@@ -11000,7 +11082,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 +9956,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10598,7 +9965,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -11009,7 +11091,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 +10199,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -10841,7 +10208,7 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -11018,7 +11100,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -10878,16 +10236,16 @@ x|xyes)
+@@ -10878,16 +10245,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.
@@ -11039,7 +11121,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -10901,11 +10259,11 @@ $as_echo_n "checking whether -lc should
+@@ -10901,11 +10268,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -11054,7 +11136,7 @@
then
archive_cmds_need_lc=no
else
-@@ -10916,7 +10274,7 @@ $as_echo_n "checking whether -lc should
+@@ -10916,7 +10283,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -11063,7 +11145,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11080,7 +10438,7 @@ esac
+@@ -11080,7 +10447,7 @@ esac
@@ -11072,7 +11154,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11502,11 +10860,7 @@ linux* | k*bsd*-gnu)
+@@ -11502,11 +10869,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -11085,7 +11167,7 @@
/* end confdefs.h. */
int
-@@ -11517,41 +10871,13 @@ main ()
+@@ -11517,41 +10880,13 @@ main ()
return 0;
}
_ACEOF
@@ -11131,7 +11213,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -11575,6 +10901,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11575,6 +10910,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11150,7 +11232,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11763,7 +11101,7 @@ uts4*)
+@@ -11763,7 +11110,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -11159,7 +11241,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -11865,7 +11203,7 @@ fi
+@@ -11865,7 +11212,7 @@ fi
@@ -11168,7 +11250,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -11890,7 +11228,7 @@ else
+@@ -11890,7 +11237,7 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -11177,7 +11259,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -11935,18 +11273,14 @@ else
+@@ -11935,18 +11282,14 @@ else
darwin*)
# if libdl is installed we need to link against it
@@ -11199,7 +11281,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11964,43 +11298,18 @@ return dlopen ();
+@@ -11964,43 +11307,18 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11249,7 +11331,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12013,33 +11322,19 @@ fi
+@@ -12013,33 +11331,19 @@ fi
;;
*)
@@ -11293,7 +11375,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -12048,13 +11343,6 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -12048,13 +11352,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char shl_load ();
@@ -11307,7 +11389,7 @@
int
main ()
{
-@@ -12063,56 +11351,32 @@ return shl_load ();
+@@ -12063,56 +11360,32 @@ return shl_load ();
return 0;
}
_ACEOF
@@ -11383,7 +11465,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12121,222 +11385,37 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -12121,222 +11394,37 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -11623,7 +11705,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12354,57 +11433,28 @@ return dlopen ();
+@@ -12354,57 +11442,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -11690,7 +11772,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12422,43 +11472,18 @@ return dld_link ();
+@@ -12422,43 +11481,18 @@ return dld_link ();
return 0;
}
_ACEOF
@@ -11740,7 +11822,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12497,9 +11522,9 @@ fi
+@@ -12497,9 +11531,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -11752,16 +11834,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12508,7 +11533,7 @@ else
+@@ -12508,7 +11542,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 11536 "configure"
++#line 11545 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12567,11 +11592,11 @@ int main ()
+@@ -12567,11 +11601,11 @@ int main ()
return status;
}
_LT_EOF
@@ -11776,7 +11858,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12588,14 +11613,14 @@ rm -fr conftest*
+@@ -12588,14 +11622,14 @@ rm -fr conftest*
fi
@@ -11794,16 +11876,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12604,7 +11629,7 @@ else
+@@ -12604,7 +11638,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 11632 "configure"
++#line 11641 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12663,11 +11688,11 @@ int main ()
+@@ -12663,11 +11697,11 @@ int main ()
return status;
}
_LT_EOF
@@ -11818,7 +11900,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12684,7 +11709,7 @@ rm -fr conftest*
+@@ -12684,7 +11718,7 @@ rm -fr conftest*
fi
@@ -11827,7 +11909,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -12723,12 +11748,12 @@ fi
+@@ -12723,12 +11757,12 @@ fi
striplib=
old_striplib=
@@ -11842,7 +11924,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -12737,15 +11762,15 @@ else
+@@ -12737,15 +11771,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -11861,7 +11943,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -12763,12 +11788,12 @@ fi
+@@ -12763,12 +11797,12 @@ fi
# Report which library types will actually be built
@@ -11877,7 +11959,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -12789,14 +11814,14 @@ $as_echo_n "checking whether to build sh
+@@ -12789,14 +11823,14 @@ $as_echo_n "checking whether to build sh
fi
;;
esac
@@ -11895,7 +11977,7 @@
$as_echo "$enable_static" >&6; }
-@@ -12833,9 +11858,9 @@ CC="$lt_save_CC"
+@@ -12833,9 +11867,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
@@ -11907,7 +11989,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -12848,14 +11873,14 @@ for as_dir in $PATH
+@@ -12848,14 +11882,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11925,7 +12007,7 @@
IFS=$as_save_IFS
;;
-@@ -12863,10 +11888,10 @@ esac
+@@ -12863,10 +11897,10 @@ esac
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -11938,7 +12020,7 @@
$as_echo "no" >&6; }
fi
-@@ -12892,7 +11917,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+@@ -12892,7 +11926,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
# Check whether --enable-compile-warnings was given.
@@ -11947,7 +12029,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -12923,13 +11948,9 @@ fi
+@@ -12923,13 +11957,9 @@ fi
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -11963,7 +12045,7 @@
/* end confdefs.h. */
int
-@@ -12940,35 +11961,14 @@ main ()
+@@ -12940,35 +11970,14 @@ main ()
return 0;
}
_ACEOF
@@ -12002,7 +12084,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -12982,26 +11982,24 @@ $as_echo "$has_option" >&6; }
+@@ -12982,26 +11991,24 @@ $as_echo "$has_option" >&6; }
fi
;;
*)
@@ -12034,7 +12116,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 +12014,7 @@ $as_echo_n "checking what language compl
+@@ -13016,7 +12023,7 @@ $as_echo_n "checking what language compl
esac
fi
fi
@@ -12043,7 +12125,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -13024,7 +12022,7 @@ $as_echo "$complCFLAGS" >&6; }
+@@ -13024,7 +12031,7 @@ $as_echo "$complCFLAGS" >&6; }
# Check whether --enable-deprecations was given.
@@ -12052,7 +12134,7 @@
enableval=$enable_deprecations;
else
enable_deprecations=no
-@@ -13048,9 +12046,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
+@@ -13048,9 +12055,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
@@ -12064,7 +12146,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -13063,14 +12061,14 @@ for as_dir in $PATH
+@@ -13063,14 +12070,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12082,7 +12164,7 @@
IFS=$as_save_IFS
;;
-@@ -13078,10 +12076,10 @@ esac
+@@ -13078,10 +12085,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -12095,7 +12177,7 @@
$as_echo "no" >&6; }
fi
-@@ -13091,9 +12089,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -13091,9 +12098,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
@@ -12107,7 +12189,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -13106,14 +12104,14 @@ for as_dir in $PATH
+@@ -13106,14 +12113,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12125,7 +12207,7 @@
IFS=$as_save_IFS
;;
-@@ -13121,10 +12119,10 @@ esac
+@@ -13121,10 +12128,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -12138,7 +12220,7 @@
$as_echo "no" >&6; }
fi
-@@ -13133,7 +12131,7 @@ fi
+@@ -13133,7 +12140,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12147,7 +12229,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -13146,13 +12144,13 @@ fi
+@@ -13146,13 +12153,13 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -12164,7 +12246,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -13161,19 +12159,20 @@ fi
+@@ -13161,70 +12168,68 @@ fi
pkg_failed=no
@@ -12186,14 +12268,14 @@
gio-2.0 >= \$GLIB_REQUIRED
gtk+-2.0 >= \$GTK_REQUIRED
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
+- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
-\"") >&5
+\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
-@@ -13181,8 +12180,8 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12203,7 +12285,9 @@
pkg_cv_GNOME_SESSION_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
-@@ -13192,19 +12191,21 @@ if test -n "$GNOME_SESSION_CFLAGS"; then
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12227,14 +12311,14 @@
gio-2.0 >= \$GLIB_REQUIRED
gtk+-2.0 >= \$GTK_REQUIRED
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
+- devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED
-\"") >&5
+\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
-@@ -13212,8 +12213,8 @@ if test -n "$GNOME_SESSION_LIBS"; then
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -12244,7 +12328,9 @@
pkg_cv_GNOME_SESSION_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
-@@ -13223,8 +12224,9 @@ if test -n "$GNOME_SESSION_LIBS"; then
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ " 2>/dev/null`
else
pkg_failed=yes
fi
@@ -12256,7 +12342,7 @@
fi
-@@ -13237,40 +12239,24 @@ else
+@@ -13237,44 +12242,25 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12265,7 +12351,7 @@
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
-" 2>&1`
+"`
else
@@ -12274,7 +12360,7 @@
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
-" 2>&1`
+"`
fi
@@ -12302,6 +12388,10 @@
gio-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED
+ ) were not met:
+
+ $GNOME_SESSION_PKG_ERRORS
@@ -13285,22 +12271,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.
@@ -13478,7 +13568,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -14257,12 +13082,11 @@ and EGG_SMCLIENT_LIBS to avoid the need
+@@ -14257,20 +13082,102 @@ 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/>.
@@ -13493,16 +13583,99 @@
$as_echo "yes" >&6; }
:
fi
-@@ -14270,7 +13094,7 @@ fi
-
-
+
+
+
++
++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 -n "$PKG_CONFIG"; then
++ if test -n "$DEVKIT_POWER_CFLAGS"; then
++ pkg_cv_DEVKIT_POWER_CFLAGS="$DEVKIT_POWER_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED") 2>&5
++ ac_status=$?
++ $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
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$DEVKIT_POWER_LIBS"; then
++ pkg_cv_DEVKIT_POWER_LIBS="$DEVKIT_POWER_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED") 2>&5
++ ac_status=$?
++ $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
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED"`
++ else
++ DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$DEVKIT_POWER_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ have_devkit_power=no
++
++elif test $pkg_failed = untried; then
++ have_devkit_power=no
++
++else
++ DEVKIT_POWER_CFLAGS=$pkg_cv_DEVKIT_POWER_CFLAGS
++ DEVKIT_POWER_LIBS=$pkg_cv_DEVKIT_POWER_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ have_devkit_power=yes
++fi
++if test "$have_devkit_power" = yes; then
++
++$as_echo "#define HAVE_DEVKIT_POWER 1" >>confdefs.h
++
++fi
++
++
++
++
++
# Check whether --with-default-wm was given.
-if test "${with_default_wm+set}" = set; then
+if test "${with_default_wm+set}" = set; then :
withval=$with_default_wm;
else
with_default_wm="metacity"
-@@ -14289,7 +13113,7 @@ fi
+@@ -14289,7 +13196,7 @@ fi
# Check whether --enable-splash was given.
@@ -13511,7 +13684,7 @@
enableval=$enable_splash;
else
enable_splash=no
-@@ -14307,9 +13131,9 @@ fi
+@@ -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
@@ -13523,7 +13696,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -14322,14 +13146,14 @@ for as_dir in $PATH
+@@ -14322,14 +13229,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13541,7 +13714,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-@@ -14338,18 +13162,16 @@ esac
+@@ -14338,18 +13245,16 @@ esac
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -13563,7 +13736,7 @@
fi
-@@ -14361,13 +13183,13 @@ fi
+@@ -14361,13 +13266,13 @@ fi
# Check whether --with-gconf-source was given.
@@ -13579,7 +13752,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 +13198,20 @@ $as_echo "Using config source $GCONF_SCH
+@@ -14376,22 +13281,20 @@ $as_echo "Using config source $GCONF_SCH
# Check whether --with-gconf-schema-file-dir was given.
@@ -13606,7 +13779,7 @@
esac
fi
-@@ -14413,9 +13233,9 @@ fi
+@@ -14413,9 +13316,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
@@ -13618,7 +13791,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONF_SANITY_CHECK in
-@@ -14428,14 +13248,14 @@ for as_dir in $PATH
+@@ -14428,14 +13331,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13636,7 +13809,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GCONF_SANITY_CHECK" && ac_cv_path_GCONF_SANITY_CHECK="no"
-@@ -14444,18 +13264,16 @@ esac
+@@ -14444,18 +13347,16 @@ esac
fi
GCONF_SANITY_CHECK=$ac_cv_path_GCONF_SANITY_CHECK
if test -n "$GCONF_SANITY_CHECK"; then
@@ -13658,7 +13831,7 @@
fi
-@@ -14480,12 +13298,12 @@ case x_libs in
+@@ -14480,12 +13381,12 @@ case x_libs in
esac
if test $pango_omitted_x_deps = yes ; then
@@ -13673,7 +13846,7 @@
withval=$with_x;
fi
-@@ -14495,10 +13313,8 @@ if test "x$with_x" = xno; then
+@@ -14495,10 +13396,8 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -13686,7 +13859,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -14546,21 +13362,25 @@ fi
+@@ -14546,21 +13445,25 @@ fi
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -13712,7 +13885,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -14582,37 +13402,14 @@ ac_x_header_dirs='
+@@ -14582,37 +13485,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.
@@ -13752,7 +13925,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 +13417,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -14620,7 +13500,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
done
fi
@@ -13760,7 +13933,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -14630,11 +13426,7 @@ if test "$ac_x_libraries" = no; then
+@@ -14630,11 +13509,7 @@ if test "$ac_x_libraries" = no; then
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -13773,7 +13946,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -14645,35 +13437,12 @@ XrmInitialize ()
+@@ -14645,35 +13520,12 @@ XrmInitialize ()
return 0;
}
_ACEOF
@@ -13811,7 +13984,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 +13454,8 @@ do
+@@ -14685,10 +13537,8 @@ do
done
done
fi
@@ -13824,7 +13997,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -14709,7 +13476,7 @@ fi
+@@ -14709,7 +13559,7 @@ fi
fi # $with_x != no
if test "$have_x" != yes; then
@@ -13833,7 +14006,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -14720,16 +13487,14 @@ else
+@@ -14720,16 +13570,14 @@ else
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -13852,7 +14025,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -14742,16 +13507,12 @@ else
+@@ -14742,16 +13590,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 . . . .
@@ -13871,7 +14044,7 @@
/* end confdefs.h. */
int
-@@ -14762,40 +13523,13 @@ main ()
+@@ -14762,40 +13606,13 @@ main ()
return 0;
}
_ACEOF
@@ -13916,7 +14089,7 @@
/* end confdefs.h. */
int
-@@ -14806,46 +13540,19 @@ main ()
+@@ -14806,46 +13623,19 @@ main ()
return 0;
}
_ACEOF
@@ -13970,7 +14143,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -14861,11 +13568,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -14861,11 +13651,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"
@@ -13983,7 +14156,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14883,44 +13586,17 @@ return XOpenDisplay ();
+@@ -14883,44 +13669,17 @@ return XOpenDisplay ();
return 0;
}
_ACEOF
@@ -14033,7 +14206,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14938,59 +13614,30 @@ return dnet_ntoa ();
+@@ -14938,59 +13697,30 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -14102,7 +14275,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15008,52 +13655,25 @@ return dnet_ntoa ();
+@@ -15008,52 +13738,25 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -14163,7 +14336,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -15064,105 +13684,20 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -15064,105 +13767,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.
@@ -14186,7 +14359,9 @@
- 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
@@ -14245,9 +14420,7 @@
-
- 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
@@ -14274,7 +14447,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15180,59 +13715,30 @@ return gethostbyname ();
+@@ -15180,59 +13798,30 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -14343,7 +14516,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15250,43 +13756,18 @@ return gethostbyname ();
+@@ -15250,43 +13839,18 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -14393,7 +14566,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -15300,33 +13781,21 @@ fi
+@@ -15300,33 +13864,21 @@ 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.
@@ -14439,7 +14612,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -15335,13 +13804,6 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -15335,13 +13887,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char connect ();
@@ -14453,7 +14626,7 @@
int
main ()
{
-@@ -15350,55 +13812,38 @@ return connect ();
+@@ -15350,55 +13895,38 @@ return connect ();
return 0;
}
_ACEOF
@@ -14533,7 +14706,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15407,85 +13852,48 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -15407,85 +13935,48 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -14643,7 +14816,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -15493,71 +13901,50 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -15493,284 +13984,27 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -14687,79 +14860,50 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_remove=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ipc_shmat=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_remove=no
-+ ac_cv_lib_ipc_shmat=no
- fi
+-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:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
-+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
-+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- 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_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then
-+ fi
-+ fi
-+
-+ # Check for libraries that X11R6 Xt/Xaw programs need.
-+ ac_save_LDFLAGS=$LDFLAGS
-+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-+ # check for ICE first), but we must link in the order -lSM -lICE or
-+ # we get undefined symbols. So assume we have SM if we have ICE.
-+ # 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
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
-+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
+- $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
-+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -15566,292 +13953,27 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* 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 ();
-+char IceConnectionNumber ();
- int
- main ()
- {
+-int
+-main ()
+-{
-return remove ();
-+return IceConnectionNumber ();
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -14940,66 +15084,57 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_ipc_shmat=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ipc_shmat=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_ipc_shmat=no
--fi
++ ac_cv_lib_ipc_shmat=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_ipc_shmat" >&5
--$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+ $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
-- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
--fi
--
-- fi
-- fi
--
-- # Check for libraries that X11R6 Xt/Xaw programs need.
-- ac_save_LDFLAGS=$LDFLAGS
-- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-- # check for ICE first), but we must link in the order -lSM -lICE or
-- # we get undefined symbols. So assume we have SM if we have ICE.
-- # 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
++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+
+@@ -15786,18 +14020,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
- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lICE $X_EXTRA_LIBS $LIBS"
++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_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 IceConnectionNumber ();
--int
--main ()
--{
--return IceConnectionNumber ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -15815,43 +14045,18 @@ return IceConnectionNumber ();
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -15046,7 +15181,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -15861,26 +13983,20 @@ fi
+@@ -15861,26 +14066,20 @@ fi
if test x$no_x = xyes ; then
@@ -15077,7 +15212,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15898,50 +14014,22 @@ return XauFileName ();
+@@ -15898,50 +14097,22 @@ return XauFileName ();
return 0;
}
_ACEOF
@@ -15136,7 +15271,7 @@
fi
-@@ -15949,61 +14037,16 @@ fi
+@@ -15949,61 +14120,16 @@ fi
have_xsync=no
@@ -15202,7 +15337,7 @@
fi
-@@ -16011,40 +14054,44 @@ fi
+@@ -16011,40 +14137,44 @@ fi
have_xtest=no
pkg_failed=no
@@ -15266,7 +15401,7 @@
fi
-@@ -16057,14 +14104,14 @@ else
+@@ -16057,14 +14187,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15284,7 +15419,7 @@
$as_echo "no" >&6; }
have_xtest=no
elif test $pkg_failed = untried; then
-@@ -16072,15 +14119,13 @@ elif test $pkg_failed = untried; then
+@@ -16072,15 +14202,13 @@ elif test $pkg_failed = untried; then
else
XTEST_CFLAGS=$pkg_cv_XTEST_CFLAGS
XTEST_LIBS=$pkg_cv_XTEST_LIBS
@@ -15302,7 +15437,7 @@
fi
-@@ -16090,40 +14135,44 @@ fi
+@@ -16090,40 +14218,44 @@ fi
pkg_failed=no
@@ -15366,7 +15501,7 @@
fi
-@@ -16136,14 +14185,14 @@ else
+@@ -16136,14 +14268,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15384,7 +15519,7 @@
$as_echo "no" >&6; }
have_xrender=no
elif test $pkg_failed = untried; then
-@@ -16151,7 +14200,7 @@ elif test $pkg_failed = untried; then
+@@ -16151,7 +14283,7 @@ elif test $pkg_failed = untried; then
else
XRENDER_CFLAGS=$pkg_cv_XRENDER_CFLAGS
XRENDER_LIBS=$pkg_cv_XRENDER_LIBS
@@ -15393,7 +15528,7 @@
$as_echo "yes" >&6; }
have_xrender=yes
fi
-@@ -16165,9 +14214,7 @@ fi
+@@ -16165,9 +14297,7 @@ fi
if test $have_xrender=yes; then
@@ -15404,7 +15539,7 @@
fi
-@@ -16176,7 +14223,7 @@ fi
+@@ -16176,7 +14306,7 @@ fi
# Check whether --enable-docbook-docs was given.
@@ -15413,7 +15548,7 @@
enableval=$enable_docbook_docs; enable_docbook_docs=$enableval
else
enable_docbook_docs=auto
-@@ -16184,9 +14231,9 @@ fi
+@@ -16184,9 +14314,9 @@ fi
# Extract the first word of "xmlto", so it can be a program name with args.
set dummy xmlto; ac_word=$2
@@ -15425,7 +15560,7 @@
$as_echo_n "(cached) " >&6
else
case $XMLTO in
-@@ -16199,14 +14246,14 @@ for as_dir in $PATH
+@@ -16199,14 +14329,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15443,7 +15578,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_XMLTO" && ac_cv_path_XMLTO="no"
-@@ -16215,15 +14262,15 @@ esac
+@@ -16215,15 +14345,15 @@ esac
fi
XMLTO=$ac_cv_path_XMLTO
if test -n "$XMLTO"; then
@@ -15462,7 +15597,7 @@
$as_echo_n "checking whether to build DocBook documentation... " >&6; }
if test x$XMLTO = xno ; then
have_docbook=no
-@@ -16239,9 +14286,7 @@ if test x$enable_docbook_docs = xauto ;
+@@ -16239,9 +14369,7 @@ if test x$enable_docbook_docs = xauto ;
fi
if test x$enable_docbook_docs = xyes; then
if test x$have_docbook = xno; then
@@ -15473,7 +15608,7 @@
fi
fi
if test x$enable_docbook_docs = xyes; then
-@@ -16252,14 +14297,14 @@ else
+@@ -16252,14 +14380,14 @@ else
DOCBOOK_DOCS_ENABLED_FALSE=
fi
@@ -15491,7 +15626,7 @@
$as_echo_n "(cached) " >&6
else
case $XSLTPROC in
-@@ -16272,14 +14317,14 @@ for as_dir in $PATH
+@@ -16272,14 +14400,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15509,7 +15644,7 @@
IFS=$as_save_IFS
;;
-@@ -16287,10 +14332,10 @@ esac
+@@ -16287,10 +14415,10 @@ esac
fi
XSLTPROC=$ac_cv_path_XSLTPROC
if test -n "$XSLTPROC"; then
@@ -15522,18 +15657,11 @@
$as_echo "no" >&6; }
fi
-@@ -16305,168 +14350,25 @@ _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
-+#define HAVE_LOCALE_H 1
-+_ACEOF
-
+@@ -16305,168 +14433,25 @@ _ACEOF
+
+
+
+-
-for ac_header in locale.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -15542,20 +15670,12 @@
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-+
-+done
-+
-+ if test $ac_cv_header_locale_h = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
-+$as_echo_n "checking for LC_MESSAGES... " >&6; }
-+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -15687,17 +15807,26 @@
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
--
--fi
--
--done
--
-- if test $ac_cv_header_locale_h = yes; then
++ 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
++#define HAVE_LOCALE_H 1
++_ACEOF
+
+ fi
+
+ done
+
+ if test $ac_cv_header_locale_h = yes; then
- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
--$as_echo_n "checking for LC_MESSAGES... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+ $as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
++if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -15707,7 +15836,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -16477,46 +14379,19 @@ return LC_MESSAGES
+@@ -16477,46 +14462,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -15760,7 +15889,7 @@
fi
fi
-@@ -16529,155 +14404,20 @@ _ACEOF
+@@ -16529,155 +14487,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
@@ -15921,7 +16050,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -16690,54 +14430,25 @@ return !ngettext ("","", 1)
+@@ -16690,54 +14513,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -15984,7 +16113,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -16750,141 +14461,26 @@ return !dgettext ("","")
+@@ -16750,141 +14544,26 @@ return !dgettext ("","")
return 0;
}
_ACEOF
@@ -16136,7 +16265,7 @@
_ACEOF
fi
-@@ -16899,18 +14495,14 @@ done
+@@ -16899,18 +14578,14 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -16158,7 +16287,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16928,55 +14520,26 @@ return bindtextdomain ();
+@@ -16928,55 +14603,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
@@ -16223,7 +16352,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16994,55 +14557,26 @@ return ngettext ();
+@@ -16994,55 +14640,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -16288,7 +16417,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17060,43 +14594,18 @@ return dgettext ();
+@@ -17060,43 +14677,18 @@ return dgettext ();
return 0;
}
_ACEOF
@@ -16338,7 +16467,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -17106,22 +14615,18 @@ fi
+@@ -17106,22 +14698,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -16366,7 +16495,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17139,55 +14644,26 @@ return ngettext ();
+@@ -17139,55 +14727,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -16431,7 +16560,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17205,43 +14681,18 @@ return dcgettext ();
+@@ -17205,43 +14764,18 @@ return dcgettext ();
return 0;
}
_ACEOF
@@ -16481,7 +16610,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -17263,102 +14714,12 @@ fi
+@@ -17263,102 +14797,12 @@ fi
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -16589,7 +16718,7 @@
_ACEOF
fi
-@@ -17388,15 +14749,13 @@ done
+@@ -17388,15 +14832,13 @@ done
if test "$gt_cv_have_gettext" = "yes"; then
@@ -16608,7 +16737,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -17421,118 +14780,28 @@ esac
+@@ -17421,118 +14863,28 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -16735,7 +16864,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -17547,14 +14816,14 @@ msgstr ""
+@@ -17547,14 +14899,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -16755,7 +16884,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -17562,9 +14831,9 @@ fi
+@@ -17562,9 +14914,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -16767,7 +16896,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -17577,14 +14846,14 @@ for as_dir in $PATH
+@@ -17577,14 +14929,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16785,7 +16914,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -17593,19 +14862,19 @@ esac
+@@ -17593,19 +14945,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -16809,7 +16938,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -17630,18 +14899,14 @@ esac
+@@ -17630,18 +14982,14 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -16831,7 +16960,7 @@
/* end confdefs.h. */
int
-@@ -17653,121 +14918,14 @@ extern int _nl_msg_cat_cntr;
+@@ -17653,121 +15001,14 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -16957,7 +17086,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -17782,10 +14940,8 @@ fi
+@@ -17782,10 +15023,8 @@ fi
;;
esac
fi
@@ -16970,7 +17099,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -17799,9 +14955,7 @@ fi
+@@ -17799,9 +15038,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -16981,7 +17110,7 @@
fi
-@@ -17809,7 +14963,7 @@ _ACEOF
+@@ -17809,7 +15046,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -16990,7 +17119,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -17842,7 +14996,7 @@ $as_echo "found xgettext program is not
+@@ -17842,7 +15079,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -16999,7 +17128,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -17867,7 +15021,7 @@ $as_echo_n "checking for catalogs to be
+@@ -17867,7 +15104,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -17008,7 +17137,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -17900,16 +15054,12 @@ $as_echo "$LINGUAS" >&6; }
+@@ -17900,16 +15137,12 @@ $as_echo "$LINGUAS" >&6; }
< $srcdir/po/POTFILES.in > po/POTFILES
@@ -17028,7 +17157,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -17924,48 +15074,23 @@ main ()
+@@ -17924,48 +15157,23 @@ main ()
return 0;
}
_ACEOF
@@ -17082,7 +17211,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -17975,18 +15100,14 @@ fi
+@@ -17975,18 +15183,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -17104,7 +17233,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -17996,14 +15117,10 @@ fi
+@@ -17996,14 +15200,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.
@@ -17121,7 +17250,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -18030,199 +15147,31 @@ main ()
+@@ -18030,199 +15230,31 @@ main ()
return 0;
}
_ACEOF
@@ -17333,7 +17462,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -18233,169 +15182,26 @@ done
+@@ -18233,169 +15265,26 @@ done
@@ -17510,7 +17639,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18413,43 +15219,18 @@ return backtrace ();
+@@ -18413,43 +15302,18 @@ return backtrace ();
return 0;
}
_ACEOF
@@ -17560,7 +17689,7 @@
EXECINFO_LIBS="-lexecinfo"
else
EXECINFO_LIBS=""
-@@ -18459,151 +15240,12 @@ fi
+@@ -18459,151 +15323,12 @@ fi
oCFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
@@ -17716,7 +17845,7 @@
_ACEOF
fi
-@@ -18612,10 +15254,10 @@ done
+@@ -18612,10 +15337,10 @@ done
CFLAGS="$oCFLAGS"
@@ -17729,7 +17858,7 @@
enableval=$enable_ipv6;
else
enable_ipv6=yes
-@@ -18623,11 +15265,7 @@ fi
+@@ -18623,11 +15348,7 @@ fi
if test $enable_ipv6 = yes; then
@@ -17742,7 +17871,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -18635,132 +15273,27 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -18635,132 +15356,27 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
@@ -17888,7 +18017,7 @@
have_getaddrinfo=yes
fi
-@@ -18768,18 +15301,14 @@ fi
+@@ -18768,18 +15384,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`
@@ -17910,7 +18039,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18797,47 +15326,20 @@ return getaddrinfo ();
+@@ -18797,47 +15409,20 @@ return getaddrinfo ();
return 0;
}
_ACEOF
@@ -17966,7 +18095,7 @@
LIBS="$LIBS -l$lib";have_getaddrinfo=yes; break
fi
-@@ -18845,9 +15347,7 @@ fi
+@@ -18845,9 +15430,7 @@ fi
fi
if test $have_getaddrinfo=yes; then
@@ -17977,7 +18106,7 @@
fi
fi
-@@ -18858,9 +15358,9 @@ for ac_prog in mawk gawk nawk awk
+@@ -18858,9 +15441,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
@@ -17989,7 +18118,7 @@
$as_echo_n "(cached) " >&6
else
case $AWK in
-@@ -18873,14 +15373,14 @@ for as_dir in $PATH
+@@ -18873,14 +15456,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18007,7 +18136,7 @@
IFS=$as_save_IFS
;;
-@@ -18888,10 +15388,10 @@ esac
+@@ -18888,10 +15471,10 @@ esac
fi
AWK=$ac_cv_path_AWK
if test -n "$AWK"; then
@@ -18020,7 +18149,7 @@
$as_echo "no" >&6; }
fi
-@@ -18903,9 +15403,9 @@ for ac_prog in perl5 perl
+@@ -18903,9 +15486,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
@@ -18032,7 +18161,7 @@
$as_echo_n "(cached) " >&6
else
case $PERL in
-@@ -18918,14 +15418,14 @@ for as_dir in $PATH
+@@ -18918,14 +15501,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18050,7 +18179,7 @@
IFS=$as_save_IFS
;;
-@@ -18933,10 +15433,10 @@ esac
+@@ -18933,10 +15516,10 @@ esac
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
@@ -18063,7 +18192,7 @@
$as_echo "no" >&6; }
fi
-@@ -18948,7 +15448,7 @@ done
+@@ -18948,7 +15531,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.
@@ -18072,7 +18201,7 @@
enableval=$enable_rebuilds;
else
enable_rebuilds=yes
-@@ -18992,13 +15492,13 @@ _ACEOF
+@@ -18992,13 +15575,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -18088,7 +18217,7 @@
esac ;;
esac
done
-@@ -19006,8 +15506,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -19006,8 +15589,8 @@ $as_echo "$as_me: WARNING: cache variabl
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -18099,7 +18228,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -19030,11 +15530,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -19030,11 +15613,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" &&
@@ -18113,7 +18242,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -19054,8 +15554,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
+@@ -19054,8 +15637,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.
@@ -18124,7 +18253,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -19071,80 +15571,54 @@ else
+@@ -19071,80 +15654,54 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -18226,7 +18355,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -19154,17 +15628,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -19154,17 +15711,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -18252,7 +18381,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -19172,23 +15647,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -19172,23 +15730,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -18281,7 +18410,7 @@
as_nl='
'
export as_nl
-@@ -19196,7 +15663,13 @@ export as_nl
+@@ -19196,7 +15746,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
@@ -18296,7 +18425,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -19207,7 +15680,7 @@ else
+@@ -19207,7 +15763,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -18305,7 +18434,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -19230,13 +15703,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -19230,13 +15786,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -18319,7 +18448,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -19246,15 +15712,15 @@ fi
+@@ -19246,15 +15795,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -18338,7 +18467,7 @@
IFS=$as_save_IFS
;;
-@@ -19266,12 +15732,16 @@ if test "x$as_myself" = x; then
+@@ -19266,12 +15815,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
@@ -18359,7 +18488,7 @@
done
PS1='$ '
PS2='> '
-@@ -19283,7 +15753,89 @@ export LC_ALL
+@@ -19283,7 +15836,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -18450,7 +18579,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -19297,8 +15849,12 @@ else
+@@ -19297,8 +15932,12 @@ else
as_basename=false
fi
@@ -18464,7 +18593,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -19318,76 +15874,25 @@ $as_echo X/"$0" |
+@@ -19318,76 +15957,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
@@ -18552,7 +18681,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -19416,8 +15921,56 @@ fi
+@@ -19416,8 +16004,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -18610,7 +18739,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -19436,10 +15989,10 @@ else
+@@ -19436,10 +16072,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -18623,7 +18752,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -19454,13 +16007,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -19454,13 +16090,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
exec 6>&1
@@ -18645,7 +18774,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -19492,10 +16051,11 @@ _ACEOF
+@@ -19492,10 +16134,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -18660,7 +18789,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -19517,16 +16077,16 @@ $config_headers
+@@ -19517,16 +16160,16 @@ $config_headers
Configuration commands:
$config_commands
@@ -18680,7 +18809,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -19569,20 +16129,19 @@ do
+@@ -19569,20 +16212,19 @@ do
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -18705,7 +18834,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -19590,11 +16149,10 @@ Try \`$0 --help' for more information."
+@@ -19590,11 +16232,10 @@ Try \`$0 --help' for more information."
ac_cs_silent=: ;;
# This is an error.
@@ -18720,7 +18849,7 @@
ac_need_defaults=false ;;
esac
-@@ -19931,9 +16489,7 @@ do
+@@ -19931,9 +16572,7 @@ do
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -18731,7 +18860,7 @@
esac
done
-@@ -19960,7 +16516,7 @@ $debug ||
+@@ -19960,7 +16599,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -18740,7 +18869,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -19971,11 +16527,7 @@ $debug ||
+@@ -19971,11 +16610,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -18753,7 +18882,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -19983,10 +16535,16 @@ $debug ||
+@@ -19983,10 +16618,16 @@ $debug ||
if test -n "$CONFIG_FILES"; then
@@ -18772,7 +18901,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -20000,24 +16558,18 @@ _ACEOF
+@@ -20000,24 +16641,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -18800,7 +18929,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20106,9 +16658,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -20106,9 +16741,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -18811,7 +18940,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -20149,9 +16699,7 @@ for ac_last_try in false false :; do
+@@ -20149,9 +16782,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -18822,7 +18951,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -20236,9 +16784,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -20236,9 +16867,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -18833,7 +18962,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -20251,9 +16797,7 @@ do
+@@ -20251,9 +16880,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -18844,7 +18973,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -20281,12 +16825,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -20281,12 +16908,10 @@ $as_echo "$as_me: error: invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -18859,7 +18988,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -20297,7 +16839,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -20297,7 +16922,7 @@ $as_echo "$as_me: error: cannot find inp
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -18868,7 +18997,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -20310,9 +16852,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -20310,9 +16935,7 @@ $as_echo "$as_me: creating $ac_file" >&6
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -18879,7 +19008,7 @@
esac
;;
esac
-@@ -20340,47 +16880,7 @@ $as_echo X"$ac_file" |
+@@ -20340,47 +16963,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
@@ -18928,7 +19057,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -20437,7 +16937,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -20437,7 +17020,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=
@@ -18936,7 +19065,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -20447,12 +16946,11 @@ ac_sed_dataroot='
+@@ -20447,12 +17029,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -18951,7 +19080,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 +16960,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -20462,7 +17043,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -18960,7 +19089,7 @@
esac
_ACEOF
-@@ -20491,14 +16989,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+@@ -20491,14 +17072,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 \
@@ -18977,7 +19106,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 +17004,7 @@ which seems to be undefined. Please mak
+@@ -20508,9 +17087,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 \
@@ -18988,7 +19117,7 @@
;;
:H)
#
-@@ -20521,25 +17015,19 @@ $as_echo "$as_me: error: could not creat
+@@ -20521,25 +17098,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" \
@@ -19018,7 +19147,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -20577,7 +17065,7 @@ $as_echo X"$_am_arg" |
+@@ -20577,7 +17148,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -19027,7 +19156,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -20672,47 +17160,7 @@ $as_echo X"$file" |
+@@ -20672,47 +17243,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -19076,7 +19205,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -21359,9 +17807,7 @@ _LT_EOF
+@@ -21359,9 +17890,7 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
@@ -19087,7 +19216,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -21384,15 +17830,12 @@ $as_echo "$as_me: error: po/Makefile.in.
+@@ -21384,15 +17913,12 @@ $as_echo "$as_me: error: po/Makefile.in.
done # for ac_tag
@@ -19105,7 +19234,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -21413,10 +17856,10 @@ if test "$no_create" != yes; then
+@@ -21413,10 +17939,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.
@@ -19118,11 +19247,36 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
+@@ -21439,6 +17965,7 @@ echo "
+ cflags: ${CFLAGS}
+ Maintainer mode: ${USE_MAINTAINER_MODE}
+
++ 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
===================================================================
---- gnome-session-2.28.0.orig/data/Makefile.in 2009-09-21 18:20:11.000000000 +0200
-+++ gnome-session-2.28.0/data/Makefile.in 2009-10-24 13:25:58.694257400 +0200
-@@ -239,6 +239,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -153,6 +153,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -179,6 +181,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -239,6 +242,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19132,9 +19286,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/data/icons/16x16/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/16x16/Makefile.in 2009-09-21 18:20:11.000000000 +0200
-+++ gnome-session-2.28.0/data/icons/16x16/Makefile.in 2009-10-24 13:25:58.774257726 +0200
-@@ -191,6 +191,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -131,6 +133,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19144,9 +19315,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/data/icons/22x22/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/22x22/Makefile.in 2009-09-21 18:20:11.000000000 +0200
-+++ gnome-session-2.28.0/data/icons/22x22/Makefile.in 2009-10-24 13:25:58.850258446 +0200
-@@ -191,6 +191,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -131,6 +133,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19156,9 +19344,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/data/icons/24x24/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/24x24/Makefile.in 2009-09-21 18:20:11.000000000 +0200
-+++ gnome-session-2.28.0/data/icons/24x24/Makefile.in 2009-10-24 13:25:58.930258271 +0200
-@@ -191,6 +191,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -131,6 +133,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19168,9 +19373,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/data/icons/32x32/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/32x32/Makefile.in 2009-09-21 18:20:11.000000000 +0200
-+++ gnome-session-2.28.0/data/icons/32x32/Makefile.in 2009-10-24 13:25:59.010259076 +0200
-@@ -191,6 +191,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -131,6 +133,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19180,9 +19402,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/data/icons/48x48/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/48x48/Makefile.in 2009-09-21 18:20:11.000000000 +0200
-+++ gnome-session-2.28.0/data/icons/48x48/Makefile.in 2009-10-24 13:25:59.090258423 +0200
-@@ -191,6 +191,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -131,6 +133,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19192,9 +19431,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/data/icons/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/Makefile.in 2009-09-21 18:20:11.000000000 +0200
-+++ gnome-session-2.28.0/data/icons/Makefile.in 2009-10-24 13:25:59.166258168 +0200
-@@ -207,6 +207,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -121,6 +121,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -147,6 +149,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -207,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19204,9 +19460,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/data/icons/scalable/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/data/icons/scalable/Makefile.in 2009-09-21 18:20:11.000000000 +0200
-+++ gnome-session-2.28.0/data/icons/scalable/Makefile.in 2009-10-24 13:25:59.246258985 +0200
-@@ -191,6 +191,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -105,6 +105,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -131,6 +133,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -191,6 +194,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19216,9 +19489,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/doc/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/doc/Makefile.in 2009-09-21 18:20:11.000000000 +0200
-+++ gnome-session-2.28.0/doc/Makefile.in 2009-10-24 13:25:59.326257841 +0200
-@@ -207,6 +207,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -121,6 +121,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -147,6 +149,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -207,6 +210,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19228,9 +19518,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/doc/dbus/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/doc/dbus/Makefile.in 2009-09-21 18:20:12.000000000 +0200
-+++ gnome-session-2.28.0/doc/dbus/Makefile.in 2009-10-24 13:25:59.406258157 +0200
-@@ -192,6 +192,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -106,6 +106,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -132,6 +134,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -192,6 +195,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19240,9 +19547,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/doc/man/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/doc/man/Makefile.in 2009-09-21 18:20:12.000000000 +0200
-+++ gnome-session-2.28.0/doc/man/Makefile.in 2009-10-24 13:25:59.489758916 +0200
-@@ -192,6 +192,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -106,6 +106,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -132,6 +134,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -192,6 +195,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19252,9 +19576,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/egg/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/egg/Makefile.in 2009-09-21 18:20:12.000000000 +0200
-+++ gnome-session-2.28.0/egg/Makefile.in 2009-10-24 13:25:59.638258450 +0200
-@@ -216,6 +216,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -130,6 +130,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -156,6 +158,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -216,6 +219,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19264,9 +19605,35 @@
PERL = @PERL@
Index: gnome-session-2.28.0/gnome-session/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/gnome-session/Makefile.in 2009-09-21 18:20:12.000000000 +0200
-+++ gnome-session-2.28.0/gnome-session/Makefile.in 2009-10-24 13:25:59.802259191 +0200
-@@ -235,6 +235,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -80,7 +80,7 @@ gnome_session_DEPENDENCIES = libgsmutil.
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_test_client_dbus_OBJECTS = test-client-dbus.$(OBJEXT) \
+ $(am__objects_1)
+ test_client_dbus_OBJECTS = $(am_test_client_dbus_OBJECTS)
+@@ -149,6 +149,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -175,6 +177,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -235,6 +238,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19274,10 +19641,26 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+@@ -330,6 +334,7 @@ INCLUDES = \
+ $(SM_CFLAGS) \
+ $(ICE_CFLAGS) \
+ $(GNOME_SESSION_CFLAGS) \
++ $(DEVKIT_POWER_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ -I$(top_srcdir)/egg \
+ -DLOCALE_DIR=\""$(datadir)/locale"\" \
+@@ -363,6 +368,7 @@ gnome_session_LDADD = \
+ $(SM_LIBS) \
+ $(ICE_LIBS) \
+ $(GNOME_SESSION_LIBS) \
++ $(DEVKIT_POWER_LIBS) \
+ $(GCONF_LIBS) \
+ $(XRENDER_LIBS) \
+ $(XTEST_LIBS) \
Index: gnome-session-2.28.0/ltmain.sh
===================================================================
---- gnome-session-2.28.0.orig/ltmain.sh 2009-09-21 18:19:59.000000000 +0200
-+++ gnome-session-2.28.0/ltmain.sh 2009-10-24 13:25:36.545759946 +0200
+--- 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
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -19378,8 +19761,8 @@
no)
Index: gnome-session-2.28.0/m4/libtool.m4
===================================================================
---- gnome-session-2.28.0.orig/m4/libtool.m4 2009-09-21 18:19:59.000000000 +0200
-+++ gnome-session-2.28.0/m4/libtool.m4 2009-10-24 13:25:36.545759946 +0200
+--- 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
@@ -2485,6 +2485,18 @@ linux* | k*bsd*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19465,9 +19848,26 @@
else
Index: gnome-session-2.28.0/splash/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/splash/Makefile.in 2009-09-21 18:20:12.000000000 +0200
-+++ gnome-session-2.28.0/splash/Makefile.in 2009-10-24 13:26:00.026266629 +0200
-@@ -229,6 +229,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -143,6 +143,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -169,6 +171,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -229,6 +232,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19477,9 +19877,26 @@
PERL = @PERL@
Index: gnome-session-2.28.0/tools/Makefile.in
===================================================================
---- gnome-session-2.28.0.orig/tools/Makefile.in 2009-09-21 18:20:12.000000000 +0200
-+++ gnome-session-2.28.0/tools/Makefile.in 2009-10-24 13:26:00.150259137 +0200
-@@ -202,6 +202,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+--- 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
+@@ -116,6 +116,8 @@ DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+ DEFAULT_WM = @DEFAULT_WM@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
++DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -142,6 +144,7 @@ GMSGFMT = @GMSGFMT@
+ GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@
+ GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@
+ GREP = @GREP@
++HAVE_DEVKIT_POWER = @HAVE_DEVKIT_POWER@
+ HAVE_XRENDER = @HAVE_XRENDER@
+ HAVE_XTEST = @HAVE_XTEST@
+ ICE_CFLAGS = @ICE_CFLAGS@
+@@ -202,6 +205,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19487,3 +19904,27 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
+Index: gnome-session-2.28.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
+@@ -18,6 +18,9 @@
+ /* Define to 1 if you have the `dcgettext' function. */
+ #undef HAVE_DCGETTEXT
+
++/* Have the DeviceKit-Power library */
++#undef HAVE_DEVKIT_POWER
++
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #undef HAVE_DLFCN_H
+
+@@ -100,6 +103,9 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+
Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=22247&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/series [utf-8] Fri Nov 6 13:01:42 2009
@@ -1,3 +1,4 @@
01_gnome-wm.patch
+03_devicekit_optional.patch
10_session_save.patch
90_relibtoolize.patch
More information about the pkg-gnome-commits
mailing list