r25085 - in /desktop/unstable/gdm3/debian: changelog patches/13_gdmsetup.patch patches/25_upower.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Sep 5 19:59:13 UTC 2010
Author: joss
Date: Sun Sep 5 19:59:12 2010
New Revision: 25085
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25085
Log:
* 25_upower.patch: stolen from upstream git. Use directly upower-glib
instead of devkit-power-gobject. Closes: #595087.
* Update build-dependencies accordingly.
Added:
desktop/unstable/gdm3/debian/patches/25_upower.patch
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch
desktop/unstable/gdm3/debian/patches/90_relibtoolize.patch
desktop/unstable/gdm3/debian/patches/series
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=25085&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sun Sep 5 19:59:12 2010
@@ -14,6 +14,9 @@
21_schemas_usr.patch, 24_show_user_other.patch: refreshed.
* 14_bindv6only.patch, 25_xdmcpfill_length.patch,
26_xdmcpfill_length.patch: dropped, merged upstream.
+ * 25_upower.patch: stolen from upstream git. Use directly upower-glib
+ instead of devkit-power-gobject. Closes: #595087.
+ * Update build-dependencies accordingly.
* 90_relibtoolize.patch: regenerated for the new version.
-- Josselin Mouette <joss at debian.org> Sun, 05 Sep 2010 21:49:10 +0200
Modified: desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch?rev=25085&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch [utf-8] Sun Sep 5 19:59:12 2010
@@ -12,10 +12,10 @@
# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/395299
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=587750
#
-Index: gdm-2.30.0/configure.ac
+Index: gdm-2.30.5/configure.ac
===================================================================
---- gdm-2.30.0.orig/configure.ac 2010-04-21 21:54:20.573200619 +0200
-+++ gdm-2.30.0/configure.ac 2010-04-21 21:54:31.233187563 +0200
+--- gdm-2.30.5.orig/configure.ac 2010-09-05 21:55:28.617148739 +0200
++++ gdm-2.30.5/configure.ac 2010-09-05 21:55:29.828652236 +0200
@@ -41,6 +41,7 @@ dnl ------------------------------------
DBUS_GLIB_REQUIRED_VERSION=0.74
@@ -24,9 +24,9 @@
GLIB_REQUIRED_VERSION=2.22.0
GTK_REQUIRED_VERSION=2.12.0
PANGO_REQUIRED_VERSION=1.3.0
-@@ -118,6 +119,14 @@ AC_SUBST(HAVE_DEVICEKIT_POWER)
- AC_SUBST(DEVKIT_POWER_CFLAGS)
- AC_SUBST(DEVKIT_POWER_LIBS)
+@@ -118,6 +119,14 @@ AC_SUBST(UPOWER)
+ AC_SUBST(UPOWER_CFLAGS)
+ AC_SUBST(UPOWER_LIBS)
+PKG_CHECK_MODULES(GDMSETUP,
+ polkit-gtk-1 >= $POLKIT_GTK_REQUIRED_VERSION
@@ -39,7 +39,7 @@
PKG_CHECK_MODULES(SIMPLE_GREETER,
dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gtk+-2.0 >= $GTK_REQUIRED_VERSION
-@@ -1389,6 +1398,7 @@ Makefile
+@@ -1396,6 +1405,7 @@ Makefile
daemon/Makefile
docs/Makefile
gui/Makefile
@@ -47,10 +47,10 @@
gui/simple-greeter/Makefile
gui/simple-greeter/libnotificationarea/Makefile
gui/simple-chooser/Makefile
-Index: gdm-2.30.0/gui/gdmsetup/gdmsetup.c
+Index: gdm-2.30.5/gui/gdmsetup/gdmsetup.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.0/gui/gdmsetup/gdmsetup.c 2010-04-21 21:54:31.233187563 +0200
++++ gdm-2.30.5/gui/gdmsetup/gdmsetup.c 2010-09-05 21:55:29.828652236 +0200
@@ -0,0 +1,370 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
@@ -422,10 +422,10 @@
+
+ return 0;
+}
-Index: gdm-2.30.0/gui/gdmsetup/Makefile.am
+Index: gdm-2.30.5/gui/gdmsetup/Makefile.am
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.0/gui/gdmsetup/Makefile.am 2010-04-21 21:54:31.233187563 +0200
++++ gdm-2.30.5/gui/gdmsetup/Makefile.am 2010-09-05 21:55:29.828652236 +0200
@@ -0,0 +1,42 @@
+NULL =
+
@@ -469,20 +469,20 @@
+ $(ui_DATA) \
+ $(System_in_files) \
+ $(NULL)
-Index: gdm-2.30.0/gui/Makefile.am
+Index: gdm-2.30.5/gui/Makefile.am
===================================================================
---- gdm-2.30.0.orig/gui/Makefile.am 2010-04-21 21:54:20.485199141 +0200
-+++ gdm-2.30.0/gui/Makefile.am 2010-04-21 21:54:31.233187563 +0200
-@@ -4,4 +4,5 @@ SUBDIRS = \
+--- gdm-2.30.5.orig/gui/Makefile.am 2010-09-05 21:52:30.592647525 +0200
++++ gdm-2.30.5/gui/Makefile.am 2010-09-05 21:55:29.832646459 +0200
+@@ -13,4 +13,5 @@ DIST_SUBDIRS = \
simple-chooser \
simple-greeter \
user-switch-applet \
+ gdmsetup \
$(NULL)
-Index: gdm-2.30.0/po/POTFILES.in
+Index: gdm-2.30.5/po/POTFILES.in
===================================================================
---- gdm-2.30.0.orig/po/POTFILES.in 2010-04-21 21:54:20.461194693 +0200
-+++ gdm-2.30.0/po/POTFILES.in 2010-04-21 21:54:31.233187563 +0200
+--- gdm-2.30.5.orig/po/POTFILES.in 2010-09-05 21:55:28.617148739 +0200
++++ gdm-2.30.5/po/POTFILES.in 2010-09-05 21:55:29.832646459 +0200
@@ -60,6 +60,9 @@ data/greeter-autostart/gok.desktop.in
data/greeter-autostart/metacity.desktop.in
data/greeter-autostart/orca-screen-reader.desktop.in
Added: desktop/unstable/gdm3/debian/patches/25_upower.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/25_upower.patch?rev=25085&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/25_upower.patch (added)
+++ desktop/unstable/gdm3/debian/patches/25_upower.patch [utf-8] Sun Sep 5 19:59:12 2010
@@ -1,0 +1,154 @@
+From 861261e434be78382928042035d129e8c3deb7f1 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Fri, 06 Aug 2010 10:21:47 +0000
+Subject: Port to UPower
+
+DeviceKit-Power has been renamed to UPower in January 2010.
+devkit-power-gobject is deprecated and will be removed in future versions of
+UPower.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=626176
+---
+Index: gdm-2.30.5/configure.ac
+===================================================================
+--- gdm-2.30.5.orig/configure.ac 2010-09-05 21:56:39.680648444 +0200
++++ gdm-2.30.5/configure.ac 2010-09-05 21:56:42.881152620 +0200
+@@ -52,7 +52,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0
+ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
+ #FONTCONFIG_REQUIRED_VERSION=2.6.0
+ FONTCONFIG_REQUIRED_VERSION=2.5.0
+-DEVKIT_POWER_REQUIRED_VERSION=008
++UPOWER_REQUIRED_VERSION=0.9.0
+
+ EXTRA_COMPILE_WARNINGS(yes)
+
+@@ -107,17 +107,17 @@ PKG_CHECK_MODULES(GCONF,
+ AC_SUBST(GCONF_CFLAGS)
+ AC_SUBST(GCONF_LIBS)
+
+-PKG_CHECK_MODULES(DEVKIT_POWER,
+- devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION,
+- have_devicekit_power=yes,
+- have_devicekit_power=no
++PKG_CHECK_MODULES(UPOWER,
++ upower-glib >= $UPOWER_REQUIRED_VERSION,
++ have_upower=yes,
++ have_upower=no
+ )
+-if test "x$have_devicekit_power" = "xyes" ; then
+- AC_DEFINE(HAVE_DEVICEKIT_POWER, [], [Define if we have DeviceKit-power])
++if test "x$have_upower" = "xyes" ; then
++ AC_DEFINE(HAVE_UPOWER, [], [Define if we have UPower])
+ fi
+-AC_SUBST(HAVE_DEVICEKIT_POWER)
+-AC_SUBST(DEVKIT_POWER_CFLAGS)
+-AC_SUBST(DEVKIT_POWER_LIBS)
++AC_SUBST(UPOWER)
++AC_SUBST(UPOWER_CFLAGS)
++AC_SUBST(UPOWER_LIBS)
+
+ PKG_CHECK_MODULES(GDMSETUP,
+ polkit-gtk-1 >= $POLKIT_GTK_REQUIRED_VERSION
+@@ -1477,5 +1477,6 @@ echo \
+ XDMCP support: ${XDMCP_SUPPORT}
+ SELinux support: ${with_selinux}
+ ConsoleKit support: ${use_console_kit}
++ UPower support: ${have_upower}
+ Build with RBAC: ${msg_rbac_shutdown}
+ "
+Index: gdm-2.30.5/gui/simple-greeter/Makefile.am
+===================================================================
+--- gdm-2.30.5.orig/gui/simple-greeter/Makefile.am 2010-09-05 21:56:03.128646516 +0200
++++ gdm-2.30.5/gui/simple-greeter/Makefile.am 2010-09-05 21:56:42.881152620 +0200
+@@ -18,8 +18,7 @@ AM_CPPFLAGS = \
+ -DSBINDIR=\""$(sbindir)"\" \
+ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
+ -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
+- $(DEVKIT_POWER_CFLAGS) \
+- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
++ $(UPOWER_CFLAGS) \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(SIMPLE_GREETER_CFLAGS) \
+@@ -143,7 +142,7 @@ test_greeter_panel_LDADD = \
+ $(GTK_LIBS) \
+ $(GCONF_LIBS) \
+ $(LIBXKLAVIER_LIBS) \
+- $(DEVKIT_POWER_LIBS) \
++ $(UPOWER_LIBS) \
+ $(NULL)
+
+ test_remote_login_window_SOURCES = \
+@@ -331,7 +330,7 @@ gdm_simple_greeter_LDADD = \
+ $(SIMPLE_GREETER_LIBS) \
+ $(RBAC_LIBS) \
+ $(LIBXKLAVIER_LIBS) \
+- $(DEVKIT_POWER_LIBS) \
++ $(UPOWER_LIBS) \
+ $(NULL)
+
+ uidir = $(pkgdatadir)
+Index: gdm-2.30.5/gui/simple-greeter/gdm-greeter-panel.c
+===================================================================
+--- gdm-2.30.5.orig/gui/simple-greeter/gdm-greeter-panel.c 2010-09-05 21:56:03.112644691 +0200
++++ gdm-2.30.5/gui/simple-greeter/gdm-greeter-panel.c 2010-09-05 21:56:42.881152620 +0200
+@@ -40,8 +40,8 @@
+ #include <gconf/gconf-client.h>
+ #include <dbus/dbus-glib.h>
+
+-#ifdef HAVE_DEVICEKIT_POWER
+-#include <devkit-power-gobject/devicekit-power.h>
++#ifdef HAVE_UPOWER
++#include <upower.h>
+ #endif
+
+ #include "gdm-languages.h"
+@@ -551,15 +551,13 @@ can_suspend (void)
+ {
+ gboolean ret = FALSE;
+
+-#ifdef HAVE_DEVICEKIT_POWER
+- DkpClient *dkp_client;
++#ifdef HAVE_UPOWER
++ UpClient *up_client;
+
+- /* use DeviceKit-power to get data */
+- dkp_client = dkp_client_new ();
+- g_object_get (dkp_client,
+- "can-suspend", &ret,
+- NULL);
+- g_object_unref (dkp_client);
++ /* use UPower to get data */
++ up_client = up_client_new ();
++ ret = up_client_get_can_suspend (up_client);
++ g_object_unref (up_client);
+ #endif
+
+ return ret;
+@@ -568,20 +566,20 @@ can_suspend (void)
+ static void
+ do_system_suspend (void)
+ {
+-#ifdef HAVE_DEVICEKIT_POWER
++#ifdef HAVE_UPOWER
+ gboolean ret;
+- DkpClient *dkp_client;
++ UpClient *up_client;
+ GError *error = NULL;
+
+- /* use DeviceKit-power to get data */
+- dkp_client = dkp_client_new ();
+- ret = dkp_client_suspend (dkp_client, &error);
++ /* use UPower to trigger suspend */
++ up_client = up_client_new ();
++ ret = up_client_suspend_sync (up_client, NULL, &error);
+ if (!ret) {
+ g_warning ("Couldn't suspend: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+- g_object_unref (dkp_client);
++ g_object_unref (up_client);
+ #endif
+ }
+
Modified: desktop/unstable/gdm3/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/90_relibtoolize.patch?rev=25085&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/90_relibtoolize.patch [utf-8] Sun Sep 5 19:59:12 2010
@@ -1,3 +1,4 @@
+cp /usr/share/gnome-doc-utils/gnome-doc-utils.make .
libtoolize --force --copy
aclocal -I m4
automake -acf -Wno-portability
@@ -7,8 +8,8 @@
Index: gdm-2.30.5/aclocal.m4
===================================================================
---- gdm-2.30.5.orig/aclocal.m4 2010-08-11 19:40:13.000000000 +0200
-+++ gdm-2.30.5/aclocal.m4 2010-09-05 19:54:18.856368406 +0200
+--- gdm-2.30.5.orig/aclocal.m4 2010-09-05 21:51:36.928643998 +0200
++++ gdm-2.30.5/aclocal.m4 2010-09-05 21:56:48.493149950 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -8125,8 +8126,8 @@
m4_include([acinclude.m4])
Index: gdm-2.30.5/common/Makefile.in
===================================================================
---- gdm-2.30.5.orig/common/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/common/Makefile.in 2010-09-05 19:54:21.928367145 +0200
+--- gdm-2.30.5.orig/common/Makefile.in 2010-09-05 21:51:36.916646175 +0200
++++ gdm-2.30.5/common/Makefile.in 2010-09-05 21:58:11.057142801 +0200
@@ -43,8 +43,10 @@ noinst_PROGRAMS = test-settings-server$(
subdir = common
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -8140,7 +8141,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -233,10 +235,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -206,8 +208,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -233,10 +233,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -8154,7 +8164,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -301,11 +306,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -252,7 +255,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -301,11 +303,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -8169,10 +8187,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -324,6 +329,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/config.guess
===================================================================
---- gdm-2.30.5.orig/config.guess 2010-07-01 22:24:24.000000000 +0200
-+++ gdm-2.30.5/config.guess 2010-09-05 19:53:59.276373251 +0200
+--- gdm-2.30.5.orig/config.guess 2010-09-05 21:51:36.900644352 +0200
++++ gdm-2.30.5/config.guess 2010-09-05 21:56:48.497145640 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -8200,8 +8228,8 @@
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
Index: gdm-2.30.5/config.sub
===================================================================
---- gdm-2.30.5.orig/config.sub 2010-07-01 22:24:24.000000000 +0200
-+++ gdm-2.30.5/config.sub 2010-09-05 19:53:59.276373251 +0200
+--- gdm-2.30.5.orig/config.sub 2010-09-05 21:51:36.888647018 +0200
++++ gdm-2.30.5/config.sub 2010-09-05 21:56:48.497145640 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -8260,8 +8288,8 @@
*)
Index: gdm-2.30.5/configure
===================================================================
---- gdm-2.30.5.orig/configure 2010-08-11 19:40:14.000000000 +0200
-+++ gdm-2.30.5/configure 2010-09-05 19:54:26.732363532 +0200
+--- gdm-2.30.5.orig/configure 2010-09-05 21:51:36.876648217 +0200
++++ gdm-2.30.5/configure 2010-09-05 21:58:14.692642291 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -9091,15 +9119,21 @@
PAM_PREFIX
GDM_GROUPNAME
GDM_USERNAME
-@@ -881,6 +840,8 @@ LIBXKLAVIER_LIBS
+@@ -881,9 +840,11 @@ LIBXKLAVIER_LIBS
LIBXKLAVIER_CFLAGS
SIMPLE_GREETER_LIBS
SIMPLE_GREETER_CFLAGS
+-HAVE_DEVICEKIT_POWER
+-DEVKIT_POWER_LIBS
+-DEVKIT_POWER_CFLAGS
+GDMSETUP_LIBS
+GDMSETUP_CFLAGS
- HAVE_DEVICEKIT_POWER
- DEVKIT_POWER_LIBS
- DEVKIT_POWER_CFLAGS
++UPOWER
++UPOWER_LIBS
++UPOWER_CFLAGS
+ GCONF_LIBS
+ GCONF_CFLAGS
+ CANBERRA_GTK_LIBS
@@ -924,6 +885,8 @@ ENABLE_SK_TRUE
DOC_USER_FORMATS
OMF_DIR
@@ -9134,10 +9168,14 @@
GTHREAD_CFLAGS
GTHREAD_LIBS
COMMON_CFLAGS
-@@ -1159,6 +1126,8 @@ GCONF_CFLAGS
+@@ -1157,8 +1124,10 @@ CANBERRA_GTK_CFLAGS
+ CANBERRA_GTK_LIBS
+ GCONF_CFLAGS
GCONF_LIBS
- DEVKIT_POWER_CFLAGS
- DEVKIT_POWER_LIBS
+-DEVKIT_POWER_CFLAGS
+-DEVKIT_POWER_LIBS
++UPOWER_CFLAGS
++UPOWER_LIBS
+GDMSETUP_CFLAGS
+GDMSETUP_LIBS
SIMPLE_GREETER_CFLAGS
@@ -9325,10 +9363,17 @@
GTHREAD_CFLAGS
C compiler flags for GTHREAD, overriding pkg-config
GTHREAD_LIBS
-@@ -1930,6 +1895,10 @@ Some influential environment variables:
- C compiler flags for DEVKIT_POWER, overriding pkg-config
- DEVKIT_POWER_LIBS
- linker flags for DEVKIT_POWER, overriding pkg-config
+@@ -1926,10 +1891,13 @@ Some influential environment variables:
+ GCONF_CFLAGS
+ C compiler flags for GCONF, overriding pkg-config
+ GCONF_LIBS linker flags for GCONF, 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
++ UPOWER_CFLAGS
++ C compiler flags for UPOWER, overriding pkg-config
++ UPOWER_LIBS linker flags for UPOWER, overriding pkg-config
+ GDMSETUP_CFLAGS
+ C compiler flags for GDMSETUP, overriding pkg-config
+ GDMSETUP_LIBS
@@ -9336,7 +9381,7 @@
SIMPLE_GREETER_CFLAGS
C compiler flags for SIMPLE_GREETER, overriding pkg-config
SIMPLE_GREETER_LIBS
-@@ -2016,379 +1985,889 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -2016,379 +1984,889 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
gdm configure 2.30.5
@@ -10537,7 +10582,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2419,9 +2898,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
+@@ -2419,9 +2897,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
fi
done
if test -z "$ac_aux_dir"; then
@@ -10548,7 +10593,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2447,10 +2924,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2447,10 +2923,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.
@@ -10561,7 +10606,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2458,11 +2935,11 @@ for as_dir in $PATH
+@@ -2458,11 +2934,11 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10577,7 +10622,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2499,7 +2976,7 @@ case $as_dir/ in
+@@ -2499,7 +2975,7 @@ case $as_dir/ in
;;
esac
@@ -10586,7 +10631,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2515,7 +2992,7 @@ fi
+@@ -2515,7 +2991,7 @@ fi
INSTALL=$ac_install_sh
fi
fi
@@ -10595,7 +10640,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2526,7 +3003,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2526,7 +3002,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -10604,7 +10649,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2537,15 +3014,11 @@ am_lf='
+@@ -2537,15 +3013,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -10622,7 +10667,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2567,11 +3040,8 @@ if (
+@@ -2567,11 +3039,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".
@@ -10636,7 +10681,7 @@
fi
test "$2" = conftest.file
-@@ -2580,13 +3050,10 @@ then
+@@ -2580,13 +3049,10 @@ then
# Ok.
:
else
@@ -10653,7 +10698,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2614,7 +3081,7 @@ if eval "$MISSING --run true"; then
+@@ -2614,7 +3080,7 @@ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -10662,7 +10707,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2635,9 +3102,9 @@ if test "$cross_compiling" != no; then
+@@ -2635,9 +3101,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
@@ -10674,7 +10719,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2648,24 +3115,24 @@ for as_dir in $PATH
+@@ -2648,24 +3114,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10704,7 +10749,7 @@
$as_echo "no" >&6; }
fi
-@@ -2675,9 +3142,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2675,9 +3141,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
@@ -10716,7 +10761,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2688,24 +3155,24 @@ for as_dir in $PATH
+@@ -2688,24 +3154,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10746,7 +10791,7 @@
$as_echo "no" >&6; }
fi
-@@ -2714,7 +3181,7 @@ fi
+@@ -2714,7 +3180,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -10755,7 +10800,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2727,10 +3194,10 @@ fi
+@@ -2727,10 +3193,10 @@ fi
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -10768,7 +10813,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2738,7 +3205,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
+@@ -2738,7 +3204,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10777,7 +10822,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 #(
-@@ -2750,11 +3217,12 @@ do
+@@ -2750,11 +3216,12 @@ do
esac
done
done
@@ -10791,7 +10836,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2762,11 +3230,10 @@ fi
+@@ -2762,11 +3229,10 @@ fi
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -10804,7 +10849,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2779,9 +3246,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2779,9 +3245,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
@@ -10816,7 +10861,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2792,24 +3259,24 @@ for as_dir in $PATH
+@@ -2792,24 +3258,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10846,7 +10891,7 @@
$as_echo "no" >&6; }
fi
-@@ -2817,11 +3284,11 @@ fi
+@@ -2817,11 +3283,11 @@ fi
test -n "$AWK" && break
done
@@ -10860,7 +10905,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2829,7 +3296,7 @@ SHELL = /bin/sh
+@@ -2829,7 +3295,7 @@ SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
@@ -10869,7 +10914,7 @@
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -2839,11 +3306,11 @@ esac
+@@ -2839,11 +3305,11 @@ esac
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -10883,7 +10928,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2863,9 +3330,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2863,9 +3329,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
@@ -10894,7 +10939,7 @@
fi
fi
-@@ -2922,7 +3387,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2922,7 +3386,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
# Check whether --enable-silent-rules was given.
@@ -10903,7 +10948,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2934,16 +3399,16 @@ esac
+@@ -2934,16 +3398,16 @@ esac
AM_BACKSLASH='\'
@@ -10923,7 +10968,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2970,7 +3435,7 @@ am__doit:
+@@ -2970,7 +3434,7 @@ am__doit:
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -10932,7 +10977,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2998,12 +3463,12 @@ if test "$am__include" = "#"; then
+@@ -2998,12 +3462,12 @@ if test "$am__include" = "#"; then
fi
@@ -10947,7 +10992,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3028,9 +3493,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3028,9 +3492,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
@@ -10959,7 +11004,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3041,24 +3506,24 @@ for as_dir in $PATH
+@@ -3041,24 +3505,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10989,7 +11034,7 @@
$as_echo "no" >&6; }
fi
-@@ -3068,9 +3533,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -3068,9 +3532,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
@@ -11001,7 +11046,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3081,24 +3546,24 @@ for as_dir in $PATH
+@@ -3081,24 +3545,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11031,7 +11076,7 @@
$as_echo "no" >&6; }
fi
-@@ -3107,7 +3572,7 @@ fi
+@@ -3107,7 +3571,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11040,7 +11085,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3121,9 +3586,9 @@ if test -z "$CC"; then
+@@ -3121,9 +3585,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
@@ -11052,7 +11097,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3134,24 +3599,24 @@ for as_dir in $PATH
+@@ -3134,24 +3598,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11082,7 +11127,7 @@
$as_echo "no" >&6; }
fi
-@@ -3161,9 +3626,9 @@ fi
+@@ -3161,9 +3625,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
@@ -11094,7 +11139,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3175,18 +3640,18 @@ for as_dir in $PATH
+@@ -3175,18 +3639,18 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11116,7 +11161,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3205,10 +3670,10 @@ fi
+@@ -3205,10 +3669,10 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -11129,7 +11174,7 @@
$as_echo "no" >&6; }
fi
-@@ -3220,9 +3685,9 @@ if test -z "$CC"; then
+@@ -3220,9 +3684,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
@@ -11141,7 +11186,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3233,24 +3698,24 @@ for as_dir in $PATH
+@@ -3233,24 +3697,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11171,7 +11216,7 @@
$as_echo "no" >&6; }
fi
-@@ -3264,9 +3729,9 @@ if test -z "$CC"; then
+@@ -3264,9 +3728,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
@@ -11183,7 +11228,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3277,24 +3742,24 @@ for as_dir in $PATH
+@@ -3277,24 +3741,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11213,7 +11258,7 @@
$as_echo "no" >&6; }
fi
-@@ -3307,7 +3772,7 @@ done
+@@ -3307,7 +3771,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11222,7 +11267,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3318,57 +3783,37 @@ fi
+@@ -3318,57 +3782,37 @@ fi
fi
@@ -11300,7 +11345,7 @@
/* end confdefs.h. */
int
-@@ -3384,8 +3829,8 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -3384,8 +3828,8 @@ ac_clean_files="$ac_clean_files a.out a.
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -11311,7 +11356,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3401,17 +3846,17 @@ do
+@@ -3401,17 +3845,17 @@ do
done
rm -f $ac_rmfiles
@@ -11334,7 +11379,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,
-@@ -3428,7 +3873,7 @@ do
+@@ -3428,7 +3872,7 @@ do
# certainly right.
break;;
*.* )
@@ -11343,7 +11388,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3447,84 +3892,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
+@@ -3447,84 +3891,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
else
ac_file=''
fi
@@ -11448,7 +11493,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
-@@ -3539,32 +3941,83 @@ for ac_file in conftest.exe conftest con
+@@ -3539,32 +3940,83 @@ for ac_file in conftest.exe conftest con
esac
done
else
@@ -11548,7 +11593,7 @@
/* end confdefs.h. */
int
-@@ -3576,17 +4029,17 @@ main ()
+@@ -3576,17 +4028,17 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -11571,7 +11616,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3599,31 +4052,23 @@ else
+@@ -3599,31 +4051,23 @@ else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11610,7 +11655,7 @@
/* end confdefs.h. */
int
-@@ -3637,37 +4082,16 @@ main ()
+@@ -3637,37 +4081,16 @@ main ()
return 0;
}
_ACEOF
@@ -11651,7 +11696,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3676,20 +4100,16 @@ else
+@@ -3676,20 +4099,16 @@ else
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -11675,7 +11720,7 @@
/* end confdefs.h. */
int
-@@ -3700,35 +4120,11 @@ main ()
+@@ -3700,35 +4119,11 @@ main ()
return 0;
}
_ACEOF
@@ -11714,7 +11759,7 @@
/* end confdefs.h. */
int
-@@ -3739,36 +4135,12 @@ main ()
+@@ -3739,36 +4134,12 @@ main ()
return 0;
}
_ACEOF
@@ -11755,7 +11800,7 @@
/* end confdefs.h. */
int
-@@ -3779,42 +4151,17 @@ main ()
+@@ -3779,42 +4150,17 @@ main ()
return 0;
}
_ACEOF
@@ -11800,7 +11845,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3831,18 +4178,14 @@ else
+@@ -3831,18 +4177,14 @@ else
CFLAGS=
fi
fi
@@ -11822,7 +11867,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3899,32 +4242,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -3899,32 +4241,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -11856,7 +11901,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3935,17 +4255,19 @@ fi
+@@ -3935,17 +4254,19 @@ fi
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -11879,7 +11924,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3955,9 +4277,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3955,9 +4276,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CC" am_compiler_list=
@@ -11891,7 +11936,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4065,7 +4387,7 @@ else
+@@ -4065,7 +4386,7 @@ else
fi
fi
@@ -11900,7 +11945,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4086,14 +4408,14 @@ ac_cpp='$CPP $CPPFLAGS'
+@@ -4086,14 +4407,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
@@ -11917,7 +11962,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4108,11 +4430,7 @@ do
+@@ -4108,11 +4429,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.
@@ -11930,7 +11975,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4121,78 +4439,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4121,78 +4438,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -12017,7 +12062,7 @@
break
fi
-@@ -4204,7 +4478,7 @@ fi
+@@ -4204,7 +4477,7 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -12026,7 +12071,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4215,11 +4489,7 @@ do
+@@ -4215,11 +4488,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.
@@ -12039,7 +12084,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4228,87 +4498,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -4228,87 +4497,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -12139,7 +12184,7 @@
fi
ac_ext=c
-@@ -4318,9 +4541,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -4318,9 +4540,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -12151,7 +12196,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4331,7 +4554,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4331,7 +4553,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12160,7 +12205,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
-@@ -4351,7 +4574,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -4351,7 +4573,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
@@ -12169,7 +12214,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"
-@@ -4366,26 +4589,24 @@ esac
+@@ -4366,26 +4588,24 @@ esac
$ac_path_GREP_found && break 3
done
done
@@ -12201,7 +12246,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4399,7 +4620,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -4399,7 +4619,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12210,7 +12255,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
-@@ -4419,7 +4640,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -4419,7 +4639,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
@@ -12219,7 +12264,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"
-@@ -4434,12 +4655,10 @@ esac
+@@ -4434,12 +4654,10 @@ esac
$ac_path_EGREP_found && break 3
done
done
@@ -12234,7 +12279,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4447,21 +4666,17 @@ fi
+@@ -4447,21 +4665,17 @@ fi
fi
fi
@@ -12260,7 +12305,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4476,48 +4691,23 @@ main ()
+@@ -4476,48 +4690,23 @@ main ()
return 0;
}
_ACEOF
@@ -12314,7 +12359,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4527,18 +4717,14 @@ fi
+@@ -4527,18 +4716,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -12336,7 +12381,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4548,14 +4734,10 @@ fi
+@@ -4548,14 +4733,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.
@@ -12353,7 +12398,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4582,118 +4764,33 @@ main ()
+@@ -4582,118 +4763,33 @@ main ()
return 0;
}
_ACEOF
@@ -12484,7 +12529,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4704,139 +4801,8 @@ done
+@@ -4704,139 +4800,8 @@ done
@@ -12626,7 +12671,7 @@
MINIX=yes
else
MINIX=
-@@ -4845,34 +4811,23 @@ fi
+@@ -4845,34 +4810,23 @@ fi
if test "$MINIX" = yes; then
@@ -12667,7 +12712,7 @@
/* end confdefs.h. */
# define __EXTENSIONS__ 1
-@@ -4885,69 +4840,35 @@ main ()
+@@ -4885,69 +4839,35 @@ main ()
return 0;
}
_ACEOF
@@ -12749,7 +12794,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4962,48 +4883,23 @@ main ()
+@@ -4962,48 +4882,23 @@ main ()
return 0;
}
_ACEOF
@@ -12803,7 +12848,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5013,18 +4909,14 @@ fi
+@@ -5013,18 +4908,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -12825,7 +12870,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -5034,14 +4926,10 @@ fi
+@@ -5034,14 +4925,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.
@@ -12842,7 +12887,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -5068,51 +4956,22 @@ main ()
+@@ -5068,51 +4955,22 @@ main ()
return 0;
}
_ACEOF
@@ -12901,7 +12946,7 @@
fi
-@@ -5130,9 +4989,9 @@ if test -z "$CXX"; then
+@@ -5130,9 +4988,9 @@ if test -z "$CXX"; 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
@@ -12913,7 +12958,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -5143,24 +5002,24 @@ for as_dir in $PATH
+@@ -5143,24 +5001,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12943,7 +12988,7 @@
$as_echo "no" >&6; }
fi
-@@ -5174,9 +5033,9 @@ if test -z "$CXX"; then
+@@ -5174,9 +5032,9 @@ if test -z "$CXX"; 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
@@ -12955,7 +13000,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -5187,24 +5046,24 @@ for as_dir in $PATH
+@@ -5187,24 +5045,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -12985,7 +13030,7 @@
$as_echo "no" >&6; }
fi
-@@ -5217,7 +5076,7 @@ done
+@@ -5217,7 +5075,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12994,7 +13039,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5228,53 +5087,36 @@ fi
+@@ -5228,53 +5086,36 @@ fi
fi
fi
# Provide some information about the compiler.
@@ -13067,7 +13112,7 @@
/* end confdefs.h. */
int
-@@ -5288,37 +5130,16 @@ main ()
+@@ -5288,37 +5129,16 @@ main ()
return 0;
}
_ACEOF
@@ -13108,7 +13153,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -5327,20 +5148,16 @@ else
+@@ -5327,20 +5147,16 @@ else
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -13132,7 +13177,7 @@
/* end confdefs.h. */
int
-@@ -5351,35 +5168,27 @@ main ()
+@@ -5351,35 +5167,27 @@ main ()
return 0;
}
_ACEOF
@@ -13185,7 +13230,7 @@
/* end confdefs.h. */
int
-@@ -5390,82 +5199,17 @@ main ()
+@@ -5390,82 +5198,17 @@ main ()
return 0;
}
_ACEOF
@@ -13270,7 +13315,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -5490,9 +5234,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -5490,9 +5233,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CXX" am_compiler_list=
@@ -13282,7 +13327,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5600,7 +5344,7 @@ else
+@@ -5600,7 +5343,7 @@ else
fi
fi
@@ -13291,7 +13336,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -5616,22 +5360,18 @@ fi
+@@ -5616,22 +5359,18 @@ fi
if test "x$CC" != xcc; then
@@ -13318,7 +13363,7 @@
/* end confdefs.h. */
int
-@@ -5647,63 +5387,63 @@ _ACEOF
+@@ -5647,63 +5386,63 @@ _ACEOF
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@ -13407,7 +13452,7 @@
then
# cc works too.
:
-@@ -5720,15 +5460,13 @@ rm -f core conftest*
+@@ -5720,15 +5459,13 @@ rm -f core conftest*
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -13426,7 +13471,7 @@
fi
-@@ -5749,7 +5487,7 @@ fi
+@@ -5749,7 +5486,7 @@ fi
case `pwd` in
*\ * | *\ *)
@@ -13435,7 +13480,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -5774,35 +5512,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -5774,35 +5511,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 ||
@@ -13478,7 +13523,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -5818,28 +5548,24 @@ IFS=$ac_save_IFS
+@@ -5818,28 +5547,24 @@ IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -13512,7 +13557,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -5855,9 +5581,9 @@ IFS=$ac_save_IFS
+@@ -5855,9 +5580,9 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -13524,7 +13569,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -5865,7 +5591,7 @@ else
+@@ -5865,7 +5590,7 @@ else
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -13533,7 +13578,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -5874,7 +5600,7 @@ for as_dir in $PATH
+@@ -5874,7 +5599,7 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13542,7 +13587,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
-@@ -5894,7 +5620,7 @@ case `"$ac_path_SED" --version 2>&1` in
+@@ -5894,7 +5619,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
@@ -13551,7 +13596,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"
-@@ -5909,19 +5635,17 @@ esac
+@@ -5909,19 +5634,17 @@ esac
$ac_path_SED_found && break 3
done
done
@@ -13574,7 +13619,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -5939,9 +5663,9 @@ Xsed="$SED -e 1s/^X//"
+@@ -5939,9 +5662,9 @@ Xsed="$SED -e 1s/^X//"
@@ -13586,7 +13631,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -5955,7 +5679,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -5955,7 +5678,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13595,7 +13640,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
-@@ -5975,7 +5699,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
+@@ -5975,7 +5698,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
@@ -13604,7 +13649,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"
-@@ -5990,12 +5714,10 @@ esac
+@@ -5990,12 +5713,10 @@ esac
$ac_path_FGREP_found && break 3
done
done
@@ -13619,7 +13664,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6003,7 +5725,7 @@ fi
+@@ -6003,7 +5724,7 @@ fi
fi
fi
@@ -13628,7 +13673,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6029,7 +5751,7 @@ test -z "$GREP" && GREP=grep
+@@ -6029,7 +5750,7 @@ test -z "$GREP" && GREP=grep
# Check whether --with-gnu-ld was given.
@@ -13637,7 +13682,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6038,7 +5760,7 @@ fi
+@@ -6038,7 +5759,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -13646,7 +13691,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6068,13 +5790,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -6068,13 +5789,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -13663,7 +13708,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6105,18 +5827,16 @@ fi
+@@ -6105,18 +5826,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -13687,7 +13732,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6129,7 +5849,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -6129,7 +5848,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -13696,7 +13741,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -6141,9 +5861,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -6141,9 +5860,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -13708,7 +13753,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6190,7 +5910,7 @@ else
+@@ -6190,7 +5909,7 @@ else
: ${lt_cv_path_NM=no}
fi
fi
@@ -13717,7 +13762,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -6201,9 +5921,9 @@ else
+@@ -6201,9 +5920,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
@@ -13729,7 +13774,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -6214,24 +5934,24 @@ for as_dir in $PATH
+@@ -6214,24 +5933,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13759,7 +13804,7 @@
$as_echo "no" >&6; }
fi
-@@ -6245,9 +5965,9 @@ if test -z "$DUMPBIN"; then
+@@ -6245,9 +5964,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
@@ -13771,7 +13816,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6258,24 +5978,24 @@ for as_dir in $PATH
+@@ -6258,24 +5977,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13801,7 +13846,7 @@
$as_echo "no" >&6; }
fi
-@@ -6288,7 +6008,7 @@ done
+@@ -6288,7 +6007,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13810,7 +13855,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6308,44 +6028,44 @@ test -z "$NM" && NM=nm
+@@ -6308,44 +6027,44 @@ test -z "$NM" && NM=nm
@@ -13824,15 +13869,15 @@
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6318: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6038: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6037: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6321: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6041: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6040: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6324: output\"" >&5)
-+ (eval echo "\"\$as_me:6044: output\"" >&5)
++ (eval echo "\"\$as_me:6043: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -13866,7 +13911,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -6463,10 +6183,10 @@ else
+@@ -6463,10 +6182,10 @@ else
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13879,7 +13924,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -6480,7 +6200,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -6480,7 +6199,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -13888,7 +13933,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -6490,17 +6210,17 @@ xsi_shell=no
+@@ -6490,17 +6209,17 @@ xsi_shell=no
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -13909,7 +13954,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -6535,14 +6255,14 @@ esac
+@@ -6535,14 +6254,14 @@ esac
@@ -13927,7 +13972,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -6571,9 +6291,9 @@ esac
+@@ -6571,9 +6290,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
@@ -13939,7 +13984,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6584,24 +6304,24 @@ for as_dir in $PATH
+@@ -6584,24 +6303,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13969,7 +14014,7 @@
$as_echo "no" >&6; }
fi
-@@ -6611,9 +6331,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -6611,9 +6330,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
@@ -13981,7 +14026,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6624,24 +6344,24 @@ for as_dir in $PATH
+@@ -6624,24 +6343,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14011,7 +14056,7 @@
$as_echo "no" >&6; }
fi
-@@ -6650,7 +6370,7 @@ fi
+@@ -6650,7 +6369,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14020,7 +14065,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6670,9 +6390,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -6670,9 +6389,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
@@ -14032,7 +14077,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -6787,11 +6507,11 @@ irix5* | irix6* | nonstopux*)
+@@ -6787,11 +6506,11 @@ irix5* | irix6* | nonstopux*)
;;
# This must be Linux ELF.
@@ -14046,7 +14091,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
-@@ -6866,7 +6586,7 @@ tpf*)
+@@ -6866,7 +6585,7 @@ tpf*)
esac
fi
@@ -14055,7 +14100,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
-@@ -6886,9 +6606,9 @@ test -z "$deplibs_check_method" && depli
+@@ -6886,9 +6605,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
@@ -14067,7 +14112,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -6899,24 +6619,24 @@ for as_dir in $PATH
+@@ -6899,24 +6618,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14097,7 +14142,7 @@
$as_echo "no" >&6; }
fi
-@@ -6926,9 +6646,9 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -6926,9 +6645,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
@@ -14109,7 +14154,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -6939,24 +6659,24 @@ for as_dir in $PATH
+@@ -6939,24 +6658,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14139,7 +14184,7 @@
$as_echo "no" >&6; }
fi
-@@ -6965,7 +6685,7 @@ fi
+@@ -6965,7 +6684,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14148,7 +14193,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6991,9 +6711,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
+@@ -6991,9 +6710,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
@@ -14160,7 +14205,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7004,24 +6724,24 @@ for as_dir in $PATH
+@@ -7004,24 +6723,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14190,7 +14235,7 @@
$as_echo "no" >&6; }
fi
-@@ -7031,9 +6751,9 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -7031,9 +6750,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
@@ -14202,7 +14247,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7044,24 +6764,24 @@ for as_dir in $PATH
+@@ -7044,24 +6763,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14232,7 +14277,7 @@
$as_echo "no" >&6; }
fi
-@@ -7070,7 +6790,7 @@ fi
+@@ -7070,7 +6789,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14241,7 +14286,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7090,9 +6810,9 @@ test -z "$STRIP" && STRIP=:
+@@ -7090,9 +6809,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
@@ -14253,7 +14298,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7103,24 +6823,24 @@ for as_dir in $PATH
+@@ -7103,24 +6822,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14283,7 +14328,7 @@
$as_echo "no" >&6; }
fi
-@@ -7130,9 +6850,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -7130,9 +6849,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
@@ -14295,7 +14340,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -7143,24 +6863,24 @@ for as_dir in $PATH
+@@ -7143,24 +6862,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14325,7 +14370,7 @@
$as_echo "no" >&6; }
fi
-@@ -7169,7 +6889,7 @@ fi
+@@ -7169,7 +6888,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14334,7 +14379,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7247,9 +6967,9 @@ compiler=$CC
+@@ -7247,9 +6966,9 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -14346,7 +14391,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -7365,18 +7085,18 @@ void nm_test_func(void){}
+@@ -7365,18 +7084,18 @@ void nm_test_func(void){}
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -14371,7 +14416,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -7429,11 +7149,11 @@ _LT_EOF
+@@ -7429,11 +7148,11 @@ _LT_EOF
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -14386,7 +14431,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -7467,10 +7187,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -7467,10 +7186,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
@@ -14399,7 +14444,7 @@
$as_echo "ok" >&6; }
fi
-@@ -7496,7 +7216,7 @@ fi
+@@ -7496,7 +7215,7 @@ fi
# Check whether --enable-libtool-lock was given.
@@ -14408,7 +14453,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -7508,11 +7228,11 @@ case $host in
+@@ -7508,11 +7227,11 @@ case $host in
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -14423,13 +14468,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -7526,12 +7246,12 @@ ia64-*-hpux*)
+@@ -7526,12 +7245,12 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7529 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7249 "configure"' > conftest.$ac_ext
++ echo '#line 7248 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14440,7 +14485,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -7565,11 +7285,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
+@@ -7565,11 +7284,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
@@ -14455,7 +14500,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -7618,9 +7338,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+@@ -7618,9 +7337,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"
@@ -14467,7 +14512,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -7629,11 +7349,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -7629,11 +7348,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
@@ -14480,7 +14525,7 @@
/* end confdefs.h. */
int
-@@ -7644,38 +7360,13 @@ main ()
+@@ -7644,38 +7359,13 @@ main ()
return 0;
}
_ACEOF
@@ -14523,7 +14568,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7683,7 +7374,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -7683,7 +7373,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -14532,7 +14577,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
-@@ -7693,11 +7384,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+@@ -7693,11 +7383,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -14547,7 +14592,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -7723,9 +7414,9 @@ need_locks="$enable_libtool_lock"
+@@ -7723,9 +7413,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
@@ -14559,7 +14604,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -7736,24 +7427,24 @@ for as_dir in $PATH
+@@ -7736,24 +7426,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14589,7 +14634,7 @@
$as_echo "no" >&6; }
fi
-@@ -7763,9 +7454,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -7763,9 +7453,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
@@ -14601,7 +14646,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -7776,24 +7467,24 @@ for as_dir in $PATH
+@@ -7776,24 +7466,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14631,7 +14676,7 @@
$as_echo "no" >&6; }
fi
-@@ -7802,7 +7493,7 @@ fi
+@@ -7802,7 +7492,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14640,7 +14685,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7815,9 +7506,9 @@ fi
+@@ -7815,9 +7505,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
@@ -14652,7 +14697,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -7828,24 +7519,24 @@ for as_dir in $PATH
+@@ -7828,24 +7518,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14682,7 +14727,7 @@
$as_echo "no" >&6; }
fi
-@@ -7855,9 +7546,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -7855,9 +7545,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
@@ -14694,7 +14739,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -7868,24 +7559,24 @@ for as_dir in $PATH
+@@ -7868,24 +7558,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14724,7 +14769,7 @@
$as_echo "no" >&6; }
fi
-@@ -7894,7 +7585,7 @@ fi
+@@ -7894,7 +7584,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14733,7 +14778,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7907,9 +7598,9 @@ fi
+@@ -7907,9 +7597,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
@@ -14745,7 +14790,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -7920,24 +7611,24 @@ for as_dir in $PATH
+@@ -7920,24 +7610,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14775,7 +14820,7 @@
$as_echo "no" >&6; }
fi
-@@ -7947,9 +7638,9 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -7947,9 +7637,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
@@ -14787,7 +14832,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -7960,24 +7651,24 @@ for as_dir in $PATH
+@@ -7960,24 +7650,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14817,7 +14862,7 @@
$as_echo "no" >&6; }
fi
-@@ -7986,7 +7677,7 @@ fi
+@@ -7986,7 +7676,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14826,7 +14871,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7999,9 +7690,9 @@ fi
+@@ -7999,9 +7689,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
@@ -14838,7 +14883,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8012,24 +7703,24 @@ for as_dir in $PATH
+@@ -8012,24 +7702,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14868,7 +14913,7 @@
$as_echo "no" >&6; }
fi
-@@ -8039,9 +7730,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -8039,9 +7729,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
@@ -14880,7 +14925,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8052,24 +7743,24 @@ for as_dir in $PATH
+@@ -8052,24 +7742,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14910,7 +14955,7 @@
$as_echo "no" >&6; }
fi
-@@ -8078,7 +7769,7 @@ fi
+@@ -8078,7 +7768,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -14919,7 +14964,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8091,9 +7782,9 @@ fi
+@@ -8091,9 +7781,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
@@ -14931,7 +14976,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8104,24 +7795,24 @@ for as_dir in $PATH
+@@ -8104,24 +7794,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14961,7 +15006,7 @@
$as_echo "no" >&6; }
fi
-@@ -8131,9 +7822,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -8131,9 +7821,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
@@ -14973,7 +15018,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -8144,24 +7835,24 @@ for as_dir in $PATH
+@@ -8144,24 +7834,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15003,7 +15048,7 @@
$as_echo "no" >&6; }
fi
-@@ -8170,7 +7861,7 @@ fi
+@@ -8170,7 +7860,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15012,7 +15057,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8206,9 +7897,9 @@ fi
+@@ -8206,9 +7896,9 @@ fi
@@ -15024,7 +15069,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -8233,22 +7924,18 @@ else
+@@ -8233,22 +7923,18 @@ else
rm -f conftest.*
fi
fi
@@ -15051,7 +15096,7 @@
/* end confdefs.h. */
int
-@@ -8259,42 +7946,17 @@ main ()
+@@ -8259,42 +7945,17 @@ main ()
return 0;
}
_ACEOF
@@ -15099,7 +15144,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -8331,62 +7993,13 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -8331,62 +7992,13 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
;;
esac
@@ -15167,7 +15212,7 @@
_ACEOF
fi
-@@ -8409,9 +8022,9 @@ if test -z "$CXX"; then
+@@ -8409,9 +8021,9 @@ if test -z "$CXX"; 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
@@ -15179,7 +15224,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -8422,24 +8035,24 @@ for as_dir in $PATH
+@@ -8422,24 +8034,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15209,7 +15254,7 @@
$as_echo "no" >&6; }
fi
-@@ -8453,9 +8066,9 @@ if test -z "$CXX"; then
+@@ -8453,9 +8065,9 @@ if test -z "$CXX"; 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
@@ -15221,7 +15266,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -8466,24 +8079,24 @@ for as_dir in $PATH
+@@ -8466,24 +8078,24 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15251,7 +15296,7 @@
$as_echo "no" >&6; }
fi
-@@ -8496,7 +8109,7 @@ done
+@@ -8496,7 +8108,7 @@ done
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15260,7 +15305,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8507,53 +8120,36 @@ fi
+@@ -8507,53 +8119,36 @@ fi
fi
fi
# Provide some information about the compiler.
@@ -15333,7 +15378,7 @@
/* end confdefs.h. */
int
-@@ -8567,37 +8163,16 @@ main ()
+@@ -8567,37 +8162,16 @@ main ()
return 0;
}
_ACEOF
@@ -15374,7 +15419,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -8606,20 +8181,16 @@ else
+@@ -8606,20 +8180,16 @@ else
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -15398,7 +15443,7 @@
/* end confdefs.h. */
int
-@@ -8630,35 +8201,11 @@ main ()
+@@ -8630,35 +8200,11 @@ main ()
return 0;
}
_ACEOF
@@ -15437,7 +15482,7 @@
/* end confdefs.h. */
int
-@@ -8669,36 +8216,12 @@ main ()
+@@ -8669,36 +8215,12 @@ main ()
return 0;
}
_ACEOF
@@ -15478,7 +15523,7 @@
/* end confdefs.h. */
int
-@@ -8709,42 +8232,17 @@ main ()
+@@ -8709,42 +8231,17 @@ main ()
return 0;
}
_ACEOF
@@ -15523,7 +15568,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -8769,9 +8267,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -8769,9 +8266,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CXX" am_compiler_list=
@@ -15535,7 +15580,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -8879,7 +8377,7 @@ else
+@@ -8879,7 +8376,7 @@ else
fi
fi
@@ -15544,7 +15589,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -8902,10 +8400,10 @@ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -8902,10 +8399,10 @@ ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -15557,7 +15602,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
-@@ -8920,11 +8418,7 @@ do
+@@ -8920,11 +8417,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.
@@ -15570,7 +15615,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -8933,78 +8427,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8933,78 +8426,34 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -15657,7 +15702,7 @@
break
fi
-@@ -9016,7 +8466,7 @@ fi
+@@ -9016,7 +8465,7 @@ fi
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -15666,7 +15711,7 @@
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -9027,11 +8477,7 @@ do
+@@ -9027,11 +8476,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.
@@ -15679,7 +15724,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -9040,81 +8486,37 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -9040,81 +8485,37 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -15771,7 +15816,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
_lt_caught_CXX_error=yes; }
fi
-@@ -9144,7 +8546,7 @@ fi
+@@ -9144,7 +8545,7 @@ fi
# Check whether --enable-shared was given.
@@ -15780,7 +15825,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -9175,7 +8577,7 @@ fi
+@@ -9175,7 +8576,7 @@ fi
# Check whether --enable-static was given.
@@ -15789,7 +15834,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -9207,7 +8609,7 @@ fi
+@@ -9207,7 +8608,7 @@ fi
# Check whether --with-pic was given.
@@ -15798,7 +15843,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -9223,7 +8625,7 @@ test -z "$pic_mode" && pic_mode=default
+@@ -9223,7 +8624,7 @@ test -z "$pic_mode" && pic_mode=default
# Check whether --enable-fast-install was given.
@@ -15807,7 +15852,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -9304,9 +8706,9 @@ if test -n "${ZSH_VERSION+set}" ; then
+@@ -9304,9 +8705,9 @@ if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
@@ -15819,7 +15864,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -9319,7 +8721,7 @@ else
+@@ -9319,7 +8720,7 @@ else
fi
rmdir .libs 2>/dev/null
fi
@@ -15828,7 +15873,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -9412,9 +8814,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
+@@ -9412,9 +8813,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -15840,7 +15885,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9465,10 +8867,10 @@ fi
+@@ -9465,10 +8866,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -15853,7 +15898,7 @@
$as_echo "no" >&6; }
fi
-@@ -9478,9 +8880,9 @@ fi
+@@ -9478,9 +8879,9 @@ fi
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -15865,7 +15910,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9531,10 +8933,10 @@ fi
+@@ -9531,10 +8932,10 @@ fi
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -15878,7 +15923,7 @@
$as_echo "no" >&6; }
fi
-@@ -9604,6 +9006,10 @@ _lt_linker_boilerplate=`cat conftest.err
+@@ -9604,6 +9005,10 @@ _lt_linker_boilerplate=`cat conftest.err
$RM -r conftest*
@@ -15889,7 +15934,7 @@
if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
-@@ -9611,9 +9017,9 @@ lt_prog_compiler_no_builtin_flag=
+@@ -9611,9 +9016,9 @@ lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -15901,21 +15946,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9629,11 +9035,11 @@ else
+@@ -9629,11 +9034,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:9632: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9038: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9037: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9636: \$? = $ac_status" >&5
-+ echo "$as_me:9042: \$? = $ac_status" >&5
++ echo "$as_me:9041: \$? = $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.
-@@ -9646,7 +9052,7 @@ else
+@@ -9646,7 +9051,7 @@ else
$RM conftest*
fi
@@ -15924,7 +15969,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9666,7 +9072,7 @@ fi
+@@ -9666,7 +9071,7 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -15933,7 +15978,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9798,7 +9204,7 @@ $as_echo_n "checking for $compiler optio
+@@ -9798,7 +9203,7 @@ $as_echo_n "checking for $compiler optio
lt_prog_compiler_static='-non_shared'
;;
@@ -15942,7 +15987,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -9938,7 +9344,7 @@ case $host_os in
+@@ -9938,7 +9343,7 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -15951,7 +15996,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -9950,9 +9356,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -9950,9 +9355,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
@@ -15963,21 +16008,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -9968,11 +9374,11 @@ else
+@@ -9968,11 +9373,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:9971: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9377: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9376: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9975: \$? = $ac_status" >&5
-+ echo "$as_me:9381: \$? = $ac_status" >&5
++ echo "$as_me:9380: \$? = $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.
-@@ -9985,7 +9391,7 @@ else
+@@ -9985,7 +9390,7 @@ else
$RM conftest*
fi
@@ -15986,7 +16031,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -10009,9 +9415,9 @@ fi
+@@ -10009,9 +9414,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\"
@@ -15998,7 +16043,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -10037,7 +9443,7 @@ else
+@@ -10037,7 +9442,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -16007,7 +16052,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -10052,9 +9458,9 @@ fi
+@@ -10052,9 +9457,9 @@ fi
@@ -16019,21 +16064,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10073,11 +9479,11 @@ else
+@@ -10073,11 +9478,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:10076: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9482: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9481: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10080: \$? = $ac_status" >&5
-+ echo "$as_me:9486: \$? = $ac_status" >&5
++ echo "$as_me:9485: \$? = $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
-@@ -10099,7 +9505,7 @@ else
+@@ -10099,7 +9504,7 @@ else
$RM conftest*
fi
@@ -16042,7 +16087,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10107,9 +9513,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10107,9 +9512,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
@@ -16054,21 +16099,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -10128,11 +9534,11 @@ else
+@@ -10128,11 +9533,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:10131: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9537: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9536: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10135: \$? = $ac_status" >&5
-+ echo "$as_me:9541: \$? = $ac_status" >&5
++ echo "$as_me:9540: \$? = $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
-@@ -10154,7 +9560,7 @@ else
+@@ -10154,7 +9559,7 @@ else
$RM conftest*
fi
@@ -16077,7 +16122,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -10163,7 +9569,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
+@@ -10163,7 +9568,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
@@ -16086,7 +16131,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -10171,10 +9577,10 @@ $as_echo_n "checking if we can lock with
+@@ -10171,10 +9576,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
@@ -16099,7 +16144,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -10187,7 +9593,7 @@ fi
+@@ -10187,7 +9592,7 @@ fi
@@ -16108,7 +16153,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -10247,6 +9653,9 @@ $as_echo_n "checking whether the $compil
+@@ -10247,6 +9652,9 @@ $as_echo_n "checking whether the $compil
openbsd*)
with_gnu_ld=no
;;
@@ -16118,7 +16163,7 @@
esac
ld_shlibs=yes
-@@ -10268,6 +9677,7 @@ $as_echo_n "checking whether the $compil
+@@ -10268,6 +9676,7 @@ $as_echo_n "checking whether the $compil
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -16126,7 +16171,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10359,7 +9769,7 @@ _LT_EOF
+@@ -10359,7 +9768,7 @@ _LT_EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -16135,7 +16180,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -10429,7 +9839,7 @@ _LT_EOF
+@@ -10429,7 +9838,7 @@ _LT_EOF
fi
;;
@@ -16144,7 +16189,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10604,6 +10014,7 @@ _LT_EOF
+@@ -10604,6 +10013,7 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -16152,7 +16197,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10629,11 +10040,7 @@ _LT_EOF
+@@ -10629,11 +10039,7 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -16165,7 +16210,7 @@
/* end confdefs.h. */
int
-@@ -10644,27 +10051,7 @@ main ()
+@@ -10644,27 +10050,7 @@ main ()
return 0;
}
_ACEOF
@@ -16194,7 +16239,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10678,16 +10065,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10678,16 +10064,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
@@ -16213,7 +16258,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10700,11 +10080,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10700,11 +10079,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -16226,7 +16271,7 @@
/* end confdefs.h. */
int
-@@ -10715,27 +10091,7 @@ main ()
+@@ -10715,27 +10090,7 @@ main ()
return 0;
}
_ACEOF
@@ -16255,7 +16300,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10749,16 +10105,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -10749,16 +10104,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
@@ -16274,7 +16319,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10970,42 +10319,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10970,42 +10318,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"
@@ -16322,7 +16367,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'
-@@ -11018,7 +10341,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11018,7 +10340,7 @@ rm -f core conftest.err conftest.$ac_obj
link_all_deplibs=yes
;;
@@ -16331,7 +16376,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11261,7 +10584,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11261,7 +10583,7 @@ rm -f core conftest.err conftest.$ac_obj
fi
fi
@@ -16340,7 +16385,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -11298,16 +10621,16 @@ x|xyes)
+@@ -11298,16 +10620,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.
@@ -16361,7 +16406,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -11321,11 +10644,11 @@ $as_echo_n "checking whether -lc should
+@@ -11321,11 +10643,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -16376,7 +16421,7 @@
then
archive_cmds_need_lc=no
else
-@@ -11336,7 +10659,7 @@ $as_echo_n "checking whether -lc should
+@@ -11336,7 +10658,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -16385,7 +16430,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -11500,7 +10823,7 @@ esac
+@@ -11500,7 +10822,7 @@ esac
@@ -16394,7 +16439,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11908,7 +11231,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -11908,7 +11230,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -16403,7 +16448,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11922,11 +11245,7 @@ linux* | k*bsd*-gnu)
+@@ -11922,11 +11244,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -16416,7 +16461,7 @@
/* end confdefs.h. */
int
-@@ -11937,41 +11256,13 @@ main ()
+@@ -11937,41 +11255,13 @@ main ()
return 0;
}
_ACEOF
@@ -16462,7 +16507,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -11980,13 +11271,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11980,13 +11270,10 @@ rm -f core conftest.err conftest.$ac_obj
# before this can be enabled.
hardcode_into_libs=yes
@@ -16477,7 +16522,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11998,6 +11286,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11998,6 +11285,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16496,7 +16541,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12186,7 +11486,7 @@ uts4*)
+@@ -12186,7 +11485,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -16505,7 +16550,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -12288,7 +11588,7 @@ fi
+@@ -12288,7 +11587,7 @@ fi
@@ -16514,7 +16559,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -12313,7 +11613,7 @@ else
+@@ -12313,7 +11612,7 @@ else
# directories.
hardcode_action=unsupported
fi
@@ -16523,7 +16568,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -12358,18 +11658,14 @@ else
+@@ -12358,18 +11657,14 @@ else
darwin*)
# if libdl is installed we need to link against it
@@ -16545,7 +16590,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12387,43 +11683,18 @@ return dlopen ();
+@@ -12387,43 +11682,18 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -16595,7 +16640,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -12436,33 +11707,19 @@ fi
+@@ -12436,33 +11706,19 @@ fi
;;
*)
@@ -16639,7 +16684,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -12471,13 +11728,6 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -12471,13 +11727,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char shl_load ();
@@ -16653,7 +16698,7 @@
int
main ()
{
-@@ -12486,56 +11736,32 @@ return shl_load ();
+@@ -12486,56 +11735,32 @@ return shl_load ();
return 0;
}
_ACEOF
@@ -16729,7 +16774,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12544,81 +11770,38 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -12544,81 +11769,38 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -16828,7 +16873,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -12627,13 +11810,6 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -12627,13 +11809,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char dlopen ();
@@ -16842,7 +16887,7 @@
int
main ()
{
-@@ -12642,192 +11818,28 @@ return dlopen ();
+@@ -12642,192 +11817,28 @@ return dlopen ();
return 0;
}
_ACEOF
@@ -17045,7 +17090,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12845,43 +11857,18 @@ return dld_link ();
+@@ -12845,43 +11856,18 @@ return dld_link ();
return 0;
}
_ACEOF
@@ -17095,7 +17140,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12920,9 +11907,9 @@ fi
+@@ -12920,9 +11906,9 @@ fi
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -17107,16 +17152,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12931,7 +11918,7 @@ else
+@@ -12931,7 +11917,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12934 "configure"
-+#line 11921 "configure"
++#line 11920 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12990,11 +11977,11 @@ int main ()
+@@ -12990,11 +11976,11 @@ int main ()
return status;
}
_LT_EOF
@@ -17131,7 +17176,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13011,14 +11998,14 @@ rm -fr conftest*
+@@ -13011,14 +11997,14 @@ rm -fr conftest*
fi
@@ -17149,16 +17194,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -13027,7 +12014,7 @@ else
+@@ -13027,7 +12013,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13030 "configure"
-+#line 12017 "configure"
++#line 12016 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13086,11 +12073,11 @@ int main ()
+@@ -13086,11 +12072,11 @@ int main ()
return status;
}
_LT_EOF
@@ -17173,7 +17218,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -13107,7 +12094,7 @@ rm -fr conftest*
+@@ -13107,7 +12093,7 @@ rm -fr conftest*
fi
@@ -17182,7 +17227,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -13146,12 +12133,12 @@ fi
+@@ -13146,12 +12132,12 @@ fi
striplib=
old_striplib=
@@ -17197,7 +17242,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -13160,15 +12147,15 @@ else
+@@ -13160,15 +12146,15 @@ else
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -17216,7 +17261,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -13186,12 +12173,12 @@ fi
+@@ -13186,12 +12172,12 @@ fi
# Report which library types will actually be built
@@ -17232,7 +17277,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -13212,14 +12199,14 @@ $as_echo_n "checking whether to build sh
+@@ -13212,14 +12198,14 @@ $as_echo_n "checking whether to build sh
fi
;;
esac
@@ -17250,7 +17295,7 @@
$as_echo "$enable_static" >&6; }
-@@ -13360,7 +12347,7 @@ cc_basename=`$ECHO "X$cc_temp" | $Xsed -
+@@ -13360,7 +12346,7 @@ cc_basename=`$ECHO "X$cc_temp" | $Xsed -
# Check whether --with-gnu-ld was given.
@@ -17259,7 +17304,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -13369,7 +12356,7 @@ fi
+@@ -13369,7 +12355,7 @@ fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -17268,7 +17313,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -13399,13 +12386,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -13399,13 +12385,13 @@ $as_echo_n "checking for ld used by $CC.
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -17285,7 +17330,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -13436,18 +12423,16 @@ fi
+@@ -13436,18 +12422,16 @@ fi
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -17309,7 +17354,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -13460,7 +12445,7 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -13460,7 +12444,7 @@ case `$LD -v 2>&1 </dev/null` in
;;
esac
fi
@@ -17318,7 +17363,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -13515,7 +12500,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -13515,7 +12499,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -17327,7 +17372,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
-@@ -13616,11 +12601,7 @@ $as_echo_n "checking whether the $compil
+@@ -13616,11 +12600,7 @@ $as_echo_n "checking whether the $compil
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -17340,7 +17385,7 @@
/* end confdefs.h. */
int
-@@ -13631,27 +12612,7 @@ main ()
+@@ -13631,27 +12611,7 @@ main ()
return 0;
}
_ACEOF
@@ -17369,7 +17414,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13665,16 +12626,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -13665,16 +12625,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
@@ -17388,7 +17433,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -13688,11 +12642,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -13688,11 +12641,7 @@ if test -z "$aix_libpath"; then aix_libp
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -17401,7 +17446,7 @@
/* end confdefs.h. */
int
-@@ -13703,27 +12653,7 @@ main ()
+@@ -13703,27 +12652,7 @@ main ()
return 0;
}
_ACEOF
@@ -17430,7 +17475,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13737,16 +12667,9 @@ aix_libpath=`dump -H conftest$ac_exeext
+@@ -13737,16 +12666,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
@@ -17449,7 +17494,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -14031,7 +12954,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14031,7 +12953,7 @@ if test -z "$aix_libpath"; then aix_libp
inherit_rpath_CXX=yes
;;
@@ -17458,7 +17503,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -14490,7 +13413,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14490,7 +13412,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
@@ -17467,7 +17512,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -14518,11 +13441,11 @@ private:
+@@ -14518,11 +13440,11 @@ private:
};
_LT_EOF
@@ -17482,7 +17527,7 @@
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -14703,7 +13626,7 @@ fi
+@@ -14703,7 +13625,7 @@ fi
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -17491,7 +17536,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
-@@ -14859,7 +13782,7 @@ $as_echo_n "checking for $compiler optio
+@@ -14859,7 +13781,7 @@ $as_echo_n "checking for $compiler optio
;;
esac
;;
@@ -17500,7 +17545,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -14923,7 +13846,7 @@ $as_echo_n "checking for $compiler optio
+@@ -14923,7 +13845,7 @@ $as_echo_n "checking for $compiler optio
;;
esac
;;
@@ -17509,7 +17554,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -15020,7 +13943,7 @@ case $host_os in
+@@ -15020,7 +13942,7 @@ case $host_os in
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -17518,7 +17563,7 @@
$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-@@ -15029,9 +13952,9 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6
+@@ -15029,9 +13951,9 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
@@ -17530,21 +17575,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
-@@ -15047,11 +13970,11 @@ else
+@@ -15047,11 +13969,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:15050: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13973: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13972: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15054: \$? = $ac_status" >&5
-+ echo "$as_me:13977: \$? = $ac_status" >&5
++ echo "$as_me:13976: \$? = $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.
-@@ -15064,7 +13987,7 @@ else
+@@ -15064,7 +13986,7 @@ else
$RM conftest*
fi
@@ -17553,7 +17598,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-@@ -15085,9 +14008,9 @@ fi
+@@ -15085,9 +14007,9 @@ fi
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -17565,7 +17610,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
-@@ -15113,7 +14036,7 @@ else
+@@ -15113,7 +14035,7 @@ else
LDFLAGS="$save_LDFLAGS"
fi
@@ -17574,7 +17619,7 @@
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-@@ -15125,9 +14048,9 @@ fi
+@@ -15125,9 +14047,9 @@ fi
@@ -17586,21 +17631,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -15146,11 +14069,11 @@ else
+@@ -15146,11 +14068,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:15149: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14072: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14071: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15153: \$? = $ac_status" >&5
-+ echo "$as_me:14076: \$? = $ac_status" >&5
++ echo "$as_me:14075: \$? = $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
-@@ -15172,14 +14095,14 @@ else
+@@ -15172,14 +14094,14 @@ else
$RM conftest*
fi
@@ -17618,21 +17663,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -15198,11 +14121,11 @@ else
+@@ -15198,11 +14120,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:15201: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14124: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14123: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15205: \$? = $ac_status" >&5
-+ echo "$as_me:14128: \$? = $ac_status" >&5
++ echo "$as_me:14127: \$? = $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
-@@ -15224,7 +14147,7 @@ else
+@@ -15224,7 +14146,7 @@ else
$RM conftest*
fi
@@ -17641,7 +17686,7 @@
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-@@ -15233,7 +14156,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX"
+@@ -15233,7 +14155,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX"
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -17650,7 +17695,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -15241,10 +14164,10 @@ $as_echo_n "checking if we can lock with
+@@ -15241,10 +14163,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
@@ -17663,7 +17708,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -15254,7 +14177,7 @@ fi
+@@ -15254,7 +14176,7 @@ fi
@@ -17672,7 +17717,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -15274,13 +14197,16 @@ $as_echo_n "checking whether the $compil
+@@ -15274,13 +14196,16 @@ $as_echo_n "checking whether the $compil
cygwin* | mingw* | cegcc*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -17690,7 +17735,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -15308,16 +14234,16 @@ x|xyes)
+@@ -15308,16 +14233,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.
@@ -17711,7 +17756,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -15331,11 +14257,11 @@ $as_echo_n "checking whether -lc should
+@@ -15331,11 +14256,11 @@ $as_echo_n "checking whether -lc should
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
@@ -17726,7 +17771,7 @@
then
archive_cmds_need_lc_CXX=no
else
-@@ -15346,7 +14272,7 @@ $as_echo_n "checking whether -lc should
+@@ -15346,7 +14271,7 @@ $as_echo_n "checking whether -lc should
cat conftest.err 1>&5
fi
$RM conftest*
@@ -17735,7 +17780,7 @@
$as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
-@@ -15417,7 +14343,7 @@ esac
+@@ -15417,7 +14342,7 @@ esac
@@ -17744,7 +17789,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
-@@ -15773,7 +14699,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -15773,7 +14698,7 @@ linux*oldld* | linux*aout* | linux*coff*
;;
# This must be Linux ELF.
@@ -17753,7 +17798,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15787,11 +14713,7 @@ linux* | k*bsd*-gnu)
+@@ -15787,11 +14712,7 @@ linux* | k*bsd*-gnu)
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
@@ -17766,7 +17811,7 @@
/* end confdefs.h. */
int
-@@ -15802,41 +14724,13 @@ main ()
+@@ -15802,41 +14723,13 @@ main ()
return 0;
}
_ACEOF
@@ -17812,7 +17857,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -15845,13 +14739,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -15845,13 +14738,10 @@ rm -f core conftest.err conftest.$ac_obj
# before this can be enabled.
hardcode_into_libs=yes
@@ -17827,7 +17872,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15863,6 +14754,18 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -15863,6 +14753,18 @@ rm -f core conftest.err conftest.$ac_obj
dynamic_linker='GNU/Linux ld.so'
;;
@@ -17846,7 +17891,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -16051,7 +14954,7 @@ uts4*)
+@@ -16051,7 +14953,7 @@ uts4*)
dynamic_linker=no
;;
esac
@@ -17855,7 +17900,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -16102,7 +15005,7 @@ fi
+@@ -16102,7 +15004,7 @@ fi
@@ -17864,7 +17909,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
-@@ -16127,7 +15030,7 @@ else
+@@ -16127,7 +15029,7 @@ else
# directories.
hardcode_action_CXX=unsupported
fi
@@ -17873,7 +17918,7 @@
$as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink ||
-@@ -16186,16 +15089,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -16186,16 +15088,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -17893,7 +17938,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -16210,48 +15109,23 @@ main ()
+@@ -16210,48 +15108,23 @@ main ()
return 0;
}
_ACEOF
@@ -17947,7 +17992,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -16261,18 +15135,14 @@ fi
+@@ -16261,18 +15134,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -17969,7 +18014,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -16282,14 +15152,10 @@ fi
+@@ -16282,14 +15151,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.
@@ -17986,7 +18031,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -16316,51 +15182,22 @@ main ()
+@@ -16316,51 +15181,22 @@ main ()
return 0;
}
_ACEOF
@@ -18045,7 +18090,7 @@
fi
-@@ -16372,16 +15209,16 @@ ac_config_headers="$ac_config_headers co
+@@ -16372,16 +15208,16 @@ ac_config_headers="$ac_config_headers co
@@ -18065,7 +18110,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -16389,35 +15226,31 @@ $as_echo "$USE_NLS" >&6; }
+@@ -16389,35 +15225,31 @@ $as_echo "$USE_NLS" >&6; }
case "$am__api_version" in
1.01234)
@@ -18107,7 +18152,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -16430,14 +15263,14 @@ for as_dir in $PATH
+@@ -16430,14 +15262,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18125,7 +18170,7 @@
IFS=$as_save_IFS
;;
-@@ -16445,19 +15278,19 @@ esac
+@@ -16445,19 +15277,19 @@ esac
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -18149,7 +18194,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -16470,14 +15303,14 @@ for as_dir in $PATH
+@@ -16470,14 +15302,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18167,7 +18212,7 @@
IFS=$as_save_IFS
;;
-@@ -16485,19 +15318,19 @@ esac
+@@ -16485,19 +15317,19 @@ esac
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -18191,7 +18236,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -16510,14 +15343,14 @@ for as_dir in $PATH
+@@ -16510,14 +15342,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18209,7 +18254,7 @@
IFS=$as_save_IFS
;;
-@@ -16525,18 +15358,16 @@ esac
+@@ -16525,18 +15357,16 @@ esac
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -18231,7 +18276,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 $< $@'
-@@ -16658,9 +15489,9 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -16658,9 +15488,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
@@ -18243,7 +18288,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -16673,14 +15504,14 @@ for as_dir in $PATH
+@@ -16673,14 +15503,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18261,7 +18306,7 @@
IFS=$as_save_IFS
;;
-@@ -16688,19 +15519,19 @@ esac
+@@ -16688,19 +15518,19 @@ esac
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -18285,7 +18330,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -16713,14 +15544,14 @@ for as_dir in $PATH
+@@ -16713,14 +15543,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18303,7 +18348,7 @@
IFS=$as_save_IFS
;;
-@@ -16728,19 +15559,19 @@ esac
+@@ -16728,19 +15558,19 @@ esac
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -18327,7 +18372,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -16753,14 +15584,14 @@ for as_dir in $PATH
+@@ -16753,14 +15583,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18345,7 +18390,7 @@
IFS=$as_save_IFS
;;
-@@ -16768,19 +15599,19 @@ esac
+@@ -16768,19 +15598,19 @@ esac
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -18369,7 +18414,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -16793,14 +15624,14 @@ for as_dir in $PATH
+@@ -16793,14 +15623,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18387,7 +18432,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -16809,33 +15640,29 @@ esac
+@@ -16809,33 +15639,29 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -18427,7 +18472,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -16848,14 +15675,14 @@ for as_dir in $PATH
+@@ -16848,14 +15674,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18445,7 +18490,7 @@
IFS=$as_save_IFS
;;
-@@ -16863,41 +15690,35 @@ esac
+@@ -16863,41 +15689,35 @@ esac
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -18496,7 +18541,7 @@
fi
fi
-@@ -16907,11 +15728,7 @@ fi
+@@ -16907,11 +15727,7 @@ fi
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -18509,7 +18554,7 @@
/* end confdefs.h. */
int
-@@ -16923,120 +15740,13 @@ extern int _nl_msg_cat_cntr;
+@@ -16923,120 +15739,13 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -18634,7 +18679,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -17048,10 +15758,8 @@ fi
+@@ -17048,10 +15757,8 @@ fi
;;
esac
fi
@@ -18647,7 +18692,7 @@
fi
-@@ -17061,13 +15769,17 @@ fi
+@@ -17061,13 +15768,17 @@ fi
@@ -18667,7 +18712,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -17080,14 +15792,14 @@ for as_dir in $PATH
+@@ -17080,14 +15791,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18685,7 +18730,7 @@
IFS=$as_save_IFS
;;
-@@ -17095,10 +15807,10 @@ esac
+@@ -17095,10 +15806,10 @@ esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -18698,7 +18743,7 @@
$as_echo "no" >&6; }
fi
-@@ -17108,9 +15820,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -17108,9 +15819,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
@@ -18710,7 +18755,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -17123,14 +15835,14 @@ for as_dir in $PATH
+@@ -17123,14 +15834,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -18728,7 +18773,7 @@
IFS=$as_save_IFS
;;
-@@ -17138,10 +15850,10 @@ esac
+@@ -17138,10 +15849,10 @@ esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -18741,7 +18786,7 @@
$as_echo "no" >&6; }
fi
-@@ -17150,7 +15862,7 @@ fi
+@@ -17150,7 +15861,7 @@ fi
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -18750,7 +18795,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -17163,50 +15875,47 @@ fi
+@@ -17163,50 +15874,47 @@ fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -18812,7 +18857,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -17217,7 +15926,7 @@ HELP_DIR="$with_help_dir"
+@@ -17217,7 +15925,7 @@ HELP_DIR="$with_help_dir"
# Check whether --with-omf-dir was given.
@@ -18821,7 +18866,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -17228,7 +15937,7 @@ OMF_DIR="$with_omf_dir"
+@@ -17228,7 +15936,7 @@ OMF_DIR="$with_omf_dir"
# Check whether --with-help-formats was given.
@@ -18830,7 +18875,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -17238,7 +15947,7 @@ DOC_USER_FORMATS="$with_help_formats"
+@@ -17238,7 +15946,7 @@ DOC_USER_FORMATS="$with_help_formats"
# Check whether --enable-scrollkeeper was given.
@@ -18839,7 +18884,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -17276,151 +15985,12 @@ _ACEOF
+@@ -17276,151 +15984,12 @@ _ACEOF
@@ -18996,7 +19041,7 @@
_ACEOF
fi
-@@ -17428,16 +15998,12 @@ fi
+@@ -17428,16 +15997,12 @@ fi
done
if test $ac_cv_header_locale_h = yes; then
@@ -19016,7 +19061,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -17448,46 +16014,19 @@ return LC_MESSAGES
+@@ -17448,46 +16013,19 @@ return LC_MESSAGES
return 0;
}
_ACEOF
@@ -19069,7 +19114,7 @@
fi
fi
-@@ -17500,155 +16039,20 @@ _ACEOF
+@@ -17500,155 +16038,20 @@ _ACEOF
XGETTEXT=:
INTLLIBS=
@@ -19230,7 +19275,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17661,54 +16065,25 @@ return !ngettext ("","", 1)
+@@ -17661,54 +16064,25 @@ return !ngettext ("","", 1)
return 0;
}
_ACEOF
@@ -19293,7 +19338,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -17721,141 +16096,26 @@ return !dgettext ("","")
+@@ -17721,141 +16095,26 @@ return !dgettext ("","")
return 0;
}
_ACEOF
@@ -19446,7 +19491,7 @@
_ACEOF
fi
-@@ -17870,18 +16130,14 @@ done
+@@ -17870,18 +16129,14 @@ done
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -19468,7 +19513,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17899,55 +16155,26 @@ return bindtextdomain ();
+@@ -17899,55 +16154,26 @@ return bindtextdomain ();
return 0;
}
_ACEOF
@@ -19533,7 +19578,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -17965,55 +16192,26 @@ return ngettext ();
+@@ -17965,55 +16191,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -19598,7 +19643,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18031,43 +16229,18 @@ return dgettext ();
+@@ -18031,43 +16228,18 @@ return dgettext ();
return 0;
}
_ACEOF
@@ -19648,7 +19693,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -18077,22 +16250,18 @@ fi
+@@ -18077,22 +16249,18 @@ fi
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -19676,7 +19721,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18110,55 +16279,26 @@ return ngettext ();
+@@ -18110,55 +16278,26 @@ return ngettext ();
return 0;
}
_ACEOF
@@ -19741,7 +19786,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -18176,43 +16316,18 @@ return dcgettext ();
+@@ -18176,43 +16315,18 @@ return dcgettext ();
return 0;
}
_ACEOF
@@ -19791,7 +19836,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -18234,102 +16349,12 @@ fi
+@@ -18234,102 +16348,12 @@ fi
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -19899,7 +19944,7 @@
_ACEOF
fi
-@@ -18359,15 +16384,13 @@ done
+@@ -18359,15 +16383,13 @@ done
if test "$gt_cv_have_gettext" = "yes"; then
@@ -19918,7 +19963,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -18392,118 +16415,28 @@ esac
+@@ -18392,118 +16414,28 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -20045,7 +20090,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -18518,14 +16451,14 @@ msgstr ""
+@@ -18518,14 +16450,14 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -20065,7 +20110,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -18533,9 +16466,9 @@ fi
+@@ -18533,9 +16465,9 @@ fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -20077,7 +20122,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -18548,14 +16481,14 @@ for as_dir in $PATH
+@@ -18548,14 +16480,14 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -20095,7 +20140,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -18564,19 +16497,19 @@ esac
+@@ -18564,19 +16496,19 @@ esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -20119,7 +20164,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -18601,18 +16534,14 @@ esac
+@@ -18601,18 +16533,14 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -20141,7 +20186,7 @@
/* end confdefs.h. */
int
-@@ -18624,121 +16553,14 @@ extern int _nl_msg_cat_cntr;
+@@ -18624,121 +16552,14 @@ extern int _nl_msg_cat_cntr;
return 0;
}
_ACEOF
@@ -20267,7 +20312,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -18753,10 +16575,8 @@ fi
+@@ -18753,10 +16574,8 @@ fi
;;
esac
fi
@@ -20280,7 +20325,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -18770,9 +16590,7 @@ fi
+@@ -18770,9 +16589,7 @@ fi
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -20291,7 +20336,7 @@
fi
-@@ -18780,7 +16598,7 @@ _ACEOF
+@@ -18780,7 +16597,7 @@ _ACEOF
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -20300,7 +20345,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -18813,7 +16631,7 @@ $as_echo "found xgettext program is not
+@@ -18813,7 +16630,7 @@ $as_echo "found xgettext program is not
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -20309,7 +20354,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -18838,7 +16656,7 @@ $as_echo_n "checking for catalogs to be
+@@ -18838,7 +16655,7 @@ $as_echo_n "checking for catalogs to be
fi
done
LINGUAS=$NEW_LINGUAS
@@ -20318,7 +20363,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -18873,6 +16691,8 @@ $as_echo "$LINGUAS" >&6; }
+@@ -18873,6 +16690,8 @@ $as_echo "$LINGUAS" >&6; }
DBUS_GLIB_REQUIRED_VERSION=0.74
@@ -20327,7 +20372,13 @@
GLIB_REQUIRED_VERSION=2.22.0
GTK_REQUIRED_VERSION=2.12.0
PANGO_REQUIRED_VERSION=1.3.0
-@@ -18888,7 +16708,7 @@ DEVKIT_POWER_REQUIRED_VERSION=008
+@@ -18883,12 +16702,12 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0
+ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
+ #FONTCONFIG_REQUIRED_VERSION=2.6.0
+ FONTCONFIG_REQUIRED_VERSION=2.5.0
+-DEVKIT_POWER_REQUIRED_VERSION=008
++UPOWER_REQUIRED_VERSION=0.9.0
+
# Check whether --enable-compile-warnings was given.
@@ -20336,7 +20387,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="yes"
-@@ -18919,13 +16739,9 @@ fi
+@@ -18919,13 +16738,9 @@ fi
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -20352,7 +20403,7 @@
/* end confdefs.h. */
int
-@@ -18936,35 +16752,14 @@ main ()
+@@ -18936,35 +16751,14 @@ main ()
return 0;
}
_ACEOF
@@ -20391,7 +20442,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -18978,26 +16773,24 @@ $as_echo "$has_option" >&6; }
+@@ -18978,26 +16772,24 @@ $as_echo "$has_option" >&6; }
fi
;;
*)
@@ -20423,7 +20474,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
-@@ -19012,7 +16805,7 @@ $as_echo_n "checking what language compl
+@@ -19012,7 +16804,7 @@ $as_echo_n "checking what language compl
esac
fi
fi
@@ -20432,7 +20483,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -19021,18 +16814,18 @@ $as_echo "$complCFLAGS" >&6; }
+@@ -19021,18 +16813,18 @@ $as_echo "$complCFLAGS" >&6; }
pkg_failed=no
@@ -20455,7 +20506,7 @@
pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -19044,11 +16837,11 @@ if test -n "$GTHREAD_LIBS"; then
+@@ -19044,11 +16836,11 @@ if test -n "$GTHREAD_LIBS"; then
pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -20470,7 +20521,7 @@
pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`
else
pkg_failed=yes
-@@ -19060,6 +16853,8 @@ fi
+@@ -19060,6 +16852,8 @@ fi
if test $pkg_failed = yes; then
@@ -20479,7 +20530,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -19074,18 +16869,7 @@ fi
+@@ -19074,18 +16868,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GTHREAD_PKG_ERRORS" >&5
@@ -20499,7 +20550,7 @@
$GTHREAD_PKG_ERRORS
-@@ -19094,23 +16878,13 @@ installed software in a non-standard pre
+@@ -19094,23 +16877,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables GTHREAD_CFLAGS
and GTHREAD_LIBS to avoid the need to call pkg-config.
@@ -20528,7 +20579,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -19119,39 +16893,41 @@ and GTHREAD_LIBS to avoid the need to ca
+@@ -19119,39 +16892,41 @@ and GTHREAD_LIBS to avoid the need to ca
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -20579,7 +20630,7 @@
gobject-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GLIB_REQUIRED_VERSION
" 2>/dev/null`
-@@ -19165,18 +16941,21 @@ if test -n "$COMMON_LIBS"; then
+@@ -19165,18 +16940,21 @@ if test -n "$COMMON_LIBS"; then
pkg_cv_COMMON_LIBS="$COMMON_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -20605,7 +20656,7 @@
gobject-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GLIB_REQUIRED_VERSION
" 2>/dev/null`
-@@ -19190,6 +16969,8 @@ fi
+@@ -19190,6 +16968,8 @@ fi
if test $pkg_failed = yes; then
@@ -20614,7 +20665,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -19198,11 +16979,13 @@ else
+@@ -19198,11 +16978,13 @@ else
fi
if test $_pkg_short_errors_supported = yes; then
COMMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
@@ -20628,7 +20679,7 @@
gobject-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GLIB_REQUIRED_VERSION
" 2>&1`
-@@ -19210,21 +16993,8 @@ fi
+@@ -19210,21 +16992,8 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$COMMON_PKG_ERRORS" >&5
@@ -20652,7 +20703,7 @@
gobject-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GLIB_REQUIRED_VERSION
) were not met:
-@@ -19236,23 +17006,13 @@ installed software in a non-standard pre
+@@ -19236,23 +17005,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables COMMON_CFLAGS
and COMMON_LIBS to avoid the need to call pkg-config.
@@ -20681,7 +20732,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -19261,39 +17021,41 @@ and COMMON_LIBS to avoid the need to cal
+@@ -19261,39 +17020,41 @@ and COMMON_LIBS to avoid the need to cal
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -20732,7 +20783,7 @@
gobject-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GLIB_REQUIRED_VERSION
" 2>/dev/null`
-@@ -19307,18 +17069,21 @@ if test -n "$DAEMON_LIBS"; then
+@@ -19307,18 +17068,21 @@ if test -n "$DAEMON_LIBS"; then
pkg_cv_DAEMON_LIBS="$DAEMON_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -20758,7 +20809,7 @@
gobject-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GLIB_REQUIRED_VERSION
" 2>/dev/null`
-@@ -19332,6 +17097,8 @@ fi
+@@ -19332,6 +17096,8 @@ fi
if test $pkg_failed = yes; then
@@ -20767,7 +20818,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -19340,11 +17107,13 @@ else
+@@ -19340,11 +17106,13 @@ else
fi
if test $_pkg_short_errors_supported = yes; then
DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
@@ -20781,7 +20832,7 @@
gobject-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GLIB_REQUIRED_VERSION
" 2>&1`
-@@ -19352,21 +17121,8 @@ fi
+@@ -19352,21 +17120,8 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$DAEMON_PKG_ERRORS" >&5
@@ -20805,7 +20856,7 @@
gobject-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GLIB_REQUIRED_VERSION
) were not met:
-@@ -19378,23 +17134,13 @@ installed software in a non-standard pre
+@@ -19378,23 +17133,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables DAEMON_CFLAGS
and DAEMON_LIBS to avoid the need to call pkg-config.
@@ -20834,7 +20885,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -19403,24 +17149,23 @@ and DAEMON_LIBS to avoid the need to cal
+@@ -19403,24 +17148,23 @@ and DAEMON_LIBS to avoid the need to cal
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -20864,7 +20915,7 @@
withval=$with_x;
fi
-@@ -19430,10 +17175,8 @@ if test "x$with_x" = xno; then
+@@ -19430,10 +17174,8 @@ if test "x$with_x" = xno; then
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -20877,7 +20928,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -19450,7 +17193,7 @@ libdir:
+@@ -19450,7 +17192,7 @@ libdir:
@echo libdir='${LIBDIR}'
_ACEOF
if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
@@ -20886,7 +20937,7 @@
for ac_var in incroot usrlibdir libdir; do
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
-@@ -19481,21 +17224,25 @@ fi
+@@ -19481,21 +17223,25 @@ fi
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -20912,7 +20963,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -19517,37 +17264,14 @@ ac_x_header_dirs='
+@@ -19517,37 +17263,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.
@@ -20952,7 +21003,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -19555,8 +17279,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -19555,8 +17278,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
done
fi
@@ -20962,7 +21013,7 @@
fi # $ac_x_includes = no
if test "$ac_x_libraries" = no; then
-@@ -19565,11 +17288,7 @@ if test "$ac_x_libraries" = no; then
+@@ -19565,11 +17287,7 @@ if test "$ac_x_libraries" = no; then
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -20975,7 +21026,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -19580,35 +17299,12 @@ XrmInitialize ()
+@@ -19580,35 +17298,12 @@ XrmInitialize ()
return 0;
}
_ACEOF
@@ -21013,7 +21064,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!
-@@ -19620,10 +17316,8 @@ do
+@@ -19620,10 +17315,8 @@ do
done
done
fi
@@ -21026,7 +21077,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -19644,7 +17338,7 @@ fi
+@@ -19644,7 +17337,7 @@ fi
fi # $with_x != no
if test "$have_x" != yes; then
@@ -21035,7 +21086,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -19655,24 +17349,24 @@ else
+@@ -19655,24 +17348,24 @@ else
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -21065,7 +21116,7 @@
pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11 xau" 2>/dev/null`
else
pkg_failed=yes
-@@ -19684,11 +17378,11 @@ if test -n "$XLIB_LIBS"; then
+@@ -19684,11 +17377,11 @@ if test -n "$XLIB_LIBS"; then
pkg_cv_XLIB_LIBS="$XLIB_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -21080,7 +21131,7 @@
pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11 xau" 2>/dev/null`
else
pkg_failed=yes
-@@ -19700,6 +17394,8 @@ fi
+@@ -19700,6 +17393,8 @@ fi
if test $pkg_failed = yes; then
@@ -21089,7 +21140,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -19714,14 +17410,10 @@ fi
+@@ -19714,14 +17409,10 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$XLIB_PKG_ERRORS" >&5
@@ -21106,7 +21157,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -19734,16 +17426,12 @@ else
+@@ -19734,16 +17425,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 . . . .
@@ -21125,7 +21176,7 @@
/* end confdefs.h. */
int
-@@ -19754,40 +17442,13 @@ main ()
+@@ -19754,40 +17441,13 @@ main ()
return 0;
}
_ACEOF
@@ -21170,7 +21221,7 @@
/* end confdefs.h. */
int
-@@ -19798,46 +17459,19 @@ main ()
+@@ -19798,46 +17458,19 @@ main ()
return 0;
}
_ACEOF
@@ -21224,7 +21275,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -19853,11 +17487,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -19853,11 +17486,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"
@@ -21237,7 +21288,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19875,44 +17505,17 @@ return XOpenDisplay ();
+@@ -19875,44 +17504,17 @@ return XOpenDisplay ();
return 0;
}
_ACEOF
@@ -21287,7 +21338,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -19930,59 +17533,30 @@ return dnet_ntoa ();
+@@ -19930,59 +17532,30 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -21356,7 +21407,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -20000,52 +17574,25 @@ return dnet_ntoa ();
+@@ -20000,52 +17573,25 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -21417,7 +21468,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -20056,105 +17603,20 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -20056,105 +17602,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.
@@ -21528,7 +21579,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -20172,59 +17634,30 @@ return gethostbyname ();
+@@ -20172,59 +17633,30 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -21597,7 +21648,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -20242,43 +17675,18 @@ return gethostbyname ();
+@@ -20242,43 +17674,18 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -21647,7 +21698,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -20292,33 +17700,21 @@ fi
+@@ -20292,33 +17699,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.
@@ -21693,7 +21744,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -20327,13 +17723,6 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -20327,13 +17722,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char connect ();
@@ -21707,7 +21758,7 @@
int
main ()
{
-@@ -20342,55 +17731,38 @@ return connect ();
+@@ -20342,55 +17730,38 @@ return connect ();
return 0;
}
_ACEOF
@@ -21787,7 +21838,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -20399,85 +17771,48 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -20399,85 +17770,48 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -21897,7 +21948,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -20485,71 +17820,50 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -20485,71 +17819,50 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -21999,7 +22050,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -20558,292 +17872,27 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -20558,292 +17871,27 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -22300,7 +22351,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -20852,20 +17901,18 @@ fi
+@@ -20852,20 +17900,18 @@ fi
fi
if test "x$no_x" = xyes; then
@@ -22325,7 +22376,7 @@
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
-@@ -20878,16 +17925,12 @@ else
+@@ -20878,16 +17924,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 . . . .
@@ -22344,7 +22395,7 @@
/* end confdefs.h. */
int
-@@ -20898,40 +17941,13 @@ main ()
+@@ -20898,40 +17940,13 @@ main ()
return 0;
}
_ACEOF
@@ -22389,7 +22440,7 @@
/* end confdefs.h. */
int
-@@ -20942,46 +17958,19 @@ main ()
+@@ -20942,46 +17957,19 @@ main ()
return 0;
}
_ACEOF
@@ -22443,7 +22494,7 @@
ac_c_werror_flag=$ac_xsave_c_werror_flag
LIBS=$ac_xsave_LIBS
fi
-@@ -20997,11 +17986,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -20997,11 +17985,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"
@@ -22456,7 +22507,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21019,44 +18004,17 @@ return XOpenDisplay ();
+@@ -21019,44 +18003,17 @@ return XOpenDisplay ();
return 0;
}
_ACEOF
@@ -22506,7 +22557,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21074,59 +18032,30 @@ return dnet_ntoa ();
+@@ -21074,59 +18031,30 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -22575,7 +22626,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21144,52 +18073,25 @@ return dnet_ntoa ();
+@@ -21144,52 +18072,25 @@ return dnet_ntoa ();
return 0;
}
_ACEOF
@@ -22636,7 +22687,7 @@
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-@@ -21200,105 +18102,20 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -21200,105 +18101,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.
@@ -22747,7 +22798,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21316,59 +18133,30 @@ return gethostbyname ();
+@@ -21316,59 +18132,30 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -22816,7 +22867,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21386,43 +18174,18 @@ return gethostbyname ();
+@@ -21386,43 +18173,18 @@ return gethostbyname ();
return 0;
}
_ACEOF
@@ -22866,7 +22917,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -21436,33 +18199,21 @@ fi
+@@ -21436,33 +18198,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.
@@ -22912,7 +22963,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -21471,13 +18222,6 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -21471,13 +18221,6 @@ cat >>conftest.$ac_ext <<_ACEOF
extern "C"
#endif
char connect ();
@@ -22926,7 +22977,7 @@
int
main ()
{
-@@ -21486,55 +18230,38 @@ return connect ();
+@@ -21486,55 +18229,38 @@ return connect ();
return 0;
}
_ACEOF
@@ -23006,7 +23057,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21543,85 +18270,48 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -21543,85 +18269,48 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -23116,7 +23167,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -21629,71 +18319,50 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -21629,71 +18318,50 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -23218,7 +23269,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21702,292 +18371,27 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -21702,292 +18370,27 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -23519,7 +23570,7 @@
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -21996,9 +18400,7 @@ fi
+@@ -21996,9 +18399,7 @@ fi
fi
if test "x$no_x" = xyes; then
@@ -23530,7 +23581,7 @@
else
XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lXau -lX11 -lXext $X_EXTRA_LIBS"
XLIB_CFLAGS=$X_CFLAGS
-@@ -22006,29 +18408,29 @@ $as_echo "$as_me: error: \"no (requires
+@@ -22006,29 +18407,29 @@ $as_echo "$as_me: error: \"no (requires
else
XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS
XLIB_LIBS=$pkg_cv_XLIB_LIBS
@@ -23567,7 +23618,7 @@
pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
" 2>/dev/null`
else
-@@ -22041,13 +18443,13 @@ if test -n "$GTK_LIBS"; then
+@@ -22041,13 +18442,13 @@ if test -n "$GTK_LIBS"; then
pkg_cv_GTK_LIBS="$GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -23585,7 +23636,7 @@
pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
" 2>/dev/null`
else
-@@ -22060,6 +18462,8 @@ fi
+@@ -22060,6 +18461,8 @@ fi
if test $pkg_failed = yes; then
@@ -23594,7 +23645,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -22076,19 +18480,7 @@ fi
+@@ -22076,19 +18479,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -23615,7 +23666,7 @@
) were not met:
$GTK_PKG_ERRORS
-@@ -22098,13 +18490,13 @@ installed software in a non-standard pre
+@@ -22098,13 +18489,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables GTK_CFLAGS
and GTK_LIBS to avoid the need to call pkg-config.
@@ -23634,7 +23685,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22113,44 +18505,33 @@ and GTK_LIBS to avoid the need to call p
+@@ -22113,44 +18504,33 @@ and GTK_LIBS to avoid the need to call p
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -23687,7 +23738,7 @@
pkg_cv_CANBERRA_GTK_CFLAGS=`$PKG_CONFIG --cflags "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
" 2>/dev/null`
else
-@@ -22163,13 +18544,13 @@ if test -n "$CANBERRA_GTK_LIBS"; then
+@@ -22163,13 +18543,13 @@ if test -n "$CANBERRA_GTK_LIBS"; then
pkg_cv_CANBERRA_GTK_LIBS="$CANBERRA_GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -23705,7 +23756,7 @@
pkg_cv_CANBERRA_GTK_LIBS=`$PKG_CONFIG --libs "libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED_VERSION
" 2>/dev/null`
else
-@@ -22182,6 +18563,8 @@ fi
+@@ -22182,6 +18562,8 @@ fi
if test $pkg_failed = yes; then
@@ -23714,7 +23765,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -22198,19 +18581,7 @@ fi
+@@ -22198,19 +18580,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$CANBERRA_GTK_PKG_ERRORS" >&5
@@ -23735,7 +23786,7 @@
) were not met:
$CANBERRA_GTK_PKG_ERRORS
-@@ -22220,23 +18591,13 @@ installed software in a non-standard pre
+@@ -22220,23 +18590,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables CANBERRA_GTK_CFLAGS
and CANBERRA_GTK_LIBS to avoid the need to call pkg-config.
@@ -23764,7 +23815,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22245,34 +18606,33 @@ and CANBERRA_GTK_LIBS to avoid the need
+@@ -22245,34 +18605,33 @@ and CANBERRA_GTK_LIBS to avoid the need
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -23807,7 +23858,7 @@
pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED_VERSION
" 2>/dev/null`
else
-@@ -22285,13 +18645,13 @@ if test -n "$GCONF_LIBS"; then
+@@ -22285,13 +18644,13 @@ if test -n "$GCONF_LIBS"; then
pkg_cv_GCONF_LIBS="$GCONF_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -23825,7 +23876,7 @@
pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF_REQUIRED_VERSION
" 2>/dev/null`
else
-@@ -22304,6 +18664,8 @@ fi
+@@ -22304,6 +18663,8 @@ fi
if test $pkg_failed = yes; then
@@ -23834,7 +23885,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -22320,19 +18682,7 @@ fi
+@@ -22320,19 +18681,7 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GCONF_PKG_ERRORS" >&5
@@ -23855,7 +23906,7 @@
) were not met:
$GCONF_PKG_ERRORS
-@@ -22342,23 +18692,13 @@ installed software in a non-standard pre
+@@ -22342,23 +18691,13 @@ installed software in a non-standard pre
Alternatively, you may set the environment variables GCONF_CFLAGS
and GCONF_LIBS to avoid the need to call pkg-config.
@@ -23884,7 +23935,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22367,32 +18707,31 @@ and GCONF_LIBS to avoid the need to call
+@@ -22367,49 +18706,48 @@ and GCONF_LIBS to avoid the need to call
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -23906,40 +23957,54 @@
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for DEVKIT_POWER" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEVKIT_POWER" >&5
- $as_echo_n "checking for DEVKIT_POWER... " >&6; }
-
- if test -n "$DEVKIT_POWER_CFLAGS"; then
- pkg_cv_DEVKIT_POWER_CFLAGS="$DEVKIT_POWER_CFLAGS"
+-$as_echo_n "checking for DEVKIT_POWER... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPOWER" >&5
++$as_echo_n "checking for UPOWER... " >&6; }
+
+-if test -n "$DEVKIT_POWER_CFLAGS"; then
+- pkg_cv_DEVKIT_POWER_CFLAGS="$DEVKIT_POWER_CFLAGS"
++if test -n "$UPOWER_CFLAGS"; then
++ pkg_cv_UPOWER_CFLAGS="$UPOWER_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED_VERSION\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION") 2>&5
+- ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib >= \$UPOWER_REQUIRED_VERSION\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+- pkg_cv_DEVKIT_POWER_CFLAGS=`$PKG_CONFIG --cflags "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION" 2>/dev/null`
+ $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_VERSION" 2>/dev/null`
++ pkg_cv_UPOWER_CFLAGS=`$PKG_CONFIG --cflags "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>/dev/null`
else
pkg_failed=yes
-@@ -22404,11 +18743,11 @@ if test -n "$DEVKIT_POWER_LIBS"; then
- pkg_cv_DEVKIT_POWER_LIBS="$DEVKIT_POWER_LIBS"
+ fi
+ else
+ pkg_failed=untried
+ fi
+-if test -n "$DEVKIT_POWER_LIBS"; then
+- pkg_cv_DEVKIT_POWER_LIBS="$DEVKIT_POWER_LIBS"
++if test -n "$UPOWER_LIBS"; then
++ pkg_cv_UPOWER_LIBS="$UPOWER_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED_VERSION\"") >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"devkit-power-gobject >= \$DEVKIT_POWER_REQUIRED_VERSION\""; } >&5
- ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION") 2>&5
+- ($PKG_CONFIG --exists --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib >= \$UPOWER_REQUIRED_VERSION\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+- pkg_cv_DEVKIT_POWER_LIBS=`$PKG_CONFIG --libs "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION" 2>/dev/null`
+ $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_VERSION" 2>/dev/null`
++ pkg_cv_UPOWER_LIBS=`$PKG_CONFIG --libs "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>/dev/null`
else
pkg_failed=yes
-@@ -22420,6 +18759,8 @@ fi
+ fi
+@@ -22420,6 +18758,8 @@ fi
if test $pkg_failed = yes; then
@@ -23948,38 +24013,53 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -22434,25 +18775,23 @@ fi
+@@ -22427,32 +18767,30 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION" 2>&1`
++ UPOWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>&1`
+ else
+- DEVKIT_POWER_PKG_ERRORS=`$PKG_CONFIG --print-errors "devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION" 2>&1`
++ UPOWER_PKG_ERRORS=`$PKG_CONFIG --print-errors "upower-glib >= $UPOWER_REQUIRED_VERSION" 2>&1`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$DEVKIT_POWER_PKG_ERRORS" >&5
+- echo "$DEVKIT_POWER_PKG_ERRORS" >&5
++ echo "$UPOWER_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
- have_devicekit_power=no
-+ have_devicekit_power=no
++ have_upower=no
elif test $pkg_failed = untried; then
+- have_devicekit_power=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- have_devicekit_power=no
-
- else
- DEVKIT_POWER_CFLAGS=$pkg_cv_DEVKIT_POWER_CFLAGS
- DEVKIT_POWER_LIBS=$pkg_cv_DEVKIT_POWER_LIBS
++ have_upower=no
+
+ else
+- DEVKIT_POWER_CFLAGS=$pkg_cv_DEVKIT_POWER_CFLAGS
+- DEVKIT_POWER_LIBS=$pkg_cv_DEVKIT_POWER_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ UPOWER_CFLAGS=$pkg_cv_UPOWER_CFLAGS
++ UPOWER_LIBS=$pkg_cv_UPOWER_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- have_devicekit_power=yes
- fi
- if test "x$have_devicekit_power" = "xyes" ; then
+- have_devicekit_power=yes
++ have_upower=yes
+ fi
+-if test "x$have_devicekit_power" = "xyes" ; then
++if test "x$have_upower" = "xyes" ; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DEVICEKIT_POWER /**/
-_ACEOF
-+$as_echo "#define HAVE_DEVICEKIT_POWER /**/" >>confdefs.h
-
- fi
-
-@@ -22461,33 +18800,27 @@ fi
++$as_echo "#define HAVE_UPOWER /**/" >>confdefs.h
+
+ fi
+
+@@ -22461,33 +18799,27 @@ fi
pkg_failed=no
@@ -24026,7 +24106,7 @@
" 2>/dev/null`
else
pkg_failed=yes
-@@ -22495,30 +18828,24 @@ fi
+@@ -22495,30 +18827,24 @@ fi
else
pkg_failed=untried
fi
@@ -24068,7 +24148,7 @@
" 2>/dev/null`
else
pkg_failed=yes
-@@ -22530,6 +18857,8 @@ fi
+@@ -22530,6 +18856,8 @@ fi
if test $pkg_failed = yes; then
@@ -24077,7 +24157,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -22537,200 +18866,86 @@ else
+@@ -22537,200 +18865,86 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -24108,13 +24188,13 @@
- fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- x11
-) were not met:
-+ echo "$GDMSETUP_PKG_ERRORS" >&5
-
+-
-$SIMPLE_GREETER_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
--
++ echo "$GDMSETUP_PKG_ERRORS" >&5
+
-Alternatively, you may set the environment variables SIMPLE_GREETER_CFLAGS
-and SIMPLE_GREETER_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
@@ -24227,7 +24307,8 @@
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
--else
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
@@ -24243,8 +24324,7 @@
- have_libxklavier=no
-elif test $pkg_failed = untried; then
- have_libxklavier=no
-+See \`config.log' for more details" "$LINENO" 5 ; }
- else
+-else
- LIBXKLAVIER_CFLAGS=$pkg_cv_LIBXKLAVIER_CFLAGS
- LIBXKLAVIER_LIBS=$pkg_cv_LIBXKLAVIER_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
@@ -24255,25 +24335,25 @@
- have_libxklavier=yes
-fi
-if test "x$have_libxklavier" = "xyes" ; then
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXKLAVIER /**/
-_ACEOF
--
--fi
+
+ fi
- if test x$have_libxklavier = xyes; then
- HAVE_LIBXKLAVIER_TRUE=
- HAVE_LIBXKLAVIER_FALSE='#'
-else
- HAVE_LIBXKLAVIER_TRUE='#'
- HAVE_LIBXKLAVIER_FALSE=
- fi
-
-
-
-
--
--
+-fi
+-
+-
+
+
+
+
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for SIMPLE_CHOOSER" >&5
-$as_echo_n "checking for SIMPLE_CHOOSER... " >&6; }
@@ -24314,7 +24394,7 @@
" 2>/dev/null`
else
pkg_failed=yes
-@@ -22738,1461 +18953,139 @@ fi
+@@ -22738,1461 +18952,139 @@ fi
else
pkg_failed=untried
fi
@@ -25874,7 +25954,7 @@
else
pkg_failed=yes
fi
-@@ -24203,6 +19096,8 @@ fi
+@@ -24203,6 +19095,8 @@ fi
if test $pkg_failed = yes; then
@@ -25883,7 +25963,7 @@
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
-@@ -24210,887 +19105,769 @@ else
+@@ -24210,887 +19104,769 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -27374,7 +27454,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -25098,818 +19875,473 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -25098,818 +19874,473 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -28545,7 +28625,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -25917,78 +20349,53 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -25917,78 +20348,53 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -28652,7 +28732,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -25997,167 +20404,116 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -25997,167 +20403,116 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -28893,7 +28973,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -26166,88 +20522,53 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -26166,88 +20521,53 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -29012,7 +29092,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -26255,62 +20576,40 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -26255,62 +20575,40 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -29096,7 +29176,7 @@
else
mkdtemp_missing=true
-@@ -26326,10 +20625,10 @@ fi
+@@ -26326,10 +20624,10 @@ fi
@@ -29109,7 +29189,7 @@
enableval=$enable_ipv6;
else
enable_ipv6=no
-@@ -26337,11 +20636,7 @@ fi
+@@ -26337,11 +20635,7 @@ fi
if test x$enable_ipv6 = xyes; then
@@ -29122,7 +29202,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -26357,141 +20652,32 @@ main ()
+@@ -26357,141 +20651,32 @@ main ()
return 0;
}
_ACEOF
@@ -29271,7 +29351,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -26509,157 +20695,41 @@ return getaddrinfo ();
+@@ -26509,157 +20694,41 @@ return getaddrinfo ();
return 0;
}
_ACEOF
@@ -29441,7 +29521,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -26677,47 +20747,19 @@ return inet_ntop ();
+@@ -26677,47 +20746,19 @@ return inet_ntop ();
return 0;
}
_ACEOF
@@ -29496,7 +29576,7 @@
"LIBS=$LIBS -l$lib";have_inet_ntop=yes;break
fi
-@@ -26728,21 +20770,19 @@ fi
+@@ -26728,21 +20769,19 @@ fi
if test x$have_inet_ntop = xyes; then
have_ipv6=yes
@@ -29522,7 +29602,7 @@
$as_echo "no" >&6; }
fi
-@@ -26750,7 +20790,7 @@ fi
+@@ -26750,7 +20789,7 @@ fi
withval=""
# Check whether --with-user was given.
@@ -29531,7 +29611,7 @@
withval=$with_user;
fi
-@@ -26771,7 +20811,7 @@ _ACEOF
+@@ -26771,7 +20810,7 @@ _ACEOF
withval=""
# Check whether --with-group was given.
@@ -29540,7 +29620,7 @@
withval=$with_group;
fi
-@@ -26793,9 +20833,9 @@ _ACEOF
+@@ -26793,9 +20832,9 @@ _ACEOF
withval=""
# Check whether --with-pam-prefix was given.
@@ -29552,7 +29632,7 @@
$as_echo "\"PAM files will be installed in prefix ${withval}.\"" >&6; }
fi
fi
-@@ -26808,19 +20848,37 @@ else
+@@ -26808,19 +20847,37 @@ else
fi
@@ -29597,7 +29677,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -26835,46 +20893,21 @@ main ()
+@@ -26835,46 +20892,21 @@ main ()
{
return pam_start ();
;
@@ -29653,7 +29733,7 @@
have_pam=yes
fi
-@@ -26882,157 +20915,16 @@ fi
+@@ -26882,157 +20914,16 @@ fi
if test "x$have_pam" = "xyes"; then
PAM_LIBS="${PAM_LIBS} -lpam"
else
@@ -29816,7 +29896,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -27041,18 +20933,14 @@ fi
+@@ -27041,18 +20932,14 @@ fi
done
@@ -29838,7 +29918,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -27070,93 +20958,56 @@ return pam_syslog ();
+@@ -27070,93 +20957,56 @@ return pam_syslog ();
return 0;
}
_ACEOF
@@ -29948,7 +30028,7 @@
$as_echo "\"not found - assume const, Linux-type PAM\"" >&6; }
fi
-@@ -27164,14 +21015,10 @@ rm -f conftest*
+@@ -27164,14 +21014,10 @@ rm -f conftest*
fi
@@ -29965,7 +30045,7 @@
#ifdef HAVE_USERSEC_H
#include <usersec.h>
#endif
-@@ -27186,508 +21033,66 @@ main ()
+@@ -27186,508 +21032,66 @@ main ()
return 0;
}
_ACEOF
@@ -30501,7 +30581,7 @@
fi
-@@ -27708,20 +21113,16 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+@@ -27708,20 +21112,16 @@ 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
@@ -30526,7 +30606,7 @@
/* end confdefs.h. */
#define _POSIX_PTHREAD_SEMANTICS
-@@ -27745,44 +21146,17 @@ main ()
+@@ -27745,44 +21145,17 @@ main ()
return 0;
}
_ACEOF
@@ -30576,7 +30656,7 @@
$as_echo "$ac_cv_func_posix_getpwnam_r" >&6; }
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -27793,21 +21167,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -27793,21 +21166,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$ac_cv_func_posix_getpwnam_r" = yes; then
@@ -30602,7 +30682,7 @@
/* end confdefs.h. */
#include <pwd.h>
int
-@@ -27816,307 +21184,48 @@ main ()
+@@ -27816,307 +21183,48 @@ main ()
char buffer[10000];
struct passwd pwd;
getpwnam_r ("", &pwd, buffer,
@@ -30947,7 +31027,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -28124,18 +21233,14 @@ _ACEOF
+@@ -28124,18 +21232,14 @@ _ACEOF
fi
done
@@ -30969,7 +31049,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -28153,64 +21258,33 @@ return login ();
+@@ -28153,64 +21257,33 @@ return login ();
return 0;
}
_ACEOF
@@ -31044,7 +31124,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -28228,64 +21302,33 @@ return logout ();
+@@ -28228,64 +21301,33 @@ return logout ();
return 0;
}
_ACEOF
@@ -31119,7 +31199,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -28303,199 +21346,32 @@ return logwtmp ();
+@@ -28303,199 +21345,32 @@ return logwtmp ();
return 0;
}
_ACEOF
@@ -31330,7 +31410,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -28504,16 +21380,12 @@ fi
+@@ -28504,16 +21379,12 @@ fi
done
@@ -31350,7 +31430,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
-@@ -28528,66 +21400,35 @@ return 0;
+@@ -28528,66 +21399,35 @@ return 0;
return 0;
}
_ACEOF
@@ -31425,7 +31505,7 @@
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -28613,50 +21454,23 @@ UTMP ut; char *p; p=ut.ut_host;
+@@ -28613,50 +21453,23 @@ UTMP ut; char *p; p=ut.ut_host;
return 0;
}
_ACEOF
@@ -31482,7 +31562,7 @@
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -28682,50 +21496,23 @@ UTMP ut; int i; i=ut.ut_pid;
+@@ -28682,50 +21495,23 @@ UTMP ut; int i; i=ut.ut_pid;
return 0;
}
_ACEOF
@@ -31539,7 +31619,7 @@
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -28751,50 +21538,23 @@ UTMP ut; char *p; p=ut.ut_id;
+@@ -28751,50 +21537,23 @@ UTMP ut; char *p; p=ut.ut_id;
return 0;
}
_ACEOF
@@ -31596,7 +31676,7 @@
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -28820,50 +21580,23 @@ UTMP ut; char *p; p=ut.ut_name;
+@@ -28820,50 +21579,23 @@ UTMP ut; char *p; p=ut.ut_name;
return 0;
}
_ACEOF
@@ -31653,7 +31733,7 @@
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -28889,50 +21622,23 @@ UTMP ut; int i; i=(int) ut.ut_type;
+@@ -28889,50 +21621,23 @@ UTMP ut; int i; i=(int) ut.ut_type;
return 0;
}
_ACEOF
@@ -31710,7 +31790,7 @@
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -28958,50 +21664,23 @@ UTMP ut; ut.ut_exit.e_termination=0;
+@@ -28958,50 +21663,23 @@ UTMP ut; ut.ut_exit.e_termination=0;
return 0;
}
_ACEOF
@@ -31767,7 +31847,7 @@
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -29027,50 +21706,23 @@ UTMP ut; char *p; p=ut.ut_user;
+@@ -29027,50 +21705,23 @@ UTMP ut; char *p; p=ut.ut_user;
return 0;
}
_ACEOF
@@ -31824,7 +31904,7 @@
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -29096,50 +21748,23 @@ UTMP ut; ut.ut_time=0;
+@@ -29096,50 +21747,23 @@ UTMP ut; ut.ut_time=0;
return 0;
}
_ACEOF
@@ -31881,7 +31961,7 @@
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -29165,50 +21790,23 @@ UTMP ut; ut.ut_tv.tv_sec=0; ut.ut_tv.tv_
+@@ -29165,50 +21789,23 @@ UTMP ut; ut.ut_tv.tv_sec=0; ut.ut_tv.tv_
return 0;
}
_ACEOF
@@ -31938,7 +32018,7 @@
/* end confdefs.h. */
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
-@@ -29234,52 +21832,25 @@ UTMP ut; ut.ut_syslen=0;
+@@ -29234,52 +21831,25 @@ UTMP ut; ut.ut_syslen=0;
return 0;
}
_ACEOF
@@ -31997,7 +32077,7 @@
/* end confdefs.h. */
#include <utmpx.h>
-@@ -29294,42 +21865,19 @@ main ()
+@@ -29294,42 +21864,19 @@ main ()
return 0;
}
_ACEOF
@@ -32044,7 +32124,7 @@
$as_echo "$have_ut_syslen" >&6; }
-@@ -29338,65 +21886,18 @@ XDMCP_LIBS=""
+@@ -29338,65 +21885,18 @@ XDMCP_LIBS=""
if test x$with_xdmcp != xno ; then
xdmcp_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -32116,7 +32196,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -29414,48 +21915,21 @@ return XdmcpFlush ();
+@@ -29414,48 +21914,21 @@ return XdmcpFlush ();
return 0;
}
_ACEOF
@@ -32172,7 +32252,7 @@
XDMCP_LIBS="-lXdmcp"
XDMCP_SUPPORT=yes
-@@ -29467,9 +21941,7 @@ fi
+@@ -29467,9 +21940,7 @@ fi
if test x$with_xdmcp = xyes -a "x$XDMCP_SUPPORT" = "x" ; then
@@ -32183,7 +32263,7 @@
fi
CPPFLAGS="$xdmcp_save_CPPFLAGS"
fi
-@@ -29550,24 +22022,18 @@ else
+@@ -29550,24 +22021,18 @@ else
else
LIBWRAP_LIBS="-L/usr/sfw/lib -R/usr/sfw/lib -lwrap"
@@ -32212,7 +32292,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -29585,76 +22051,45 @@ return hosts_ctl ();
+@@ -29585,76 +22050,45 @@ return hosts_ctl ();
return 0;
}
_ACEOF
@@ -32301,7 +32381,7 @@
/* end confdefs.h. */
#include <tcpd.h>
-@@ -29668,40 +22103,13 @@ return hosts_access;
+@@ -29668,40 +22102,13 @@ return hosts_access;
return 0;
}
_ACEOF
@@ -32345,7 +32425,7 @@
/* end confdefs.h. */
#include <tcpd.h>
-@@ -29715,52 +22123,25 @@ return hosts_access;
+@@ -29715,52 +22122,25 @@ return hosts_access;
return 0;
}
_ACEOF
@@ -32406,7 +32486,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -29772,27 +22153,21 @@ fi
+@@ -29772,27 +22152,21 @@ fi
if $PKG_CONFIG --exists xft ; then
@@ -32438,7 +32518,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -29810,257 +22185,68 @@ return XOpenDevice ();
+@@ -29810,257 +22184,68 @@ return XOpenDevice ();
return 0;
}
_ACEOF
@@ -32736,7 +32816,7 @@
X_EXTRA_LIBS="$X_EXTRA_LIBS $XINPUT_LIBS"
fi
-@@ -30077,18 +22263,14 @@ ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X
+@@ -30077,18 +22262,14 @@ ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X
if test ! x$with_xinerama = xno ; then
# Check for XFree
use_xfree_xinerama=yes
@@ -32758,7 +32838,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30106,101 +22288,29 @@ return XineramaQueryExtension ();
+@@ -30106,101 +22287,29 @@ return XineramaQueryExtension ();
return 0;
}
_ACEOF
@@ -32871,7 +32951,7 @@
XINERAMA_LIBS="-lXinerama"
XINERAMA_SUPPORT=yes
-@@ -30213,27 +22323,23 @@ else
+@@ -30213,27 +22322,23 @@ else
use_xfree_xinerama=no
fi
@@ -32904,7 +32984,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30251,107 +22357,35 @@ return XineramaGetInfo ();
+@@ -30251,107 +22356,35 @@ return XineramaGetInfo ();
return 0;
}
_ACEOF
@@ -33023,7 +33103,7 @@
XINERAMA_LIBS=""
XINERAMA_SUPPORT=yes
-@@ -30361,9 +22395,9 @@ fi
+@@ -30361,9 +22394,9 @@ fi
fi
@@ -33035,7 +33115,7 @@
$as_echo "$use_solaris_xinerama" >&6; };
fi
fi
-@@ -30380,286 +22414,26 @@ if test "x$with_selinux" = "xyes" ; then
+@@ -30380,286 +22413,26 @@ if test "x$with_selinux" = "xyes" ; then
CFLAGS="$CFLAGS -I/usr/local/selinux/include"
LDFLAGS="$LDFLAGS -L/usr/local/selinux/lib"
fi
@@ -33329,7 +33409,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30671,66 +22445,37 @@ extern "C"
+@@ -30671,66 +22444,37 @@ extern "C"
char attr_get ();
int
main ()
@@ -33411,7 +33491,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30748,58 +22493,29 @@ return get_ordered_context_list ();
+@@ -30748,58 +22492,29 @@ return get_ordered_context_list ();
return 0;
}
_ACEOF
@@ -33479,7 +33559,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30817,58 +22533,29 @@ return freecon ();
+@@ -30817,58 +22532,29 @@ return freecon ();
return 0;
}
_ACEOF
@@ -33547,7 +33627,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30886,58 +22573,29 @@ return freeconary ();
+@@ -30886,58 +22572,29 @@ return freeconary ();
return 0;
}
_ACEOF
@@ -33615,7 +33695,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -30955,58 +22613,29 @@ return setexeccon ();
+@@ -30955,58 +22612,29 @@ return setexeccon ();
return 0;
}
_ACEOF
@@ -33683,7 +33763,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -31024,50 +22653,23 @@ return is_selinux_enabled ();
+@@ -31024,50 +22652,23 @@ return is_selinux_enabled ();
return 0;
}
_ACEOF
@@ -33741,7 +33821,7 @@
EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
fi
-@@ -31077,9 +22679,7 @@ use_console_kit=no
+@@ -31077,9 +22678,7 @@ use_console_kit=no
if test "x$with_console_kit" != "xno" ; then
use_console_kit=yes
@@ -33752,7 +33832,7 @@
fi
if test x$use_console_kit = xyes; then
-@@ -31095,13 +22695,13 @@ fi
+@@ -31095,13 +22694,13 @@ fi
# Check whether --with-dbus-sys was given.
@@ -33768,7 +33848,7 @@
withval=$with_dbus_services;
fi
-@@ -31114,13 +22714,13 @@ fi
+@@ -31114,13 +22713,13 @@ fi
@@ -33785,7 +33865,7 @@
$as_echo "no" >&6; }
fi
-@@ -31134,7 +22734,7 @@ ISO_CODES=iso-codes
+@@ -31134,7 +22733,7 @@ ISO_CODES=iso-codes
msg_rbac_shutdown=no
# Check whether --enable-rbac-shutdown was given.
@@ -33794,7 +33874,7 @@
enableval=$enable_rbac_shutdown; enable_rbac_shutdown=$enableval
else
enable_rbac_shutdown=no
-@@ -31144,9 +22744,7 @@ fi
+@@ -31144,9 +22743,7 @@ fi
if test "x$enable_rbac_shutdown" != "xno"; then
RBAC_LIBS="-lsecdb -lsocket -lnsl"
@@ -33805,7 +33885,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -31159,151 +22757,12 @@ fi
+@@ -31159,151 +22756,12 @@ fi
@@ -33961,7 +34041,7 @@
_ACEOF
fi
-@@ -31312,151 +22771,12 @@ done
+@@ -31312,151 +22770,12 @@ done
@@ -34117,7 +34197,7 @@
_ACEOF
fi
-@@ -31474,7 +22794,7 @@ pixmapdir=${datadir}/pixmaps
+@@ -31474,7 +22793,7 @@ pixmapdir=${datadir}/pixmaps
# Check whether --with-log-dir was given.
@@ -34126,7 +34206,7 @@
withval=$with_log_dir;
fi
-@@ -31490,7 +22810,7 @@ logdir=$GDM_LOG_DIR
+@@ -31490,7 +22809,7 @@ logdir=$GDM_LOG_DIR
withval=""
# Check whether --with-at-bindir was given.
@@ -34135,7 +34215,7 @@
withval=$with_at_bindir;
fi
-@@ -31506,7 +22826,7 @@ fi
+@@ -31506,7 +22825,7 @@ fi
withval=""
# Check whether --with-defaults_conf was given.
@@ -34144,7 +34224,7 @@
withval=$with_defaults_conf;
fi
-@@ -31522,7 +22842,7 @@ fi
+@@ -31522,7 +22841,7 @@ fi
withval=""
# Check whether --with-custom_conf was given.
@@ -34153,7 +34233,7 @@
withval=$with_custom_conf;
fi
-@@ -31540,7 +22860,7 @@ GDM_OLD_CONF='${gdmconfdir}/gdm.conf'
+@@ -31540,7 +22859,7 @@ GDM_OLD_CONF='${gdmconfdir}/gdm.conf'
# Check whether --with-xevie was given.
@@ -34162,7 +34242,7 @@
withval=$with_xevie;
else
with_xevie=no
-@@ -31567,13 +22887,9 @@ _ACEOF
+@@ -31567,13 +22886,9 @@ _ACEOF
# required. Solaris auditing is only supported on systems that
# support the ADT_USER enumeration value.
#
@@ -34178,7 +34258,7 @@
/* end confdefs.h. */
#include <bsm/adt.h>
-@@ -31587,46 +22903,23 @@ main ()
+@@ -31587,46 +22902,23 @@ main ()
return 0;
}
_ACEOF
@@ -34230,7 +34310,7 @@
$as_echo "no" >&6; }
fi
if test x$check_sun_audit = xyes; then
-@@ -31642,7 +22935,7 @@ fi
+@@ -31642,7 +22934,7 @@ fi
#
# Check whether --with-libaudit was given.
@@ -34239,7 +34319,7 @@
withval=$with_libaudit;
else
with_libaudit=auto
-@@ -31654,18 +22947,14 @@ if test x$with_libaudit = xno ; then
+@@ -31654,18 +22946,14 @@ if test x$with_libaudit = xno ; then
have_libaudit=no;
else
# See if we have audit daemon library
@@ -34261,7 +34341,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -31683,43 +22972,18 @@ return audit_log_user_message ();
+@@ -31683,43 +22971,18 @@ return audit_log_user_message ();
return 0;
}
_ACEOF
@@ -34313,7 +34393,7 @@
have_libaudit=yes
else
have_libaudit=no
-@@ -31739,9 +23003,7 @@ fi
+@@ -31739,9 +23002,7 @@ fi
if test x$have_libaudit = xyes ; then
PAM_LIBS="$PAM_LIBS -laudit"
@@ -34324,7 +34404,7 @@
fi
-@@ -31760,18 +23022,14 @@ fi
+@@ -31760,18 +23021,14 @@ fi
# Check for Solaris logindevperm support
#
@@ -34346,7 +34426,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -31789,47 +23047,20 @@ return di_devperm_login ();
+@@ -31789,47 +23046,20 @@ return di_devperm_login ();
return 0;
}
_ACEOF
@@ -34401,7 +34481,7 @@
PAM_LIBS="$PAM_LIBS -ldevinfo"
fi
-@@ -31847,7 +23078,10 @@ fi
+@@ -31847,7 +23077,10 @@ fi
# and /usr/X11 since they often symlink to each other, and configure
# should use the more stable location (the real directory) if possible.
#
@@ -34413,7 +34493,7 @@
X_PATH="/usr/X11/bin"
X_SERVER_PATH="/usr/X11/bin"
X_SERVER="/usr/X11/bin/Xserver"
-@@ -31905,28 +23139,10 @@ else
+@@ -31905,28 +23138,10 @@ else
fi
@@ -34445,7 +34525,7 @@
-@@ -32129,7 +23345,7 @@ fi
+@@ -32129,7 +23344,7 @@ fi
# Check whether --with-pid-file was given.
@@ -34454,7 +34534,7 @@
withval=$with_pid_file;
fi
-@@ -32150,7 +23366,7 @@ _ACEOF
+@@ -32150,7 +23365,7 @@ _ACEOF
# Check whether --with-working-directory was given.
@@ -34463,7 +34543,7 @@
withval=$with_working_directory;
fi
-@@ -32166,7 +23382,7 @@ fi
+@@ -32166,7 +23381,7 @@ fi
# Check whether --with-xauth-dir was given.
@@ -34472,7 +34552,7 @@
withval=$with_xauth_dir;
fi
-@@ -32182,7 +23398,7 @@ fi
+@@ -32182,7 +23397,7 @@ fi
# Check whether --with-screenshot-dir was given.
@@ -34481,7 +34561,7 @@
withval=$with_screenshot_dir;
fi
-@@ -32201,7 +23417,7 @@ fi
+@@ -32201,7 +23416,7 @@ fi
# Turn on the additional warnings last, so -Werror doesn't affect other tests.
# Check whether --enable-more-warnings was given.
@@ -34490,7 +34570,7 @@
enableval=$enable_more_warnings; set_more_warnings="$enableval"
else
-@@ -32213,10 +23429,10 @@ else
+@@ -32213,10 +23428,10 @@ else
fi
@@ -34503,7 +34583,7 @@
$as_echo "yes" >&6; }
CFLAGS="\
-Wall \
-@@ -32228,13 +23444,9 @@ $as_echo "yes" >&6; }
+@@ -32228,13 +23443,9 @@ $as_echo "yes" >&6; }
for option in -Wno-strict-aliasing -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -34519,7 +34599,7 @@
/* end confdefs.h. */
int
-@@ -32245,44 +23457,23 @@ main ()
+@@ -32245,44 +23456,23 @@ main ()
return 0;
}
_ACEOF
@@ -34568,7 +34648,7 @@
$as_echo "no" >&6; }
fi
-@@ -32290,7 +23481,7 @@ fi
+@@ -32290,7 +23480,7 @@ fi
# Enable Debug
#
# Check whether --enable-debug was given.
@@ -34577,7 +34657,7 @@
enableval=$enable_debug;
else
enable_debug=yes
-@@ -32312,7 +23503,7 @@ fi
+@@ -32312,7 +23502,7 @@ fi
# Enable Profiling
#
# Check whether --enable-profiling was given.
@@ -34586,7 +34666,7 @@
enableval=$enable_profiling;
else
enable_profiling=yes
-@@ -32321,9 +23512,7 @@ fi
+@@ -32321,9 +23511,7 @@ fi
if test "$enable_profiling" = "yes"; then
@@ -34597,7 +34677,7 @@
fi
-@@ -32396,7 +23585,7 @@ _ACEOF
+@@ -32396,7 +23584,7 @@ _ACEOF
#AC_SUBST(DEBIAN_DATESTAMP)
#AC_SUBST(DEBIAN_DATE)
@@ -34606,7 +34686,7 @@
cat >confcache <<\_ACEOF
-@@ -32426,13 +23615,13 @@ _ACEOF
+@@ -32426,13 +23614,13 @@ _ACEOF
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -34622,7 +34702,7 @@
esac ;;
esac
done
-@@ -32440,8 +23629,8 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -32440,8 +23628,8 @@ $as_echo "$as_me: WARNING: cache variabl
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -34633,7 +34713,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -32464,11 +23653,11 @@ $as_echo "$as_me: WARNING: cache variabl
+@@ -32464,11 +23652,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" &&
@@ -34647,7 +34727,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -32482,14 +23671,15 @@ DEFS=-DHAVE_CONFIG_H
+@@ -32482,14 +23670,15 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
@@ -34665,7 +34745,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -32505,136 +23695,86 @@ else
+@@ -32505,136 +23694,86 @@ else
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -34839,7 +34919,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -32644,17 +23784,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
+@@ -32644,17 +23783,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -34865,7 +34945,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -32662,23 +23803,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -32662,23 +23802,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -34894,7 +34974,7 @@
as_nl='
'
export as_nl
-@@ -32686,7 +23819,13 @@ export as_nl
+@@ -32686,7 +23818,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
@@ -34909,7 +34989,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -32697,7 +23836,7 @@ else
+@@ -32697,7 +23835,7 @@ else
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -34918,7 +34998,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -32720,13 +23859,6 @@ if test "${PATH_SEPARATOR+set}" != set;
+@@ -32720,13 +23858,6 @@ if test "${PATH_SEPARATOR+set}" != set;
}
fi
@@ -34932,7 +35012,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -32736,15 +23868,15 @@ fi
+@@ -32736,15 +23867,15 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -34951,7 +35031,7 @@
IFS=$as_save_IFS
;;
-@@ -32756,12 +23888,16 @@ if test "x$as_myself" = x; then
+@@ -32756,12 +23887,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
@@ -34972,7 +35052,7 @@
done
PS1='$ '
PS2='> '
-@@ -32773,7 +23909,89 @@ export LC_ALL
+@@ -32773,7 +23908,89 @@ export LC_ALL
LANGUAGE=C
export LANGUAGE
@@ -35063,7 +35143,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -32787,8 +24005,12 @@ else
+@@ -32787,8 +24004,12 @@ else
as_basename=false
fi
@@ -35077,7 +35157,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -32808,76 +24030,25 @@ $as_echo X/"$0" |
+@@ -32808,76 +24029,25 @@ $as_echo X/"$0" |
}
s/.*/./; q'`
@@ -35165,7 +35245,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -32906,8 +24077,56 @@ fi
+@@ -32906,8 +24076,56 @@ fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -35223,7 +35303,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -32926,10 +24145,10 @@ else
+@@ -32926,10 +24144,10 @@ else
if test -d "$1"; then
test -d "$1/.";
else
@@ -35236,7 +35316,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -32944,13 +24163,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -32944,13 +24162,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
exec 6>&1
@@ -35258,7 +35338,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -32982,13 +24207,15 @@ _ACEOF
+@@ -32982,13 +24206,15 @@ _ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -35277,7 +35357,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -33007,16 +24234,17 @@ $config_headers
+@@ -33007,16 +24233,17 @@ $config_headers
Configuration commands:
$config_commands
@@ -35299,7 +35379,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -33034,11 +24262,16 @@ ac_need_defaults=:
+@@ -33034,11 +24261,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
@@ -35317,7 +35397,7 @@
*)
ac_option=$1
ac_optarg=$2
-@@ -33052,27 +24285,29 @@ do
+@@ -33052,27 +24284,29 @@ do
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -35352,7 +35432,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -33080,11 +24315,10 @@ Try \`$0 --help' for more information."
+@@ -33080,11 +24314,10 @@ Try \`$0 --help' for more information."
ac_cs_silent=: ;;
# This is an error.
@@ -35367,7 +35447,7 @@
ac_need_defaults=false ;;
esac
-@@ -33495,12 +24729,14 @@ do
+@@ -33495,12 +24728,14 @@ do
"daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;;
"docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
"gui/Makefile") CONFIG_FILES="$CONFIG_FILES gui/Makefile" ;;
@@ -35382,7 +35462,7 @@
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"data/faces/Makefile") CONFIG_FILES="$CONFIG_FILES data/faces/Makefile" ;;
"data/greeter-autostart/Makefile") CONFIG_FILES="$CONFIG_FILES data/greeter-autostart/Makefile" ;;
-@@ -33514,9 +24750,7 @@ do
+@@ -33514,9 +24749,7 @@ do
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -35393,7 +35473,7 @@
esac
done
-@@ -33543,7 +24777,7 @@ $debug ||
+@@ -33543,7 +24776,7 @@ $debug ||
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -35402,7 +35482,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -33554,11 +24788,7 @@ $debug ||
+@@ -33554,11 +24787,7 @@ $debug ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -35415,7 +35495,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -33566,7 +24796,13 @@ $debug ||
+@@ -33566,7 +24795,13 @@ $debug ||
if test -n "$CONFIG_FILES"; then
@@ -35430,7 +35510,7 @@
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
ac_cs_awk_cr='\\r'
-@@ -33583,24 +24819,18 @@ _ACEOF
+@@ -33583,24 +24818,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -35459,7 +35539,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -33622,7 +24852,7 @@ s/'"$ac_delim"'$//
+@@ -33622,7 +24851,7 @@ s/'"$ac_delim"'$//
t delim
:nl
h
@@ -35468,7 +35548,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -33636,7 +24866,7 @@ s/.\{148\}//
+@@ -33636,7 +24865,7 @@ s/.\{148\}//
t nl
:delim
h
@@ -35477,7 +35557,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -33689,22 +24919,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+@@ -33689,22 +24918,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -35516,7 +35596,7 @@
s/^[^=]*=[ ]*$//
}'
fi
-@@ -33732,9 +24968,7 @@ for ac_last_try in false false :; do
+@@ -33732,9 +24967,7 @@ for ac_last_try in false false :; do
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -35527,7 +35607,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -33819,9 +25053,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -33819,9 +25052,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -35538,7 +35618,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -33834,9 +25066,7 @@ do
+@@ -33834,9 +25065,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -35549,7 +35629,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -33864,12 +25094,10 @@ $as_echo "$as_me: error: invalid tag $ac
+@@ -33864,12 +25093,10 @@ $as_echo "$as_me: error: invalid tag $ac
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -35564,7 +35644,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -33880,7 +25108,7 @@ $as_echo "$as_me: error: cannot find inp
+@@ -33880,7 +25107,7 @@ $as_echo "$as_me: error: cannot find inp
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -35573,7 +35653,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -33893,9 +25121,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+@@ -33893,9 +25120,7 @@ $as_echo "$as_me: creating $ac_file" >&6
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -35584,7 +35664,7 @@
esac
;;
esac
-@@ -33923,47 +25149,7 @@ $as_echo X"$ac_file" |
+@@ -33923,47 +25148,7 @@ $as_echo X"$ac_file" |
q
}
s/.*/./; q'`
@@ -35633,7 +35713,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -34020,7 +25206,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+@@ -34020,7 +25205,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=
@@ -35641,7 +35721,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -34030,12 +25215,11 @@ ac_sed_dataroot='
+@@ -34030,12 +25214,11 @@ ac_sed_dataroot='
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -35656,7 +35736,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
-@@ -34045,7 +25229,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+@@ -34045,7 +25228,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -35665,7 +35745,7 @@
esac
_ACEOF
-@@ -34074,26 +25258,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+@@ -34074,26 +25257,22 @@ 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 \
@@ -35697,7 +35777,7 @@
;;
:H)
#
-@@ -34104,25 +25284,19 @@ $as_echo "$as_me: error: could not creat
+@@ -34104,25 +25283,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" \
@@ -35727,7 +35807,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -34160,7 +25334,7 @@ $as_echo X"$_am_arg" |
+@@ -34160,7 +25333,7 @@ $as_echo X"$_am_arg" |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -35736,7 +35816,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -34255,47 +25429,7 @@ $as_echo X"$file" |
+@@ -34255,47 +25428,7 @@ $as_echo X"$file" |
q
}
s/.*/./; q'`
@@ -35785,7 +35865,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -35109,9 +26243,7 @@ _LT_EOF
+@@ -35109,9 +26242,7 @@ _LT_EOF
esac ;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -35796,7 +35876,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -35134,15 +26266,12 @@ $as_echo "$as_me: error: po/Makefile.in.
+@@ -35134,15 +26265,12 @@ $as_echo "$as_me: error: po/Makefile.in.
done # for ac_tag
@@ -35814,7 +35894,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -35163,10 +26292,10 @@ if test "$no_create" != yes; then
+@@ -35163,10 +26291,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.
@@ -35827,10 +35907,17 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
+@@ -35213,5 +26341,6 @@ echo \
+ XDMCP support: ${XDMCP_SUPPORT}
+ SELinux support: ${with_selinux}
+ ConsoleKit support: ${use_console_kit}
++ UPower support: ${have_upower}
+ Build with RBAC: ${msg_rbac_shutdown}
+ "
Index: gdm-2.30.5/daemon/Makefile.in
===================================================================
---- gdm-2.30.5.orig/daemon/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/daemon/Makefile.in 2010-09-05 19:54:22.380366497 +0200
+--- gdm-2.30.5.orig/daemon/Makefile.in 2010-09-05 21:51:36.860646394 +0200
++++ gdm-2.30.5/daemon/Makefile.in 2010-09-05 21:58:11.288645909 +0200
@@ -55,8 +55,10 @@ sbin_PROGRAMS = gdm-binary$(EXEEXT) $(am
subdir = daemon
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -35844,7 +35931,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -328,10 +330,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -301,8 +303,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -328,10 +328,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -35858,7 +35954,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -396,11 +401,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -347,7 +350,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -396,11 +398,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -35873,10 +35977,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -419,6 +424,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/data/faces/Makefile.in
===================================================================
---- gdm-2.30.5.orig/data/faces/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/data/faces/Makefile.in 2010-09-05 19:54:22.668365593 +0200
+--- gdm-2.30.5.orig/data/faces/Makefile.in 2010-09-05 21:51:36.844646525 +0200
++++ gdm-2.30.5/data/faces/Makefile.in 2010-09-05 21:58:11.496643213 +0200
@@ -37,8 +37,10 @@ host_triplet = @host@
subdir = data/faces
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -35890,7 +36004,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -144,10 +146,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -117,8 +119,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -144,10 +144,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -35904,7 +36027,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -212,11 +217,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -163,7 +166,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -212,11 +214,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -35919,10 +36050,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -235,6 +240,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/data/greeter-autostart/Makefile.in
===================================================================
---- gdm-2.30.5.orig/data/greeter-autostart/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/data/greeter-autostart/Makefile.in 2010-09-05 19:54:22.760368144 +0200
+--- gdm-2.30.5.orig/data/greeter-autostart/Makefile.in 2010-09-05 21:51:36.832646746 +0200
++++ gdm-2.30.5/data/greeter-autostart/Makefile.in 2010-09-05 21:58:11.588643805 +0200
@@ -38,8 +38,10 @@ subdir = data/greeter-autostart
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/at-spi-registryd-wrapper.desktop.in.in
@@ -35936,7 +36077,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -145,10 +147,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -118,8 +120,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -145,10 +145,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -35950,7 +36100,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -213,11 +218,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -164,7 +167,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -213,11 +215,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -35965,10 +36123,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -236,6 +241,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/data/Makefile.in
===================================================================
---- gdm-2.30.5.orig/data/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/data/Makefile.in 2010-09-05 19:54:22.576864155 +0200
+--- gdm-2.30.5.orig/data/Makefile.in 2010-09-05 21:51:36.816645410 +0200
++++ gdm-2.30.5/data/Makefile.in 2010-09-05 21:58:11.404643119 +0200
@@ -36,15 +36,17 @@ build_triplet = @build@
host_triplet = @host@
subdir = data
@@ -36004,7 +36172,16 @@
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -186,10 +190,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -159,8 +163,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -186,10 +188,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36018,7 +36195,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -254,11 +261,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -205,7 +210,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -254,11 +258,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36033,6 +36218,16 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -277,6 +284,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
@@ -378,16 +388,20 @@ cachedir = $(localstatedir)/cache/gdm
dbusconfdir = $(DBUS_SYS_DIR)
dbusconf_in_files = gdm.conf.in
@@ -36170,8 +36365,8 @@
rm -f \
Index: gdm-2.30.5/data/pixmaps/16x16/Makefile.in
===================================================================
---- gdm-2.30.5.orig/data/pixmaps/16x16/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/data/pixmaps/16x16/Makefile.in 2010-09-05 19:54:22.848366693 +0200
+--- gdm-2.30.5.orig/data/pixmaps/16x16/Makefile.in 2010-09-05 21:51:36.800646519 +0200
++++ gdm-2.30.5/data/pixmaps/16x16/Makefile.in 2010-09-05 21:58:11.676644306 +0200
@@ -39,8 +39,10 @@ host_triplet = @host@
subdir = data/pixmaps/16x16
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -36185,7 +36380,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -146,10 +148,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -119,8 +121,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -146,10 +146,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36199,7 +36403,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -214,11 +219,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -165,7 +168,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -214,11 +216,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36214,10 +36426,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -237,6 +242,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/data/pixmaps/32x32/Makefile.in
===================================================================
---- gdm-2.30.5.orig/data/pixmaps/32x32/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/data/pixmaps/32x32/Makefile.in 2010-09-05 19:54:22.936365722 +0200
+--- gdm-2.30.5.orig/data/pixmaps/32x32/Makefile.in 2010-09-05 21:51:36.784646650 +0200
++++ gdm-2.30.5/data/pixmaps/32x32/Makefile.in 2010-09-05 21:58:11.768643437 +0200
@@ -39,8 +39,10 @@ host_triplet = @host@
subdir = data/pixmaps/32x32
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -36231,7 +36453,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -146,10 +148,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -119,8 +121,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -146,10 +146,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36245,7 +36476,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -214,11 +219,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -165,7 +168,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -214,11 +216,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36260,10 +36499,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -237,6 +242,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/data/pixmaps/48x48/Makefile.in
===================================================================
---- gdm-2.30.5.orig/data/pixmaps/48x48/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/data/pixmaps/48x48/Makefile.in 2010-09-05 19:54:23.028866436 +0200
+--- gdm-2.30.5.orig/data/pixmaps/48x48/Makefile.in 2010-09-05 21:51:36.768646291 +0200
++++ gdm-2.30.5/data/pixmaps/48x48/Makefile.in 2010-09-05 21:58:11.856643937 +0200
@@ -39,8 +39,10 @@ host_triplet = @host@
subdir = data/pixmaps/48x48
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -36277,7 +36526,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -146,10 +148,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -119,8 +121,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -146,10 +146,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36291,7 +36549,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -214,11 +219,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -165,7 +168,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -214,11 +216,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36306,10 +36572,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -237,6 +242,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/data/pixmaps/Makefile.in
===================================================================
---- gdm-2.30.5.orig/data/pixmaps/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/data/pixmaps/Makefile.in 2010-09-05 19:54:23.148867653 +0200
+--- gdm-2.30.5.orig/data/pixmaps/Makefile.in 2010-09-05 21:51:36.744644775 +0200
++++ gdm-2.30.5/data/pixmaps/Makefile.in 2010-09-05 21:58:11.952643140 +0200
@@ -37,8 +37,10 @@ host_triplet = @host@
subdir = data/pixmaps
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -36323,7 +36599,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -184,10 +186,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -157,8 +159,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -184,10 +184,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36337,7 +36622,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -252,11 +257,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -203,7 +206,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -252,11 +254,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36352,10 +36645,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -275,6 +280,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/docs/Makefile.in
===================================================================
---- gdm-2.30.5.orig/docs/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/docs/Makefile.in 2010-09-05 19:54:23.280866212 +0200
+--- gdm-2.30.5.orig/docs/Makefile.in 2010-09-05 21:51:36.732647439 +0200
++++ gdm-2.30.5/docs/Makefile.in 2010-09-05 21:58:12.080644043 +0200
@@ -61,8 +61,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr
$(top_srcdir)/gnome-doc-utils.make
subdir = docs
@@ -36369,7 +36672,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -145,10 +147,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -118,8 +120,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -145,10 +145,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36383,7 +36695,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -213,11 +218,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -164,7 +167,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -213,11 +215,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36398,10 +36718,81 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -236,6 +241,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -388,6 +396,7 @@ _DOC_C_HTML = $(foreach f, \
+ _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
+
++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
+ _DOC_LC_MODULES = $(if $(DOC_MODULE), \
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
+
+@@ -732,6 +741,9 @@ omf: $(_DOC_OMF_ALL)
+ .PHONY: po
+ po: $(_DOC_POFILES)
+
++.PHONY: mo
++mo: $(_DOC_MOFILES)
++
+ $(_DOC_POFILES):
+ @if ! test -d $(dir $@); then \
+ echo "mkdir $(dir $@)"; \
+@@ -759,16 +771,23 @@ $(_DOC_POFILES):
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
+ fi
+
++$(_DOC_MOFILES): %.mo: %.po
++ @if ! test -d $(dir $@); then \
++ echo "mkdir $(dir $@)"; \
++ mkdir "$(dir $@)"; \
++ fi
++ msgfmt -o $@ $<
++
+ # FIXME: fix the dependancy
+ # FIXME: hook xml2po up
+-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
++$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+ if ! test -d $(dir $@); then mkdir $(dir $@); fi
+ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+ (cd $(dir $@) && \
+- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+ .PHONY: pot
+@@ -794,12 +813,14 @@ clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(
+ clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
+ clean-doc-lc:
+ rm -f $(_DOC_LC_DOCS)
++ rm -f $(_DOC_MOFILES)
+ @list='$(_DOC_POFILES)'; for po in $$list; do \
+ if ! test "$$po" -ef "$(srcdir)/$$po"; then \
+ echo "rm -f $$po"; \
+ rm -f "$$po"; \
+ fi; \
+ done
++# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
+ @for lc in C $(_DOC_REAL_LINGUAS); do \
+ if test -f "$$lc/.xml2po.mo"; then \
+ echo "rm -f $$lc/.xml2po.mo"; \
Index: gdm-2.30.5/gui/Makefile.in
===================================================================
---- gdm-2.30.5.orig/gui/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/gui/Makefile.in 2010-09-05 19:54:23.376866893 +0200
+--- gdm-2.30.5.orig/gui/Makefile.in 2010-09-05 21:51:36.720645703 +0200
++++ gdm-2.30.5/gui/Makefile.in 2010-09-05 21:58:12.172643657 +0200
@@ -37,8 +37,10 @@ host_triplet = @host@
subdir = gui
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -36415,7 +36806,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -160,10 +162,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -133,8 +135,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -160,10 +160,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36429,7 +36829,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -228,11 +233,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -179,7 +182,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -228,11 +230,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36444,6 +36852,16 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -251,6 +256,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
@@ -340,6 +348,7 @@ DIST_SUBDIRS = \
simple-chooser \
simple-greeter \
@@ -36454,8 +36872,8 @@
all: all-recursive
Index: gdm-2.30.5/gui/simple-chooser/Makefile.in
===================================================================
---- gdm-2.30.5.orig/gui/simple-chooser/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/gui/simple-chooser/Makefile.in 2010-09-05 19:54:23.632865759 +0200
+--- gdm-2.30.5.orig/gui/simple-chooser/Makefile.in 2010-09-05 21:51:36.704648277 +0200
++++ gdm-2.30.5/gui/simple-chooser/Makefile.in 2010-09-05 21:58:12.416645692 +0200
@@ -39,8 +39,10 @@ libexec_PROGRAMS = gdm-simple-chooser$(E
subdir = gui/simple-chooser
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -36469,7 +36887,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -173,10 +175,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -146,8 +148,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -173,10 +173,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36483,7 +36910,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -241,11 +246,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -192,7 +195,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -241,11 +243,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36498,10 +36933,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -264,6 +269,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/gui/simple-greeter/libnotificationarea/Makefile.in
===================================================================
---- gdm-2.30.5.orig/gui/simple-greeter/libnotificationarea/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/gui/simple-greeter/libnotificationarea/Makefile.in 2010-09-05 19:54:23.980867183 +0200
+--- gdm-2.30.5.orig/gui/simple-greeter/libnotificationarea/Makefile.in 2010-09-05 21:51:36.692644585 +0200
++++ gdm-2.30.5/gui/simple-greeter/libnotificationarea/Makefile.in 2010-09-05 21:58:12.748643827 +0200
@@ -39,8 +39,10 @@ noinst_PROGRAMS = testtray$(EXEEXT)
subdir = gui/simple-greeter/libnotificationarea
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -36515,7 +36960,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -166,10 +168,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -139,8 +141,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -166,10 +166,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36529,7 +36983,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -234,11 +239,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -185,7 +188,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -234,11 +236,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36544,10 +37006,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -257,6 +262,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/gui/simple-greeter/Makefile.in
===================================================================
---- gdm-2.30.5.orig/gui/simple-greeter/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/gui/simple-greeter/Makefile.in 2010-09-05 19:54:23.852867753 +0200
+--- gdm-2.30.5.orig/gui/simple-greeter/Makefile.in 2010-09-05 21:51:36.676643247 +0200
++++ gdm-2.30.5/gui/simple-greeter/Makefile.in 2010-09-05 21:58:12.620644381 +0200
@@ -46,8 +46,10 @@ libexec_PROGRAMS = gdm-simple-greeter$(E
subdir = gui/simple-greeter
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -36561,7 +37033,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -353,10 +355,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -326,8 +328,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -353,10 +353,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36575,7 +37056,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -421,11 +426,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -372,7 +375,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -421,11 +423,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36590,10 +37079,48 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -444,6 +449,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+@@ -546,8 +554,7 @@ AM_CPPFLAGS = \
+ -DSBINDIR=\""$(sbindir)"\" \
+ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
+ -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
+- $(DEVKIT_POWER_CFLAGS) \
+- -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
++ $(UPOWER_CFLAGS) \
+ $(DISABLE_DEPRECATED_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(SIMPLE_GREETER_CFLAGS) \
+@@ -655,7 +662,7 @@ test_greeter_panel_LDADD = \
+ $(GTK_LIBS) \
+ $(GCONF_LIBS) \
+ $(LIBXKLAVIER_LIBS) \
+- $(DEVKIT_POWER_LIBS) \
++ $(UPOWER_LIBS) \
+ $(NULL)
+
+ test_remote_login_window_SOURCES = \
+@@ -840,7 +847,7 @@ gdm_simple_greeter_LDADD = \
+ $(SIMPLE_GREETER_LIBS) \
+ $(RBAC_LIBS) \
+ $(LIBXKLAVIER_LIBS) \
+- $(DEVKIT_POWER_LIBS) \
++ $(UPOWER_LIBS) \
+ $(NULL)
+
+ uidir = $(pkgdatadir)
Index: gdm-2.30.5/gui/user-switch-applet/Makefile.in
===================================================================
---- gdm-2.30.5.orig/gui/user-switch-applet/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/gui/user-switch-applet/Makefile.in 2010-09-05 19:54:24.120365776 +0200
+--- gdm-2.30.5.orig/gui/user-switch-applet/Makefile.in 2010-09-05 21:51:36.660646312 +0200
++++ gdm-2.30.5/gui/user-switch-applet/Makefile.in 2010-09-05 21:58:12.872643664 +0200
@@ -39,8 +39,10 @@ libexec_PROGRAMS = gdm-user-switch-apple
subdir = gui/user-switch-applet
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -36607,7 +37134,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -183,10 +185,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -156,8 +158,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -183,10 +183,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -36621,7 +37157,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -251,11 +256,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -202,7 +205,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -251,11 +253,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36636,10 +37180,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -274,6 +279,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/ltmain.sh
===================================================================
---- gdm-2.30.5.orig/ltmain.sh 2010-09-05 19:55:37.628866085 +0200
-+++ gdm-2.30.5/ltmain.sh 2010-09-05 19:54:07.960867992 +0200
+--- gdm-2.30.5.orig/ltmain.sh 2010-09-05 21:51:36.480649127 +0200
++++ gdm-2.30.5/ltmain.sh 2010-09-05 21:56:48.580644944 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -36721,7 +37275,7 @@
Index: gdm-2.30.5/m4/libtool.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.5/m4/libtool.m4 2010-09-05 19:53:59.364363976 +0200
++++ gdm-2.30.5/m4/libtool.m4 2010-09-05 21:56:48.596648236 +0200
@@ -0,0 +1,7377 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
@@ -44103,7 +44657,7 @@
Index: gdm-2.30.5/m4/lt~obsolete.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.5/m4/lt~obsolete.m4 2010-09-05 19:53:59.364363976 +0200
++++ gdm-2.30.5/m4/lt~obsolete.m4 2010-09-05 21:56:48.596648236 +0200
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
@@ -44200,7 +44754,7 @@
Index: gdm-2.30.5/m4/ltoptions.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.5/m4/ltoptions.m4 2010-09-05 19:53:59.364363976 +0200
++++ gdm-2.30.5/m4/ltoptions.m4 2010-09-05 21:56:48.596648236 +0200
@@ -0,0 +1,368 @@
+# Helper functions for option handling. -*- Autoconf -*-
+#
@@ -44573,7 +45127,7 @@
Index: gdm-2.30.5/m4/ltsugar.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.5/m4/ltsugar.m4 2010-09-05 19:53:59.364363976 +0200
++++ gdm-2.30.5/m4/ltsugar.m4 2010-09-05 21:56:48.596648236 +0200
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
@@ -44701,7 +45255,7 @@
Index: gdm-2.30.5/m4/ltversion.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.5/m4/ltversion.m4 2010-09-05 19:53:59.364363976 +0200
++++ gdm-2.30.5/m4/ltversion.m4 2010-09-05 21:56:48.596648236 +0200
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers -*- Autoconf -*-
+#
@@ -44728,8 +45282,8 @@
+])
Index: gdm-2.30.5/Makefile.in
===================================================================
---- gdm-2.30.5.orig/Makefile.in 2010-08-11 19:40:16.000000000 +0200
-+++ gdm-2.30.5/Makefile.in 2010-09-05 19:54:24.572365609 +0200
+--- gdm-2.30.5.orig/Makefile.in 2010-09-05 21:51:36.596647324 +0200
++++ gdm-2.30.5/Makefile.in 2010-09-05 21:58:13.236643976 +0200
@@ -40,8 +40,10 @@ DIST_COMMON = README $(am__configure_dep
TODO acconfig.h compile config.guess config.sub depcomp \
install-sh ltmain.sh missing mkinstalldirs
@@ -44743,7 +45297,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -175,10 +177,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -148,8 +150,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -175,10 +175,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -44757,7 +45320,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -243,11 +248,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -194,7 +197,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -243,11 +245,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -44772,10 +45343,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -266,6 +271,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/tests/Makefile.in
===================================================================
---- gdm-2.30.5.orig/tests/Makefile.in 2010-08-11 19:40:15.000000000 +0200
-+++ gdm-2.30.5/tests/Makefile.in 2010-09-05 19:54:24.316365767 +0200
+--- gdm-2.30.5.orig/tests/Makefile.in 2010-09-05 21:51:36.568648163 +0200
++++ gdm-2.30.5/tests/Makefile.in 2010-09-05 21:58:13.012642870 +0200
@@ -39,8 +39,10 @@ TESTS = m-common$(EXEEXT) $(am__EXEEXT_1
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -44789,7 +45370,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -165,10 +167,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -138,8 +140,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -165,10 +165,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -44803,7 +45393,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -233,11 +238,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -184,7 +187,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -233,11 +235,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -44818,10 +45416,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -256,6 +261,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/utils/Makefile.in
===================================================================
---- gdm-2.30.5.orig/utils/Makefile.in 2010-08-11 19:40:16.000000000 +0200
-+++ gdm-2.30.5/utils/Makefile.in 2010-09-05 19:54:24.456365469 +0200
+--- gdm-2.30.5.orig/utils/Makefile.in 2010-09-05 21:51:36.536650867 +0200
++++ gdm-2.30.5/utils/Makefile.in 2010-09-05 21:58:13.128643022 +0200
@@ -39,8 +39,10 @@ bin_PROGRAMS = gdmflexiserver$(EXEEXT) g
subdir = utils
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -44835,7 +45443,16 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -162,10 +164,13 @@ GCONF_LIBS = @GCONF_LIBS@
+@@ -135,8 +137,6 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
+-DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ DSYMUTIL = @DSYMUTIL@
+@@ -162,10 +162,13 @@ GCONF_LIBS = @GCONF_LIBS@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GDMCHOOSER = @GDMCHOOSER@
@@ -44849,7 +45466,15 @@
GDM_PID_FILE = @GDM_PID_FILE@
GDM_SCREENSHOT_DIR = @GDM_SCREENSHOT_DIR@
GDM_SESSION_DEFAULT_PATH = @GDM_SESSION_DEFAULT_PATH@
-@@ -230,11 +235,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -181,7 +184,6 @@ GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+ GTHREAD_LIBS = @GTHREAD_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+ HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+ HAVE_PAM = @HAVE_PAM@
+ HELP_DIR = @HELP_DIR@
+@@ -230,11 +232,14 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -44864,10 +45489,20 @@
PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
POFILES = @POFILES@
POSUB = @POSUB@
+@@ -253,6 +258,9 @@ SIMPLE_GREETER_LIBS = @SIMPLE_GREETER_LI
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+ STRIP = @STRIP@
+ SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
Index: gdm-2.30.5/config.h.in
===================================================================
---- gdm-2.30.5.orig/config.h.in 2010-08-11 19:40:21.000000000 +0200
-+++ gdm-2.30.5/config.h.in 2010-09-05 19:53:59.368365532 +0200
+--- gdm-2.30.5.orig/config.h.in 2010-09-05 21:51:36.508651708 +0200
++++ gdm-2.30.5/config.h.in 2010-09-05 21:57:18.668645175 +0200
@@ -71,6 +71,9 @@
/* Group to use */
#undef GDM_GROUPNAME
@@ -44878,6 +45513,26 @@
/* pid file */
#undef GDM_PID_FILE
+@@ -95,9 +98,6 @@
+ /* Define to 1 if you have the `dcgettext' function. */
+ #undef HAVE_DCGETTEXT
+
+-/* Define if we have DeviceKit-power */
+-#undef HAVE_DEVICEKIT_POWER
+-
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #undef HAVE_DLFCN_H
+
+@@ -233,6 +233,9 @@
+ /* Define to 1 if you have the `updwtmpx' function. */
+ #undef HAVE_UPDWTMPX
+
++/* Define if we have UPower */
++#undef HAVE_UPOWER
++
+ /* Define to 1 if you have the <utmpx.h> header file. */
+ #undef HAVE_UTMPX_H
+
@@ -315,6 +318,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -44891,7 +45546,7 @@
Index: gdm-2.30.5/gui/gdmsetup/Makefile.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.5/gui/gdmsetup/Makefile.in 2010-09-05 19:54:23.504867297 +0200
++++ gdm-2.30.5/gui/gdmsetup/Makefile.in 2010-09-05 21:58:12.292643414 +0200
@@ -0,0 +1,767 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -45051,8 +45706,6 @@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
-+DEVKIT_POWER_CFLAGS = @DEVKIT_POWER_CFLAGS@
-+DEVKIT_POWER_LIBS = @DEVKIT_POWER_LIBS@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
@@ -45100,7 +45753,6 @@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
-+HAVE_DEVICEKIT_POWER = @HAVE_DEVICEKIT_POWER@
+HAVE_LIBXKLAVIER = @HAVE_LIBXKLAVIER@
+HAVE_PAM = @HAVE_PAM@
+HELP_DIR = @HELP_DIR@
@@ -45175,6 +45827,9 @@
+SOUND_PROGRAM = @SOUND_PROGRAM@
+STRIP = @STRIP@
+SYSCONFDIR = @SYSCONFDIR@
++UPOWER = @UPOWER@
++UPOWER_CFLAGS = @UPOWER_CFLAGS@
++UPOWER_LIBS = @UPOWER_LIBS@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
@@ -45660,3 +46315,64 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
+Index: gdm-2.30.5/gnome-doc-utils.make
+===================================================================
+--- gdm-2.30.5.orig/gnome-doc-utils.make 2010-09-05 21:58:24.181144247 +0200
++++ gdm-2.30.5/gnome-doc-utils.make 2010-09-05 21:58:00.892645753 +0200
+@@ -266,6 +266,13 @@ _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_I
+ .PHONY: po
+ po: $(_DOC_POFILES)
+
++## @ _DOC_MOFILES
++## The .mo files used for translating the document
++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
++
++.PHONY: mo
++mo: $(_DOC_MOFILES)
++
+ ## @ _DOC_LC_MODULES
+ ## The top-level documentation files in all other locales
+ _DOC_LC_MODULES = $(if $(DOC_MODULE), \
+@@ -332,16 +339,23 @@ $(_DOC_POFILES):
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
+ fi
+
++$(_DOC_MOFILES): %.mo: %.po
++ @if ! test -d $(dir $@); then \
++ echo "mkdir $(dir $@)"; \
++ mkdir "$(dir $@)"; \
++ fi
++ msgfmt -o $@ $<
++
+ # FIXME: fix the dependancy
+ # FIXME: hook xml2po up
+-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
++$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+ if ! test -d $(dir $@); then mkdir $(dir $@); fi
+ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+ (cd $(dir $@) && \
+- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+
+@@ -386,12 +400,14 @@ clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(
+ clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
+ clean-doc-lc:
+ rm -f $(_DOC_LC_DOCS)
++ rm -f $(_DOC_MOFILES)
+ @list='$(_DOC_POFILES)'; for po in $$list; do \
+ if ! test "$$po" -ef "$(srcdir)/$$po"; then \
+ echo "rm -f $$po"; \
+ rm -f "$$po"; \
+ fi; \
+ done
++# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
+ @for lc in C $(_DOC_REAL_LINGUAS); do \
+ if test -f "$$lc/.xml2po.mo"; then \
+ echo "rm -f $$lc/.xml2po.mo"; \
Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=25085&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Sun Sep 5 19:59:12 2010
@@ -22,4 +22,5 @@
22_noconsole.patch
23_autologin_once.patch
24_show_user_other.patch
+25_upower.patch
90_relibtoolize.patch
More information about the pkg-gnome-commits
mailing list