r19552 - in /desktop/experimental/gnome-session/debian: changelog patches/10_session_save.patch patches/90_relibtoolize.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Apr 12 08:37:01 UTC 2009
Author: joss
Date: Sun Apr 12 08:37:01 2009
New Revision: 19552
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19552
Log:
10_session_save.patch: new patch, based on the patch by Ghee Teo.
Enable session saving from the capplet again.
Added:
desktop/experimental/gnome-session/debian/patches/10_session_save.patch
Modified:
desktop/experimental/gnome-session/debian/changelog
desktop/experimental/gnome-session/debian/patches/90_relibtoolize.patch
desktop/experimental/gnome-session/debian/patches/series
Modified: desktop/experimental/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/changelog?rev=19552&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/changelog (original)
+++ desktop/experimental/gnome-session/debian/changelog Sun Apr 12 08:37:01 2009
@@ -21,6 +21,8 @@
* Make dbus-x11 and policykit-gnome dependencies.
* Remove manpage hack, not necessary anymore.
* Install all autostart stuff in /usr/share, not in /etc.
+ * 10_session_save.patch: new patch, based on the patch by Ghee Teo.
+ Enable session saving from the capplet again.
-- Josselin Mouette <joss at debian.org> Sat, 11 Apr 2009 15:30:31 +0200
Added: desktop/experimental/gnome-session/debian/patches/10_session_save.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/10_session_save.patch?rev=19552&op=file
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/10_session_save.patch (added)
+++ desktop/experimental/gnome-session/debian/patches/10_session_save.patch Sun Apr 12 08:37:01 2009
@@ -1,0 +1,275 @@
+Based on the patch in GNOME #575544
+
+Index: gnome-session-2.26.0.90/data/session-properties.glade
+===================================================================
+--- gnome-session-2.26.0.90.orig/data/session-properties.glade 2009-04-11 15:58:23.958548837 +0200
++++ gnome-session-2.26.0.90/data/session-properties.glade 2009-04-12 10:03:06.629976211 +0200
+@@ -306,7 +306,7 @@
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkButton" id="session_properties_save_button">
+- <property name="visible">False</property>
++ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+@@ -348,6 +348,17 @@
+ <property name="position">1</property>
+ </packing>
+ </child>
++ <child>
++ <widget class="GtkLabel" id="session_properties_session_saved_label">
++ <property name="visible">True</property>
++ <property name="wrap">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+Index: gnome-session-2.26.0.90/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-manager.c 2009-04-11 15:56:55.566550412 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-manager.c 2009-04-11 15:57:05.946052485 +0200
+@@ -1871,6 +1871,18 @@ on_xsmp_client_logout_request (GsmXSMPCl
+ }
+
+ static void
++on_xsmp_client_save_request (GsmXSMPClient *client,
++ gboolean show_dialog,
++ GsmManager *manager)
++{
++ GError *error;
++
++ g_debug ("GsmManager: save_request");
++ error = NULL;
++ gsm_session_save (manager->priv->clients, &error);
++}
++
++static void
+ on_store_client_added (GsmStore *store,
+ const char *id,
+ GsmManager *manager)
+@@ -1891,6 +1903,10 @@ on_store_client_added (GsmStore *store
+ "logout-request",
+ G_CALLBACK (on_xsmp_client_logout_request),
+ manager);
++ g_signal_connect (client,
++ "save-request",
++ G_CALLBACK (on_xsmp_client_save_request),
++ manager);
+ }
+
+ g_signal_connect (client,
+@@ -2841,6 +2857,27 @@ gsm_manager_shutdown (GsmManager *manage
+ }
+
+ gboolean
++gsm_manager_save_session (GsmManager *manager,
++ GError **error)
++{
++ g_debug ("GsmManager: SaveSession called");
++
++ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
++
++ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
++ g_set_error (error,
++ GSM_MANAGER_ERROR,
++ GSM_MANAGER_ERROR_NOT_IN_RUNNING,
++ "SaveSession interface is only available during the Running phase");
++ return FALSE;
++ }
++
++ maybe_save_session (manager);
++
++ return TRUE;
++}
++
++gboolean
+ gsm_manager_can_shutdown (GsmManager *manager,
+ gboolean *shutdown_available,
+ GError **error)
+Index: gnome-session-2.26.0.90/gnome-session/gsm-manager.h
+===================================================================
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-manager.h 2009-04-11 15:57:11.406052291 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-manager.h 2009-04-11 15:57:19.160086252 +0200
+@@ -152,6 +152,9 @@ gboolean gsm_manager_is_inhib
+ gboolean gsm_manager_shutdown (GsmManager *manager,
+ GError **error);
+
++gboolean gsm_manager_save_session (GsmManager *manager,
++ GError **error);
++
+ gboolean gsm_manager_can_shutdown (GsmManager *manager,
+ gboolean *shutdown_available,
+ GError **error);
+Index: gnome-session-2.26.0.90/gnome-session/gsm-xsmp-client.c
+===================================================================
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-xsmp-client.c 2009-04-11 15:57:51.498551825 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-xsmp-client.c 2009-04-11 15:57:55.674051646 +0200
+@@ -69,6 +69,7 @@ enum {
+ enum {
+ REGISTER_REQUEST,
+ LOGOUT_REQUEST,
++ SAVE_REQUEST,
+ LAST_SIGNAL
+ };
+
+@@ -1012,6 +1013,17 @@ gsm_xsmp_client_class_init (GsmXSMPClien
+ G_TYPE_NONE,
+ 1, G_TYPE_BOOLEAN);
+
++ signals[SAVE_REQUEST] =
++ g_signal_new ("save-request",
++ G_OBJECT_CLASS_TYPE (object_class),
++ G_SIGNAL_RUN_LAST,
++ G_STRUCT_OFFSET (GsmXSMPClientClass, save_request),
++ NULL,
++ NULL,
++ g_cclosure_marshal_VOID__BOOLEAN,
++ G_TYPE_NONE,
++ 1, G_TYPE_BOOLEAN);
++
+ g_object_class_install_property (object_class,
+ PROP_ICE_CONNECTION,
+ g_param_spec_pointer ("ice-connection",
+Index: gnome-session-2.26.0.90/gnome-session/gsm-xsmp-client.h
+===================================================================
+--- gnome-session-2.26.0.90.orig/gnome-session/gsm-xsmp-client.h 2009-04-11 15:58:08.770553085 +0200
++++ gnome-session-2.26.0.90/gnome-session/gsm-xsmp-client.h 2009-04-11 15:58:12.602052551 +0200
+@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass
+ char **client_id);
+ gboolean (*logout_request) (GsmXSMPClient *client,
+ gboolean prompt);
+-
++ gboolean (*save_request) (GsmXSMPClient *client,
++ gboolean prompt);
+
+ void (*saved_state) (GsmXSMPClient *client);
+
+Index: gnome-session-2.26.0.90/gnome-session/org.gnome.SessionManager.xml
+===================================================================
+--- gnome-session-2.26.0.90.orig/gnome-session/org.gnome.SessionManager.xml 2009-04-11 15:57:31.790054168 +0200
++++ gnome-session-2.26.0.90/gnome-session/org.gnome.SessionManager.xml 2009-04-11 15:57:35.544087712 +0200
+@@ -256,6 +256,14 @@
+ </doc:doc>
+ </method>
+
++ <method name="SaveSession">
++ <doc:doc>
++ <doc:description>
++ <doc:para>Request to save session</doc:para>
++ </doc:description>
++ </doc:doc>
++ </method>
++
+ <method name="CanShutdown">
+ <arg name="is_available" direction="out" type="b">
+ <doc:doc>
+Index: gnome-session-2.26.0.90/capplet/gsm-properties-dialog.c
+===================================================================
+--- gnome-session-2.26.0.90.orig/capplet/gsm-properties-dialog.c 2009-04-11 16:04:30.250051528 +0200
++++ gnome-session-2.26.0.90/capplet/gsm-properties-dialog.c 2009-04-12 10:29:31.953978633 +0200
+@@ -41,6 +41,12 @@
+ #include "gsm-app-dialog.h"
+ #include "eggdesktopfile.h"
+ #include "gsm-util.h"
++#include <dbus/dbus-glib.h>
++#include <dbus/dbus-glib-lowlevel.h>
++
++#define GSM_SERVICE_DBUS "org.gnome.SessionManager"
++#define GSM_PATH_DBUS "/org/gnome/SessionManager"
++#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"
+
+ #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
+
+@@ -59,6 +65,7 @@
+ #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button"
+ #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button"
+ #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button"
++#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label"
+ #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle"
+
+ #define STARTUP_APP_ICON "system-run"
+@@ -1246,10 +1253,64 @@ on_autosave_value_toggled (GtkToggleButt
+ }
+
+ static void
++session_saved_message (GsmPropertiesDialog *dialog,
++ const char *msg,
++ gboolean is_error)
++{
++ GtkWidget *label;
++ gchar *markup;
++ label = glade_xml_get_widget (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME);
++ if (is_error)
++ markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg);
++ else
++ markup = g_markup_escape_text (msg, -1);
++ gtk_label_set_markup (GTK_LABEL (label), markup);
++ g_free (markup);
++}
++
++static void
++session_saved_cb (DBusGProxy *proxy,
++ DBusGProxyCall *call_id,
++ void *user_data)
++{
++ gboolean res;
++ GsmPropertiesDialog *dialog = user_data;
++
++ res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);
++ if (res)
++ session_saved_message (dialog, _("Your session has been saved."), FALSE);
++ else
++ session_saved_message (dialog, _("Failed to save session"), TRUE);
++
++ g_object_unref (proxy);
++}
++
++static void
+ on_save_session_clicked (GtkWidget *widget,
+ GsmPropertiesDialog *dialog)
+ {
+- g_debug ("Session saving is not implemented yet!");
++ DBusGConnection *conn;
++ DBusGProxy *proxy;
++ DBusGProxyCall *call;
++
++ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
++ if (conn == NULL) {
++ session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);
++ return;
++ }
++
++ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
++ if (proxy == NULL) {
++ session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);
++ return;
++ }
++
++ call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);
++ if (call == NULL) {
++ session_saved_message (dialog, _("Failed to save session"), TRUE);
++ g_object_unref (proxy);
++ return;
++ }
+ }
+
+ static void
+Index: gnome-session-2.26.0.90/configure.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/configure.in 2009-04-12 10:08:16.037980302 +0200
++++ gnome-session-2.26.0.90/configure.in 2009-04-12 10:08:32.332285793 +0200
+@@ -67,6 +67,7 @@ PKG_CHECK_MODULES(SESSION_PROPERTIES,
+ glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ libglade-2.0 >= $GLADE_REQUIRED
++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+ )
+
+ PKG_CHECK_MODULES(SPLASH,
Modified: desktop/experimental/gnome-session/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/90_relibtoolize.patch?rev=19552&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/90_relibtoolize.patch (original)
+++ desktop/experimental/gnome-session/debian/patches/90_relibtoolize.patch Sun Apr 12 08:37:01 2009
@@ -4,9 +4,10 @@
autoconf
rm -rf autom4te.cache/
-diff -pruN gnome-session-2.26.0.90.orig/aclocal.m4 gnome-session-2.26.0.90/aclocal.m4
---- gnome-session-2.26.0.90.orig/aclocal.m4 2009-04-08 16:08:25.000000000 +0200
-+++ gnome-session-2.26.0.90/aclocal.m4 2009-04-11 14:53:33.878050058 +0200
+Index: gnome-session-2.26.0.90/aclocal.m4
+===================================================================
+--- gnome-session-2.26.0.90.orig/aclocal.m4 2009-04-11 15:49:02.954052175 +0200
++++ gnome-session-2.26.0.90/aclocal.m4 2009-04-12 10:31:07.157977745 +0200
@@ -13,1954 +13,1717 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -15931,9 +15932,10 @@
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
-diff -pruN gnome-session-2.26.0.90.orig/capplet/Makefile.in gnome-session-2.26.0.90/capplet/Makefile.in
---- gnome-session-2.26.0.90.orig/capplet/Makefile.in 2009-04-08 16:08:30.000000000 +0200
-+++ gnome-session-2.26.0.90/capplet/Makefile.in 2009-04-11 14:53:55.658046957 +0200
+Index: gnome-session-2.26.0.90/capplet/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/capplet/Makefile.in 2009-04-11 15:49:02.926052038 +0200
++++ gnome-session-2.26.0.90/capplet/Makefile.in 2009-04-12 10:31:36.537976810 +0200
@@ -92,10 +92,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -16031,9 +16033,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/compat/Makefile.in gnome-session-2.26.0.90/compat/Makefile.in
---- gnome-session-2.26.0.90.orig/compat/Makefile.in 2009-04-08 16:08:31.000000000 +0200
-+++ gnome-session-2.26.0.90/compat/Makefile.in 2009-04-11 14:53:55.786046396 +0200
+Index: gnome-session-2.26.0.90/compat/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/compat/Makefile.in 2009-04-11 15:49:02.878052921 +0200
++++ gnome-session-2.26.0.90/compat/Makefile.in 2009-04-12 10:31:36.673976916 +0200
@@ -111,10 +111,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -16131,9 +16134,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/config.guess gnome-session-2.26.0.90/config.guess
---- gnome-session-2.26.0.90.orig/config.guess 2009-04-08 16:08:32.000000000 +0200
-+++ gnome-session-2.26.0.90/config.guess 2009-04-11 14:53:55.490048091 +0200
+Index: gnome-session-2.26.0.90/config.guess
+===================================================================
+--- gnome-session-2.26.0.90.orig/config.guess 2009-04-11 15:49:02.842054561 +0200
++++ gnome-session-2.26.0.90/config.guess 2009-04-12 10:31:36.389978880 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
@@ -16155,9 +16159,10 @@
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
-diff -pruN gnome-session-2.26.0.90.orig/configure gnome-session-2.26.0.90/configure
---- gnome-session-2.26.0.90.orig/configure 2009-04-08 16:08:29.000000000 +0200
-+++ gnome-session-2.26.0.90/configure 2009-04-11 14:53:59.010546228 +0200
+Index: gnome-session-2.26.0.90/configure
+===================================================================
+--- gnome-session-2.26.0.90.orig/configure 2009-04-11 15:49:02.822048736 +0200
++++ gnome-session-2.26.0.90/configure 2009-04-12 10:31:39.545976570 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -29775,7 +29780,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15375,8161 +11776,3698 @@ esac
+@@ -15375,8161 +11776,3708 @@ esac
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -33769,18 +33774,6 @@
-
-# A C compiler.
-LTCC=$lt_LTCC
--
--# LTCC compiler flags.
--LTCFLAGS=$lt_LTCFLAGS
--
--# A language-specific compiler.
--CC=$lt_compiler_F77
--
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_F77
--
--# An ERE matcher.
--EGREP=$lt_EGREP
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
@@ -33804,8 +33797,8 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNOME_SESSION_PKG_ERRORS" >&5
--# The linker used to build libraries.
--LD=$lt_LD_F77
+-# LTCC compiler flags.
+-LTCFLAGS=$lt_LTCFLAGS
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED
+ gio-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
@@ -33813,17 +33806,17 @@
+ libglade-2.0 >= $GLADE_REQUIRED
+) were not met:
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# A language-specific compiler.
+-CC=$lt_compiler_F77
+$GNOME_SESSION_PKG_ERRORS
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC_F77
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
--# A symbol stripping program
--STRIP=$lt_STRIP
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+Alternatively, you may set the environment variables GNOME_SESSION_CFLAGS
+and GNOME_SESSION_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
@@ -33835,17 +33828,17 @@
+ libglade-2.0 >= $GLADE_REQUIRED
+) were not met:
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# The linker used to build libraries.
+-LD=$lt_LD_F77
+$GNOME_SESSION_PKG_ERRORS
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+Alternatively, you may set the environment variables GNOME_SESSION_CFLAGS
+and GNOME_SESSION_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
@@ -33858,29 +33851,28 @@
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
--# Used on cygwin: assembler.
--AS="$AS"
+-# A symbol stripping program
+-STRIP=$lt_STRIP
+Alternatively, you may set the environment variables GNOME_SESSION_CFLAGS
+and GNOME_SESSION_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+Alternatively, you may set the environment variables GNOME_SESSION_CFLAGS
+and GNOME_SESSION_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_F77
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
@@ -33892,17 +33884,18 @@
+ :
+fi
--# Object file suffix (normally "o").
--objext="$ac_objext"
-
--# Old archive suffix (normally "a").
--libext="$libext"
+-# Used on cygwin: assembler.
+-AS="$AS"
+
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for SESSION_PROPERTIES" >&5
+$as_echo_n "checking for SESSION_PROPERTIES... " >&6; }
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SESSION_PROPERTIES_CFLAGS"; then
+ pkg_cv_SESSION_PROPERTIES_CFLAGS="$SESSION_PROPERTIES_CFLAGS"
@@ -33911,10 +33904,12 @@
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED
+ gtk+-2.0 >= \$GTK_REQUIRED
+ libglade-2.0 >= \$GLADE_REQUIRED
++ dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
+\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ libglade-2.0 >= $GLADE_REQUIRED
++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -33922,6 +33917,7 @@
+ pkg_cv_SESSION_PROPERTIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ libglade-2.0 >= $GLADE_REQUIRED
++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+" 2>/dev/null`
+else
+ pkg_failed=yes
@@ -33938,10 +33934,12 @@
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED
+ gtk+-2.0 >= \$GTK_REQUIRED
+ libglade-2.0 >= \$GLADE_REQUIRED
++ dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
+\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ libglade-2.0 >= $GLADE_REQUIRED
++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -33949,6 +33947,7 @@
+ pkg_cv_SESSION_PROPERTIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ libglade-2.0 >= $GLADE_REQUIRED
++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+" 2>/dev/null`
+else
+ pkg_failed=yes
@@ -33958,19 +33957,18 @@
+ pkg_failed=untried
+fi
--# Executable file suffix (normally "").
--exeext="$exeext"
-
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_F77
--pic_mode=$pic_mode
-
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-# How to pass a linker flag through the compiler.
+-wl=$lt_lt_prog_compiler_wl_F77
+
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+
+-# Old archive suffix (normally "a").
+-libext="$libext"
+if test $pkg_failed = yes; then
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
@@ -33980,34 +33978,38 @@
+ SESSION_PROPERTIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ libglade-2.0 >= $GLADE_REQUIRED
++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+"`
+ else
+ SESSION_PROPERTIES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ libglade-2.0 >= $GLADE_REQUIRED
++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SESSION_PROPERTIES_PKG_ERRORS" >&5
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ libglade-2.0 >= $GLADE_REQUIRED
++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+) were not met:
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_lt_prog_compiler_pic_F77
+-pic_mode=$pic_mode
+$SESSION_PROPERTIES_PKG_ERRORS
--# Do we need a version for libraries?
--need_version=$need_version
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
+Alternatively, you may set the environment variables SESSION_PROPERTIES_CFLAGS
+and SESSION_PROPERTIES_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
@@ -34015,19 +34017,20 @@
+$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ libglade-2.0 >= $GLADE_REQUIRED
++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+) were not met:
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
+$SESSION_PROPERTIES_PKG_ERRORS
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_F77
+-# Do we need a version for libraries?
+-need_version=$need_version
+Alternatively, you may set the environment variables SESSION_PROPERTIES_CFLAGS
+and SESSION_PROPERTIES_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
@@ -34040,28 +34043,28 @@
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+Alternatively, you may set the environment variables SESSION_PROPERTIES_CFLAGS
+and SESSION_PROPERTIES_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+Alternatively, you may set the environment variables SESSION_PROPERTIES_CFLAGS
+and SESSION_PROPERTIES_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static_F77
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
@@ -34073,39 +34076,20 @@
+ :
+fi
--# Library versioning type.
--version_type=$version_type
-
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
+
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for SPLASH" >&5
+$as_echo_n "checking for SPLASH... " >&6; }
--# List of archive names. First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
--
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
--
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_F77
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
--
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_F77
--archive_expsym_cmds=$lt_archive_expsym_cmds_F77
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
+-
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SPLASH_CFLAGS"; then
+ pkg_cv_SPLASH_CFLAGS="$SPLASH_CFLAGS"
@@ -34167,41 +34151,19 @@
+ pkg_failed=untried
+fi
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_F77
--module_expsym_cmds=$lt_module_expsym_cmds_F77
-
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
-
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_predep_objects_F77
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_postdep_objects_F77
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_F77
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_F77
--
--# The directories searched by this compiler when creating a shared
--# library
--compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+-# Library versioning type.
+-version_type=$version_type
+
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+
+-# List of archive names. First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+if test $pkg_failed = yes; then
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
@@ -34223,25 +34185,31 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$SPLASH_PKG_ERRORS" >&5
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds_F77
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQUIRED
+ gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+ libstartup-notification-1.0
+ gconf-2.0) were not met:
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_F77
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
+$SPLASH_PKG_ERRORS
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_F77
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds_F77
+-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+Alternatively, you may set the environment variables SPLASH_CFLAGS
+and SPLASH_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
@@ -34252,17 +34220,40 @@
+ libstartup-notification-1.0
+ gconf-2.0) were not met:
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_module_cmds_F77
+-module_expsym_cmds=$lt_module_expsym_cmds_F77
+$SPLASH_PKG_ERRORS
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_predep_objects_F77
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_postdep_objects_F77
+-
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps_F77
+-
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps_F77
+-
+-# The directories searched by this compiler when creating a shared
+-# library
+-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+-
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+Alternatively, you may set the environment variables SPLASH_CFLAGS
+and SPLASH_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
@@ -34275,28 +34266,28 @@
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+Alternatively, you may set the environment variables SPLASH_CFLAGS
+and SPLASH_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_F77
+Alternatively, you may set the environment variables SPLASH_CFLAGS
+and SPLASH_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_F77
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
@@ -34308,18 +34299,17 @@
+ :
+fi
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_F77
-
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for COMPAT" >&5
+$as_echo_n "checking for COMPAT... " >&6; }
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+if test -n "$PKG_CONFIG"; then
+ if test -n "$COMPAT_CFLAGS"; then
+ pkg_cv_COMPAT_CFLAGS="$COMPAT_CFLAGS"
@@ -34363,40 +34353,18 @@
+ pkg_failed=untried
+fi
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
--
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_F77
--
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_F77
--
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
--
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_F77
-
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
-
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_F77
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+if test $pkg_failed = yes; then
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
@@ -34412,22 +34380,23 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$COMPAT_PKG_ERRORS" >&5
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path=$lt_fix_srcfile_path
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_F77
+$COMPAT_PKG_ERRORS
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_F77
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_F77
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
+Alternatively, you may set the environment variables COMPAT_CFLAGS
+and COMPAT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
@@ -34435,17 +34404,39 @@
+$as_echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
+-
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+-
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct_F77
+-
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L_F77
+-
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
+-
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$hardcode_automatic_F77
+$COMPAT_PKG_ERRORS
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_F77
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_F77
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs_F77
+Alternatively, you may set the environment variables COMPAT_CFLAGS
+and COMPAT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
@@ -34458,73 +34449,53 @@
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
--# ### END LIBTOOL TAG CONFIG: $tagname
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+Alternatively, you may set the environment variables COMPAT_CFLAGS
+and COMPAT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
--__EOF__
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path=$lt_fix_srcfile_path
+Alternatively, you may set the environment variables COMPAT_CFLAGS
+and COMPAT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols_F77
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }; }
- else
-- # If there is no Makefile yet, we rely on a make rule to execute
-- # `config.status --recheck' to rerun these tests and create the
-- # libtool script then.
-- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-- if test -f "$ltmain_in"; then
-- test -f Makefile && make "$ltmain"
-- fi
++else
+ COMPAT_CFLAGS=$pkg_cv_COMPAT_CFLAGS
+ COMPAT_LIBS=$pkg_cv_COMPAT_LIBS
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
- fi
-
-
--ac_ext=c
--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
--
--CC="$lt_save_CC"
--
-- else
-- tagname=""
-- fi
-- ;;
--
-- GCJ)
-- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
--
--
--# Source file extension for Java test sources.
--ac_ext=java
--
--# Object file extension for compiled Java test sources.
--objext=o
--objext_GCJ=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}"
++fi
+
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_F77
+
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+-
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_F77
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for SM" >&5
+$as_echo_n "checking for SM... " >&6; }
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_F77
+if test -n "$PKG_CONFIG"; then
+ if test -n "$SM_CFLAGS"; then
+ pkg_cv_SM_CFLAGS="$SM_CFLAGS"
@@ -34562,22 +34533,24 @@
+ pkg_failed=untried
+fi
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
-
--# If no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+-# ### END LIBTOOL TAG CONFIG: $tagname
+
+-__EOF__
+
+if test $pkg_failed = yes; then
--# Allow CC to be a program name with arguments.
--compiler=$CC
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
-+else
+ else
+- # If there is no Makefile yet, we rely on a make rule to execute
+- # `config.status --recheck' to rerun these tests and create the
+- # libtool script then.
+- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+- if test -f "$ltmain_in"; then
+- test -f Makefile && make "$ltmain"
+- fi
+ _pkg_short_errors_supported=no
-+fi
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+ SM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sm"`
+ else
@@ -34588,27 +34561,156 @@
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (sm) were not met:
+-ac_ext=c
+-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
+-
+-CC="$lt_save_CC"
++$SM_PKG_ERRORS
+
+- else
+- tagname=""
+- fi
+- ;;
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- GCJ)
+- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++Alternatively, you may set the environment variables SM_CFLAGS
++and SM_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++$as_echo "$as_me: error: Package requirements (sm) were not met:
+
++$SM_PKG_ERRORS
+
+-# Source file extension for Java test sources.
+-ac_ext=java
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+-# Object file extension for compiled Java test sources.
+-objext=o
+-objext_GCJ=$objext
++Alternatively, you may set the environment variables SM_CFLAGS
++and SM_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++ { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}"
++Alternatively, you may set the environment variables SM_CFLAGS
++and SM_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
+
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++Alternatively, you may set the environment variables SM_CFLAGS
++and SM_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
+
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }; }
++else
++ SM_CFLAGS=$pkg_cv_SM_CFLAGS
++ SM_LIBS=$pkg_cv_SM_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
++fi
+
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for ICE" >&5
++$as_echo_n "checking for ICE... " >&6; }
+
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
++if test -n "$PKG_CONFIG"; then
++ if test -n "$ICE_CFLAGS"; then
++ pkg_cv_ICE_CFLAGS="$ICE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ice\"") >&5
++ ($PKG_CONFIG --exists --print-errors "ice") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_ICE_CFLAGS=`$PKG_CONFIG --cflags "ice" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$ICE_LIBS"; then
++ pkg_cv_ICE_LIBS="$ICE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ice\"") >&5
++ ($PKG_CONFIG --exists --print-errors "ice") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_ICE_LIBS=`$PKG_CONFIG --libs "ice" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
+
+
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-+$SM_PKG_ERRORS
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-+Alternatively, you may set the environment variables SM_CFLAGS
-+and SM_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+$as_echo "$as_me: error: Package requirements (sm) were not met:
++if test $pkg_failed = yes; then
+
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ ICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ice"`
++ else
++ ICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ice"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$ICE_PKG_ERRORS" >&5
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
@@ -34624,15 +34726,32 @@
- esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+$SM_PKG_ERRORS
-
++ { { $as_echo "$as_me:$LINENO: error: Package requirements (ice) were not met:
+
++$ICE_PKG_ERRORS
+
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-archive_cmds_need_lc_GCJ=no
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--archive_cmds_need_lc_GCJ=no
-+Alternatively, you may set the environment variables SM_CFLAGS
-+and SM_LIBS to avoid the need to call pkg-config.
+-old_archive_cmds_GCJ=$old_archive_cmds
++Alternatively, you may set the environment variables ICE_CFLAGS
++and ICE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++$as_echo "$as_me: error: Package requirements (ice) were not met:
+
++$ICE_PKG_ERRORS
+
+-lt_prog_compiler_no_builtin_flag_GCJ=
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+-if test "$GCC" = yes; then
+- lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
++Alternatively, you may set the environment variables ICE_CFLAGS
++and ICE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
@@ -34643,55 +34762,15 @@
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
--old_archive_cmds_GCJ=$old_archive_cmds
-+Alternatively, you may set the environment variables SM_CFLAGS
-+and SM_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables ICE_CFLAGS
++and ICE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
-
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
--lt_prog_compiler_no_builtin_flag_GCJ=
-+Alternatively, you may set the environment variables SM_CFLAGS
-+and SM_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
--if test "$GCC" = yes; then
-- lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }; }
-+else
-+ SM_CFLAGS=$pkg_cv_SM_CFLAGS
-+ SM_LIBS=$pkg_cv_SM_LIBS
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
-+fi
-
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for ICE" >&5
-+$as_echo_n "checking for ICE... " >&6; }
-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
- $as_echo_n "(cached) " >&6
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$ICE_CFLAGS"; then
-+ pkg_cv_ICE_CFLAGS="$ICE_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ice\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "ice") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_ICE_CFLAGS=`$PKG_CONFIG --cflags "ice" 2>/dev/null`
- else
+-else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -34720,50 +34799,45 @@
- fi
- fi
- $rm conftest*
--
-+ pkg_failed=yes
- fi
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
+-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
--
++Alternatively, you may set the environment variables ICE_CFLAGS
++and ICE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
+
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
- lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-+ fi
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }; }
else
- :
-+ pkg_failed=untried
- fi
--
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$ICE_LIBS"; then
-+ pkg_cv_ICE_LIBS="$ICE_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ice\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "ice") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_ICE_LIBS=`$PKG_CONFIG --libs "ice" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
+-fi
+-
++ ICE_CFLAGS=$pkg_cv_ICE_CFLAGS
++ ICE_LIBS=$pkg_cv_ICE_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
fi
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-
+-
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
+-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_static_GCJ='-static'
-+if test $pkg_failed = yes; then
- case $host_os in
- aix*)
@@ -34773,175 +34847,15 @@
- lt_prog_compiler_static_GCJ='-Bstatic'
- fi
- ;;
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ ICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ice"`
-+ else
-+ ICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ice"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$ICE_PKG_ERRORS" >&5
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for DBUS_GLIB" >&5
++$as_echo_n "checking for DBUS_GLIB... " >&6; }
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-- ;;
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (ice) were not met:
-
-- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-- # PIC is the default for these OSes.
-- ;;
-+$ICE_PKG_ERRORS
-
-- mingw* | cygwin* | pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- # Although the cygwin gcc ignores -fPIC, still need this for old-style
-- # (--disable-auto-import) libraries
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- ;;
-+Alternatively, you may set the environment variables ICE_CFLAGS
-+and ICE_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+$as_echo "$as_me: error: Package requirements (ice) were not met:
-
-- darwin* | rhapsody*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- lt_prog_compiler_pic_GCJ='-fno-common'
-- ;;
-+$ICE_PKG_ERRORS
-
-- interix[3-9]*)
-- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-- # Instead, we relocate shared libraries at runtime.
-- ;;
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-
-- msdosdjgpp*)
-- # Just because we use GCC doesn't mean we suddenly get shared libraries
-- # on systems that don't support them.
-- lt_prog_compiler_can_build_shared_GCJ=no
-- enable_shared=no
-- ;;
-+Alternatively, you may set the environment variables ICE_CFLAGS
-+and ICE_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
-- sysv4*MP*)
-- if test -d /usr/nec; then
-- lt_prog_compiler_pic_GCJ=-Kconform_pic
-- fi
-- ;;
-+Alternatively, you may set the environment variables ICE_CFLAGS
-+and ICE_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
-- hpux*)
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-- case $host_cpu in
-- hppa*64*|ia64*)
-- # +Z the default
-- ;;
-- *)
-- lt_prog_compiler_pic_GCJ='-fPIC'
-- ;;
-- esac
-- ;;
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
-- *)
-- lt_prog_compiler_pic_GCJ='-fPIC'
-- ;;
-- esac
-- else
-- # PORTME Check for flag to pass linker flags through the system compiler.
-- case $host_os in
-- aix*)
-- lt_prog_compiler_wl_GCJ='-Wl,'
-- if test "$host_cpu" = ia64; then
-- # AIX 5 now supports IA64 processor
-- lt_prog_compiler_static_GCJ='-Bstatic'
-- else
-- lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-- fi
-- ;;
-- darwin*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- case $cc_basename in
-- xlc*)
-- lt_prog_compiler_pic_GCJ='-qnocommon'
-- lt_prog_compiler_wl_GCJ='-Wl,'
-- ;;
-- esac
-- ;;
-+Alternatively, you may set the environment variables ICE_CFLAGS
-+and ICE_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
-- mingw* | cygwin* | pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }; }
-+else
-+ ICE_CFLAGS=$pkg_cv_ICE_CFLAGS
-+ ICE_LIBS=$pkg_cv_ICE_LIBS
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
-+fi
-
-- ;;
-
-- hpux9* | hpux10* | hpux11*)
-- lt_prog_compiler_wl_GCJ='-Wl,'
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-- case $host_cpu in
-- hppa*64*|ia64*)
-- # +Z the default
-- ;;
-- *)
-- lt_prog_compiler_pic_GCJ='+Z'
-- ;;
-- esac
-- # Is there a better lt_prog_compiler_static that works with the bundled CC?
-- lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-- ;;
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for DBUS_GLIB" >&5
-+$as_echo_n "checking for DBUS_GLIB... " >&6; }
-
-- irix5* | irix6* | nonstopux*)
-- lt_prog_compiler_wl_GCJ='-Wl,'
-- # PIC (with -KPIC) is the default.
-- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
+if test -n "$PKG_CONFIG"; then
+ if test -n "$DBUS_GLIB_CFLAGS"; then
@@ -34980,10 +34894,161 @@
+ pkg_failed=untried
+fi
+- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+- # PIC is the default for these OSes.
+- ;;
+
+- mingw* | cygwin* | pw32* | os2*)
+- # This hack is so that the source file can tell whether it is being
+- # built for inclusion in a dll (and should export symbols for example).
+- # Although the cygwin gcc ignores -fPIC, still need this for old-style
+- # (--disable-auto-import) libraries
+
+- ;;
++if test $pkg_failed = yes; then
+
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- lt_prog_compiler_pic_GCJ='-fno-common'
+- ;;
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ else
++ DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$DBUS_GLIB_PKG_ERRORS" >&5
+
+- interix[3-9]*)
+- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+- # Instead, we relocate shared libraries at runtime.
+- ;;
++ { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+
+- msdosdjgpp*)
+- # Just because we use GCC doesn't mean we suddenly get shared libraries
+- # on systems that don't support them.
+- lt_prog_compiler_can_build_shared_GCJ=no
+- enable_shared=no
+- ;;
++$DBUS_GLIB_PKG_ERRORS
+
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- lt_prog_compiler_pic_GCJ=-Kconform_pic
+- fi
+- ;;
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- hpux*)
+- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+- # not for PA HP-UX.
+- case $host_cpu in
+- hppa*64*|ia64*)
+- # +Z the default
+- ;;
+- *)
+- lt_prog_compiler_pic_GCJ='-fPIC'
+- ;;
+- esac
+- ;;
++Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
++and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
+
+- *)
+- lt_prog_compiler_pic_GCJ='-fPIC'
+- ;;
+- esac
+- else
+- # PORTME Check for flag to pass linker flags through the system compiler.
+- case $host_os in
+- aix*)
+- lt_prog_compiler_wl_GCJ='-Wl,'
+- if test "$host_cpu" = ia64; then
+- # AIX 5 now supports IA64 processor
+- lt_prog_compiler_static_GCJ='-Bstatic'
+- else
+- lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+- fi
+- ;;
+- darwin*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- case $cc_basename in
+- xlc*)
+- lt_prog_compiler_pic_GCJ='-qnocommon'
+- lt_prog_compiler_wl_GCJ='-Wl,'
+- ;;
+- esac
+- ;;
++$DBUS_GLIB_PKG_ERRORS
+
+- mingw* | cygwin* | pw32* | os2*)
+- # This hack is so that the source file can tell whether it is being
+- # built for inclusion in a dll (and should export symbols for example).
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- ;;
++Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
++and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++ { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
+- hpux9* | hpux10* | hpux11*)
+- lt_prog_compiler_wl_GCJ='-Wl,'
+- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+- # not for PA HP-UX.
+- case $host_cpu in
+- hppa*64*|ia64*)
+- # +Z the default
+- ;;
+- *)
+- lt_prog_compiler_pic_GCJ='+Z'
+- ;;
+- esac
+- # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
+- ;;
++Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
++and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
+
+- irix5* | irix6* | nonstopux*)
+- lt_prog_compiler_wl_GCJ='-Wl,'
+- # PIC (with -KPIC) is the default.
+- lt_prog_compiler_static_GCJ='-non_shared'
+- ;;
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
- newsos6)
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
++Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
++and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
- linux* | k*bsd*-gnu)
- case $cc_basename in
@@ -35022,29 +35087,65 @@
- ;;
- esac
- ;;
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }; }
++else
++ DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS
++ DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
++fi
- osf3* | osf4* | osf5*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- # All OSF/1 code is PIC.
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-+if test $pkg_failed = yes; then
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for GCONF" >&5
++$as_echo_n "checking for GCONF... " >&6; }
- rdos*)
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GCONF_CFLAGS"; then
++ pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
+else
-+ _pkg_short_errors_supported=no
++ pkg_failed=yes
+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
-+ else
-+ DBUS_GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_GLIB_REQUIRED"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$DBUS_GLIB_PKG_ERRORS" >&5
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$GCONF_LIBS"; then
++ pkg_cv_GCONF_LIBS="$GCONF_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
- solaris*)
- lt_prog_compiler_pic_GCJ='-KPIC'
@@ -35056,22 +35157,19 @@
- lt_prog_compiler_wl_GCJ='-Wl,';;
- esac
- ;;
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
- sunos4*)
- lt_prog_compiler_wl_GCJ='-Qoption ld '
- lt_prog_compiler_pic_GCJ='-PIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-+$DBUS_GLIB_PKG_ERRORS
- sysv4 | sysv4.2uw2* | sysv4.3*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++if test $pkg_failed = yes; then
- sysv4*MP*)
- if test -d /usr/nec ;then
@@ -35079,75 +35177,66 @@
- lt_prog_compiler_static_GCJ='-Bstatic'
- fi
- ;;
-+Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
-+and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+$as_echo "$as_me: error: Package requirements (dbus-glib-1 >= $DBUS_GLIB_REQUIRED) were not met:
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0"`
++ else
++ GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GCONF_PKG_ERRORS" >&5
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-+$DBUS_GLIB_PKG_ERRORS
++ { { $as_echo "$as_me:$LINENO: error: Package requirements (gconf-2.0) were not met:
- unicos*)
- lt_prog_compiler_wl_GCJ='-Wl,'
- lt_prog_compiler_can_build_shared_GCJ=no
- ;;
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++$GCONF_PKG_ERRORS
- uts4*)
- lt_prog_compiler_pic_GCJ='-pic'
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-+Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
-+and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
- *)
- lt_prog_compiler_can_build_shared_GCJ=no
- ;;
- esac
- fi
-+Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
-+and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables GCONF_CFLAGS
++and GCONF_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
++" >&5
++$as_echo "$as_me: error: Package requirements (gconf-2.0) were not met:
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
++$GCONF_PKG_ERRORS
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-+Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
-+and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
- $as_echo_n "(cached) " >&6
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }; }
- else
+-else
- lt_cv_prog_compiler_pic_works_GCJ=no
- ac_outfile=conftest.$ac_objext
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -35176,43 +35265,54 @@
- fi
- fi
- $rm conftest*
--
-+ DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS
-+ DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
- fi
++Alternatively, you may set the environment variables GCONF_CFLAGS
++and GCONF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++ { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
+-fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
++Alternatively, you may set the environment variables GCONF_CFLAGS
++and GCONF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
-if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
- case $lt_prog_compiler_pic_GCJ in
- "" | " "*) ;;
- *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
- esac
--else
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GCONF_CFLAGS
++and GCONF_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }; }
+ else
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_can_build_shared_GCJ=no
++ GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
++ GCONF_LIBS=$pkg_cv_GCONF_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
+ fi
+
-fi
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for GCONF" >&5
-+$as_echo_n "checking for GCONF... " >&6; }
-
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GCONF_CFLAGS"; then
-+ pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
- fi
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
@@ -35222,7 +35322,7 @@
- lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
- ;;
-esac
--
+
-#
-# Check to make sure the static flag actually works.
-#
@@ -35231,8 +35331,7 @@
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ fi
- else
+-else
- lt_cv_prog_compiler_static_works_GCJ=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -35254,28 +35353,33 @@
- fi
- $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
--
-+ pkg_failed=untried
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for EGG_SMCLIENT" >&5
++$as_echo_n "checking for EGG_SMCLIENT... " >&6; }
+
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EGG_SMCLIENT_CFLAGS"; then
++ pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_EGG_SMCLIENT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
++else
++ pkg_failed=yes
fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
- :
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$GCONF_LIBS"; then
-+ pkg_cv_GCONF_LIBS="$GCONF_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
++ fi
else
- lt_prog_compiler_static_GCJ=
-+ pkg_failed=yes
++ pkg_failed=untried
fi
-
-
@@ -35283,7 +35387,17 @@
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$EGG_SMCLIENT_LIBS"; then
++ pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_EGG_SMCLIENT_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
else
- lt_cv_prog_compiler_c_o_GCJ=no
- $rm -r conftest 2>/dev/null
@@ -35291,9 +35405,7 @@
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ pkg_failed=untried
-+fi
-
+-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
@@ -35327,13 +35439,13 @@
- cd ..
- rmdir conftest
- $rm conftest*
-
--fi
+-
++ pkg_failed=yes
+ fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-
-+if test $pkg_failed = yes; then
-
+-
+-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
- # do not overwrite the value of need_locks provided by the user
@@ -35352,23 +35464,15 @@
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
- need_locks=warn
- fi
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
++ fi
else
- need_locks=no
-+ _pkg_short_errors_supported=no
++ pkg_failed=untried
fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0"`
-+ else
-+ GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GCONF_PKG_ERRORS" >&5
-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
--
+
- runpath_var=
- allow_undefined_flag_GCJ=
- enable_shared_with_static_runtimes_GCJ=no
@@ -35416,7 +35520,7 @@
- esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--
+
- case $host_os in
- cygwin* | mingw* | pw32*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -35434,12 +35538,24 @@
- with_gnu_ld=no
- ;;
- esac
--
++if test $pkg_failed = yes; then
+
- ld_shlibs_GCJ=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gconf-2.0) were not met:
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"`
++ else
++ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$EGG_SMCLIENT_PKG_ERRORS" >&5
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
@@ -35461,7 +35577,7 @@
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
-+$GCONF_PKG_ERRORS
++ { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0) were not met:
- # See if GNU ld supports shared libraries.
- case $host_os in
@@ -35470,24 +35586,24 @@
- if test "$host_cpu" != ia64; then
- ld_shlibs_GCJ=no
- cat <<EOF 1>&2
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++$EGG_SMCLIENT_PKG_ERRORS
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-+Alternatively, you may set the environment variables GCONF_CFLAGS
-+and GCONF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+$as_echo "$as_me: error: Package requirements (gconf-2.0) were not met:
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
-EOF
- fi
- ;;
-+$GCONF_PKG_ERRORS
++Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
++and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++$as_echo "$as_me: error: Package requirements (gtk+-2.0) were not met:
- amigaos*)
- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
@@ -35502,8 +35618,7 @@
- # them.
- ld_shlibs_GCJ=no
- ;;
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++$EGG_SMCLIENT_PKG_ERRORS
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -35515,8 +35630,19 @@
- ld_shlibs_GCJ=no
- fi
- ;;
-+Alternatively, you may set the environment variables GCONF_CFLAGS
-+and GCONF_LIBS to avoid the need to call pkg-config.
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- cygwin* | mingw* | pw32*)
+- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
+- # as there is no search path for DLLs.
+- hardcode_libdir_flag_spec_GCJ='-L$libdir'
+- allow_undefined_flag_GCJ=unsupported
+- always_export_symbols_GCJ=no
+- enable_shared_with_static_runtimes_GCJ=yes
+- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
++Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
++and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
@@ -35526,18 +35652,6 @@
+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
-
-- cygwin* | mingw* | pw32*)
-- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-- # as there is no search path for DLLs.
-- hardcode_libdir_flag_spec_GCJ='-L$libdir'
-- allow_undefined_flag_GCJ=unsupported
-- always_export_symbols_GCJ=no
-- enable_shared_with_static_runtimes_GCJ=yes
-- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-+Alternatively, you may set the environment variables GCONF_CFLAGS
-+and GCONF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -35554,11 +35668,9 @@
- ld_shlibs_GCJ=no
- fi
- ;;
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
++Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
++and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
- interix[3-9]*)
- hardcode_direct_GCJ=no
@@ -35574,9 +35686,11 @@
- archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- archive_expsym_cmds_GCJ='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'
- ;;
-+Alternatively, you may set the environment variables GCONF_CFLAGS
-+and GCONF_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
- gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -35606,16 +35720,9 @@
- tmp_sharedflag='-shared' ;;
- esac
- archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }; }
-+else
-+ GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
-+ GCONF_LIBS=$pkg_cv_GCONF_LIBS
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
-+fi
++Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
++and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
@@ -35627,6 +35734,16 @@
- ld_shlibs_GCJ=no
- fi
- ;;
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }; }
++else
++ EGG_SMCLIENT_CFLAGS=$pkg_cv_EGG_SMCLIENT_CFLAGS
++ EGG_SMCLIENT_LIBS=$pkg_cv_EGG_SMCLIENT_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ :
++fi
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -35637,25 +35754,49 @@
- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for EGG_SMCLIENT" >&5
-+$as_echo_n "checking for EGG_SMCLIENT... " >&6; }
++have_polkit=no
++# Check whether --enable-polkit was given.
++if test "${enable_polkit+set}" = set; then
++ enableval=$enable_polkit; enable_polkit=$enableval
++else
++ enable_polkit=auto
++fi
- solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- ld_shlibs_GCJ=no
- cat <<EOF 1>&2
++if test "x$enable_polkit" != "xno"; then
+
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems. Therefore, libtool
+-*** is disabling shared libraries support. We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer. Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++pkg_failed=no
++{ $as_echo "$as_me:$LINENO: checking for POLKIT_GNOME" >&5
++$as_echo_n "checking for POLKIT_GNOME... " >&6; }
+
+-EOF
+- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+- else
+- ld_shlibs_GCJ=no
+- fi
+- ;;
+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EGG_SMCLIENT_CFLAGS"; then
-+ pkg_cv_EGG_SMCLIENT_CFLAGS="$EGG_SMCLIENT_CFLAGS"
++ if test -n "$POLKIT_GNOME_CFLAGS"; then
++ pkg_cv_POLKIT_GNOME_CFLAGS="$POLKIT_GNOME_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gnome >= \$POLKIT_GNOME_REQUIRED\"") >&5
++ ($PKG_CONFIG --exists --print-errors "polkit-gnome >= $POLKIT_GNOME_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
-+ pkg_cv_EGG_SMCLIENT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
++ pkg_cv_POLKIT_GNOME_CFLAGS=`$PKG_CONFIG --cflags "polkit-gnome >= $POLKIT_GNOME_REQUIRED" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
@@ -35664,16 +35805,16 @@
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
-+ if test -n "$EGG_SMCLIENT_LIBS"; then
-+ pkg_cv_EGG_SMCLIENT_LIBS="$EGG_SMCLIENT_LIBS"
++ if test -n "$POLKIT_GNOME_LIBS"; then
++ pkg_cv_POLKIT_GNOME_LIBS="$POLKIT_GNOME_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gnome >= \$POLKIT_GNOME_REQUIRED\"") >&5
++ ($PKG_CONFIG --exists --print-errors "polkit-gnome >= $POLKIT_GNOME_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
-+ pkg_cv_EGG_SMCLIENT_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
++ pkg_cv_POLKIT_GNOME_LIBS=`$PKG_CONFIG --libs "polkit-gnome >= $POLKIT_GNOME_REQUIRED" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
@@ -35682,28 +35823,11 @@
+ pkg_failed=untried
+fi
--*** Warning: The releases 2.8.* of the GNU linker cannot reliably
--*** create shared libraries on Solaris systems. Therefore, libtool
--*** is disabling shared libraries support. We urge you to upgrade GNU
--*** binutils to release 2.9.1 or newer. Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
-
--EOF
-- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-- else
-- ld_shlibs_GCJ=no
-- fi
-- ;;
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
- ld_shlibs_GCJ=no
- cat <<_LT_EOF 1>&2
-+if test $pkg_failed = yes; then
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
@@ -35711,18 +35835,6 @@
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"`
-+ else
-+ EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$EGG_SMCLIENT_PKG_ERRORS" >&5
-_LT_EOF
- ;;
@@ -35737,7 +35849,7 @@
- ;;
- esac
- ;;
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0) were not met:
++if test $pkg_failed = yes; then
- sunos4*)
- archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -35745,7 +35857,18 @@
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- ;;
-+$EGG_SMCLIENT_PKG_ERRORS
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ POLKIT_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "polkit-gnome >= $POLKIT_GNOME_REQUIRED"`
++ else
++ POLKIT_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "polkit-gnome >= $POLKIT_GNOME_REQUIRED"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$POLKIT_GNOME_PKG_ERRORS" >&5
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -35756,8 +35879,24 @@
- fi
- ;;
- esac
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++ have_polkit=no
++elif test $pkg_failed = untried; then
++ have_polkit=no
++else
++ POLKIT_GNOME_CFLAGS=$pkg_cv_POLKIT_GNOME_CFLAGS
++ POLKIT_GNOME_LIBS=$pkg_cv_POLKIT_GNOME_LIBS
++ { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++ have_polkit=yes
++fi
++ if test "x$enable_polkit" = "xyes" -a "x$have_polkit" = "xno"; then
++ { { $as_echo "$as_me:$LINENO: error: PolicyKit support explicitly requested but dependencies not found" >&5
++$as_echo "$as_me: error: PolicyKit support explicitly requested but dependencies not found" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++fi
- if test "$ld_shlibs_GCJ" = no; then
- runpath_var=
@@ -35781,11 +35920,7 @@
- hardcode_direct_GCJ=unsupported
- fi
- ;;
-+Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
-+and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+$as_echo "$as_me: error: Package requirements (gtk+-2.0) were not met:
++if test "x$have_polkit" = "xyes"; then
- aix[4-9]*)
- if test "$host_cpu" = ia64; then
@@ -35803,7 +35938,9 @@
- export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- fi
- aix_use_runtimelinking=no
-+$EGG_SMCLIENT_PKG_ERRORS
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_POLKIT_GNOME 1
++_ACEOF
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -35817,43 +35954,49 @@
- done
- ;;
- esac
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++fi
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-+Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
-+and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
++# Extract the first word of "gconftool-2", so it can be a program name with args.
++set dummy gconftool-2; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_GCONFTOOL+set}" = set; then
++ $as_echo_n "(cached) " >&6
++else
++ case $GCONFTOOL in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
-+and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
+-
- archive_cmds_GCJ=''
- hardcode_direct_GCJ=yes
- hardcode_libdir_separator_GCJ=':'
- link_all_deplibs_GCJ=yes
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-
+-
- if test "$GCC" = yes; then
- case $host_os in aix4.[012]|aix4.[012].*)
- # We only want to do this on AIX 4.2 and lower, the check
@@ -35894,10 +36037,7 @@
- fi
- fi
- fi
-+Alternatively, you may set the environment variables EGG_SMCLIENT_CFLAGS
-+and EGG_SMCLIENT_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-
+-
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- always_export_symbols_GCJ=yes
@@ -35912,28 +36052,11 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }; }
-+else
-+ EGG_SMCLIENT_CFLAGS=$pkg_cv_EGG_SMCLIENT_CFLAGS
-+ EGG_SMCLIENT_LIBS=$pkg_cv_EGG_SMCLIENT_LIBS
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
-+fi
-
+-
-int
-main ()
-{
-+have_polkit=no
-+# Check whether --enable-polkit was given.
-+if test "${enable_polkit+set}" = set; then
-+ enableval=$enable_polkit; enable_polkit=$enableval
-+else
-+ enable_polkit=auto
-+fi
-
+-
- ;
- return 0;
-}
@@ -35943,28 +36066,17 @@
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
--esac
++ test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
++ ;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
-+if test "x$enable_polkit" != "xno"; then
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for POLKIT_GNOME" >&5
-+$as_echo_n "checking for POLKIT_GNOME... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$POLKIT_GNOME_CFLAGS"; then
-+ pkg_cv_POLKIT_GNOME_CFLAGS="$POLKIT_GNOME_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gnome >= \$POLKIT_GNOME_REQUIRED\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "polkit-gnome >= $POLKIT_GNOME_REQUIRED") 2>&5
- ac_status=$?
+- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
@@ -35984,76 +36096,30 @@
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+ (exit $ac_status); }; then
-+ pkg_cv_POLKIT_GNOME_CFLAGS=`$PKG_CONFIG --cflags "polkit-gnome >= $POLKIT_GNOME_REQUIRED" 2>/dev/null`
-+else
-+ pkg_failed=yes
fi
-+ fi
++GCONFTOOL=$ac_cv_path_GCONFTOOL
++if test -n "$GCONFTOOL"; then
++ { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
++$as_echo "$GCONFTOOL" >&6; }
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ pkg_failed=untried
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$POLKIT_GNOME_LIBS"; then
-+ pkg_cv_POLKIT_GNOME_LIBS="$POLKIT_GNOME_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gnome >= \$POLKIT_GNOME_REQUIRED\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "polkit-gnome >= $POLKIT_GNOME_REQUIRED") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_POLKIT_GNOME_LIBS=`$PKG_CONFIG --libs "polkit-gnome >= $POLKIT_GNOME_REQUIRED" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-
-
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
+
+
++if test x"$GCONFTOOL" = xno; then
++ { { $as_echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
++$as_echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
++ { (exit 1); exit 1; }; }
fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ POLKIT_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "polkit-gnome >= $POLKIT_GNOME_REQUIRED"`
-+ else
-+ POLKIT_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "polkit-gnome >= $POLKIT_GNOME_REQUIRED"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$POLKIT_GNOME_PKG_ERRORS" >&5
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+ have_polkit=no
-+elif test $pkg_failed = untried; then
-+ have_polkit=no
-+else
-+ POLKIT_GNOME_CFLAGS=$pkg_cv_POLKIT_GNOME_CFLAGS
-+ POLKIT_GNOME_LIBS=$pkg_cv_POLKIT_GNOME_LIBS
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ have_polkit=yes
-+fi
-+ if test "x$enable_polkit" = "xyes" -a "x$have_polkit" = "xno"; then
-+ { { $as_echo "$as_me:$LINENO: error: PolicyKit support explicitly requested but dependencies not found" >&5
-+$as_echo "$as_me: error: PolicyKit support explicitly requested but dependencies not found" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+fi
-
+-
- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
- archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
@@ -36065,11 +36131,7 @@
- # Determine the default libpath from the value encoded in an empty executable.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-+if test "x$have_polkit" = "xyes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_POLKIT_GNOME 1
- _ACEOF
+-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -36077,7 +36139,11 @@
-int
-main ()
-{
-+fi
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
- ;
- return 0;
@@ -36104,32 +36170,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+# Extract the first word of "gconftool-2", so it can be a program name with args.
-+set dummy gconftool-2; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_GCONFTOOL+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $GCONFTOOL in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
@@ -36142,32 +36182,23 @@
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+ test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
-+ ;;
-+esac
++# Check whether --with-gconf-source was given.
++if test "${with_gconf_source+set}" = set; then
++ withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
fi
-+GCONFTOOL=$ac_cv_path_GCONFTOOL
-+if test -n "$GCONFTOOL"; then
-+ { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
-+$as_echo "$GCONFTOOL" >&6; }
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-
-
-+if test x"$GCONFTOOL" = xno; then
-+ { { $as_echo "$as_me:$LINENO: error: gconftool-2 executable not found in your path - should be installed with GConf" >&5
-+$as_echo "$as_me: error: gconftool-2 executable not found in your path - should be installed with GConf" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
+
+
+-fi
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++ { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
++$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
@@ -36182,10 +36213,8 @@
- fi
- fi
- ;;
-+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+ else
-+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+ fi
- amigaos*)
@@ -36199,9 +36228,9 @@
- bsdi[45]*)
- export_dynamic_flag_spec_GCJ=-rdynamic
- ;;
-+# Check whether --with-gconf-source was given.
-+if test "${with_gconf_source+set}" = set; then
-+ withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
++# Check whether --with-gconf-schema-file-dir was given.
++if test "${with_gconf_schema_file_dir+set}" = set; then
++ withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
+fi
- cygwin* | mingw* | pw32*)
@@ -36279,15 +36308,21 @@
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
- hardcode_shlibpath_var_GCJ=no
- ;;
-+ { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-+$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
++ { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
++$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
- freebsd1*)
- ld_shlibs_GCJ=no
- ;;
-+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+ fi
++ # Check whether --enable-schemas-install was given.
++if test "${enable_schemas_install+set}" = set; then
++ enableval=$enable_schemas_install; case ${enableval} in
++ yes|no) ;;
++ *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
++$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
++ { (exit 1); exit 1; }; } ;;
++ esac
++fi
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
@@ -36299,6 +36334,13 @@
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- ;;
++ if test "$enable_schemas_install" != no; then
++ GCONF_SCHEMAS_INSTALL_TRUE=
++ GCONF_SCHEMAS_INSTALL_FALSE='#'
++else
++ GCONF_SCHEMAS_INSTALL_TRUE='#'
++ GCONF_SCHEMAS_INSTALL_FALSE=
++fi
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
@@ -36307,10 +36349,6 @@
- hardcode_minus_L_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- ;;
-+# Check whether --with-gconf-schema-file-dir was given.
-+if test "${with_gconf_schema_file_dir+set}" = set; then
-+ withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-+fi
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
@@ -36329,15 +36367,18 @@
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
- hardcode_direct_GCJ=yes
++GCONF_SERVERDIR=`$PKG_CONFIG --variable=gconf_serverdir gconf-2.0`
++old_path=$PATH
++if test x"$GCONF_SERVERDIR" != x; then
++ PATH=$GCONF_SERVERDIR:$PATH
++fi
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
- export_dynamic_flag_spec_GCJ='${wl}-E'
- ;;
-+ { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-+$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
-
+-
- hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -36347,31 +36388,53 @@
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
-+ # Check whether --enable-schemas-install was given.
-+if test "${enable_schemas_install+set}" = set; then
-+ enableval=$enable_schemas_install; case ${enableval} in
-+ yes|no) ;;
-+ *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
-+$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
-+ { (exit 1); exit 1; }; } ;;
-+ esac
-+fi
-
+-
- hardcode_direct_GCJ=yes
- export_dynamic_flag_spec_GCJ='${wl}-E'
-+ if test "$enable_schemas_install" != no; then
-+ GCONF_SCHEMAS_INSTALL_TRUE=
-+ GCONF_SCHEMAS_INSTALL_FALSE='#'
++# Extract the first word of "gconf-sanity-check-2", so it can be a program name with args.
++set dummy gconf-sanity-check-2; ac_word=$2
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_GCONF_SANITY_CHECK+set}" = set; then
++ $as_echo_n "(cached) " >&6
+else
-+ GCONF_SCHEMAS_INSTALL_TRUE='#'
-+ GCONF_SCHEMAS_INSTALL_FALSE=
-+fi
++ case $GCONF_SANITY_CHECK in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GCONF_SANITY_CHECK="$GCONF_SANITY_CHECK" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GCONF_SANITY_CHECK="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
- fi
- ;;
++ test -z "$ac_cv_path_GCONF_SANITY_CHECK" && ac_cv_path_GCONF_SANITY_CHECK="no"
++ ;;
++esac
++fi
++GCONF_SANITY_CHECK=$ac_cv_path_GCONF_SANITY_CHECK
++if test -n "$GCONF_SANITY_CHECK"; then
++ { $as_echo "$as_me:$LINENO: result: $GCONF_SANITY_CHECK" >&5
++$as_echo "$GCONF_SANITY_CHECK" >&6; }
++else
++ { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++fi
- hpux11*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -36402,7 +36465,7 @@
- if test "$with_gnu_ld" = no; then
- hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
--
+
- case $host_cpu in
- hppa*64*|ia64*)
- hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
@@ -36412,7 +36475,12 @@
- *)
- hardcode_direct_GCJ=yes
- export_dynamic_flag_spec_GCJ='${wl}-E'
--
++if test x"$GCONF_SANITY_CHECK" = xno; then
++ { { $as_echo "$as_me:$LINENO: error: gconf-sanity-check-2 executable not found in your path - should be installed with GConf" >&5
++$as_echo "$as_me: error: gconf-sanity-check-2 executable not found in your path - should be installed with GConf" >&2;}
++ { (exit 1); exit 1; }; }
++fi
+
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- hardcode_minus_L_GCJ=yes
@@ -36420,7 +36488,7 @@
- esac
- fi
- ;;
--
+
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -36432,7 +36500,8 @@
- hardcode_libdir_separator_GCJ=:
- link_all_deplibs_GCJ=yes
- ;;
--
++PATH=$old_path
+
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -36451,11 +36520,10 @@
- hardcode_libdir_separator_GCJ=:
- hardcode_shlibpath_var_GCJ=no
- ;;
-+GCONF_SERVERDIR=`$PKG_CONFIG --variable=gconf_serverdir gconf-2.0`
-+old_path=$PATH
-+if test x"$GCONF_SERVERDIR" != x; then
-+ PATH=$GCONF_SERVERDIR:$PATH
-+fi
++# If Pango included the shared library dependencies from X11 in
++# the pkg-config output, then we use that (to avoid duplicates).
++# but if they were omitted to avoid binary compatibility problems
++# then we need to repeat the checks.
- openbsd*)
- if test -f /usr/libexec/ld.so; then
@@ -36482,32 +36550,11 @@
- ld_shlibs_GCJ=no
- fi
- ;;
-+# Extract the first word of "gconf-sanity-check-2", so it can be a program name with args.
-+set dummy gconf-sanity-check-2; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_GCONF_SANITY_CHECK+set}" = set; then
-+ $as_echo_n "(cached) " >&6
++if $PKG_CONFIG --exists pangoxft ; then
++ PANGO_PACKAGES="pangox pangoxft"
+else
-+ case $GCONF_SANITY_CHECK in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_GCONF_SANITY_CHECK="$GCONF_SANITY_CHECK" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_GCONF_SANITY_CHECK="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
++ PANGO_PACKAGES="pangox"
++fi
- os2*)
- hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -36516,18 +36563,11 @@
- archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-+ test -z "$ac_cv_path_GCONF_SANITY_CHECK" && ac_cv_path_GCONF_SANITY_CHECK="no"
-+ ;;
++x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
++case x_libs in
++ *-lX11*) pango_omitted_x_deps=no ;;
++ *) pango_omitted_x_deps=yes ;;
+esac
-+fi
-+GCONF_SANITY_CHECK=$ac_cv_path_GCONF_SANITY_CHECK
-+if test -n "$GCONF_SANITY_CHECK"; then
-+ { $as_echo "$as_me:$LINENO: result: $GCONF_SANITY_CHECK" >&5
-+$as_echo "$GCONF_SANITY_CHECK" >&6; }
-+else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- osf3*)
- if test "$GCC" = yes; then
@@ -36540,6 +36580,9 @@
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_GCJ=:
- ;;
++if test $pango_omitted_x_deps = yes ; then
++ { $as_echo "$as_me:$LINENO: checking for X" >&5
++$as_echo_n "checking for X... " >&6; }
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
@@ -36551,17 +36594,16 @@
- archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-+if test x"$GCONF_SANITY_CHECK" = xno; then
-+ { { $as_echo "$as_me:$LINENO: error: gconf-sanity-check-2 executable not found in your path - should be installed with GConf" >&5
-+$as_echo "$as_me: error: gconf-sanity-check-2 executable not found in your path - should be installed with GConf" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- # Both c and cxx compiler support -rpath directly
- hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
- fi
- hardcode_libdir_separator_GCJ=:
- ;;
++# Check whether --with-x was given.
++if test "${with_x+set}" = set; then
++ withval=$with_x;
++fi
- solaris*)
- no_undefined_flag_GCJ=' -z text'
@@ -36575,138 +36617,6 @@
- archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-- fi
-- hardcode_libdir_flag_spec_GCJ='-R$libdir'
-- hardcode_shlibpath_var_GCJ=no
-- case $host_os in
-- solaris2.[0-5] | solaris2.[0-5].*) ;;
-- *)
-- # The compiler driver will combine and reorder linker options,
-- # but understands `-z linker_flag'. GCC discards it without `$wl',
-- # but is careful enough not to reorder.
-- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- if test "$GCC" = yes; then
-- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-- else
-- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
-- fi
-- ;;
-- esac
-- link_all_deplibs_GCJ=yes
-- ;;
-+PATH=$old_path
-
-- sunos4*)
-- if test "x$host_vendor" = xsequent; then
-- # Use $CC to link under sequent, because it throws in some extra .o
-- # files that make .init and .fini sections work.
-- archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-- else
-- archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-- fi
-- hardcode_libdir_flag_spec_GCJ='-L$libdir'
-- hardcode_direct_GCJ=yes
-- hardcode_minus_L_GCJ=yes
-- hardcode_shlibpath_var_GCJ=no
-- ;;
-
-- sysv4)
-- case $host_vendor in
-- sni)
-- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct_GCJ=yes # is this really true???
-- ;;
-- siemens)
-- ## LD is ld it makes a PLAMLIB
-- ## CC just makes a GrossModule.
-- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-- reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-- hardcode_direct_GCJ=no
-- ;;
-- motorola)
-- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-- ;;
-- esac
-- runpath_var='LD_RUN_PATH'
-- hardcode_shlibpath_var_GCJ=no
-- ;;
-+# If Pango included the shared library dependencies from X11 in
-+# the pkg-config output, then we use that (to avoid duplicates).
-+# but if they were omitted to avoid binary compatibility problems
-+# then we need to repeat the checks.
-
-- sysv4.3*)
-- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_shlibpath_var_GCJ=no
-- export_dynamic_flag_spec_GCJ='-Bexport'
-- ;;
-+if $PKG_CONFIG --exists pangoxft ; then
-+ PANGO_PACKAGES="pangox pangoxft"
-+else
-+ PANGO_PACKAGES="pangox"
-+fi
-
-- sysv4*MP*)
-- if test -d /usr/nec; then
-- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_shlibpath_var_GCJ=no
-- runpath_var=LD_RUN_PATH
-- hardcode_runpath_var=yes
-- ld_shlibs_GCJ=yes
-- fi
-- ;;
-+x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
-+case x_libs in
-+ *-lX11*) pango_omitted_x_deps=no ;;
-+ *) pango_omitted_x_deps=yes ;;
-+esac
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-- no_undefined_flag_GCJ='${wl}-z,text'
-- archive_cmds_need_lc_GCJ=no
-- hardcode_shlibpath_var_GCJ=no
-- runpath_var='LD_RUN_PATH'
-+if test $pango_omitted_x_deps = yes ; then
-+ { $as_echo "$as_me:$LINENO: checking for X" >&5
-+$as_echo_n "checking for X... " >&6; }
-
-- if test "$GCC" = yes; then
-- archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-- else
-- archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-- fi
-- ;;
-
-- sysv5* | sco3.2v5* | sco5v6*)
-- # Note: We can NOT use -z defs as we might desire, because we do not
-- # link with -lc, and that would cause any symbols used from libc to
-- # always be unresolved, which means just about no library would
-- # ever link correctly. If we're not using GNU ld we use -z text
-- # though, which does catch some bad symbols but isn't as heavy-handed
-- # as -z defs.
-- no_undefined_flag_GCJ='${wl}-z,text'
-- allow_undefined_flag_GCJ='${wl}-z,nodefs'
-- archive_cmds_need_lc_GCJ=no
-- hardcode_shlibpath_var_GCJ=no
-- hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-- hardcode_libdir_separator_GCJ=':'
-- link_all_deplibs_GCJ=yes
-- export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-- runpath_var='LD_RUN_PATH'
-+# Check whether --with-x was given.
-+if test "${with_x+set}" = set; then
-+ withval=$with_x;
-+fi
-
-- if test "$GCC" = yes; then
-- archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- else
-- archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+ # The user explicitly disabled X.
@@ -36743,16 +36653,23 @@
+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ ac_im_usrlibdir=$ac_im_libdir; break
fi
-- ;;
--
-- uts4*)
-- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_GCJ='-L$libdir'
+- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_shlibpath_var_GCJ=no
-- ;;
--
-- *)
-- ld_shlibs_GCJ=no
+- case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
+- *)
+- # The compiler driver will combine and reorder linker options,
+- # but understands `-z linker_flag'. GCC discards it without `$wl',
+- # but is careful enough not to reorder.
+- # Supported since Solaris 2.6 (maybe 2.5.1?)
+- if test "$GCC" = yes; then
+- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+- else
+- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+- fi
+- ;;
+- esac
+- link_all_deplibs_GCJ=yes
- ;;
+ done
+ # Screen out bogus values from the imake configuration. They are
@@ -36765,15 +36682,25 @@
+ case $ac_im_usrlibdir in
+ /usr/lib | /usr/lib64 | /lib | /lib64) ;;
+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
- esac
- fi
++ esac
++ fi
+ cd ..
+ rm -f -r conftest.dir
+fi
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
--$as_echo "$ld_shlibs_GCJ" >&6; }
--test "$ld_shlibs_GCJ" = no && can_build_shared=no
+- sunos4*)
+- if test "x$host_vendor" = xsequent; then
+- # Use $CC to link under sequent, because it throws in some extra .o
+- # files that make .init and .fini sections work.
+- archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+- else
+- archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+- fi
+- hardcode_libdir_flag_spec_GCJ='-L$libdir'
+- hardcode_direct_GCJ=yes
+- hardcode_minus_L_GCJ=yes
+- hardcode_shlibpath_var_GCJ=no
+- ;;
+# Standard set of common directories for X headers.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ac_x_header_dirs='
@@ -36782,57 +36709,113 @@
+/usr/X11R5/include
+/usr/X11R4/include
--#
--# Do we need to explicitly link libc?
--#
--case "x$archive_cmds_need_lc_GCJ" in
--x|xyes)
-- # Assume -lc should be added
-- archive_cmds_need_lc_GCJ=yes
+- sysv4)
+- case $host_vendor in
+- sni)
+- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct_GCJ=yes # is this really true???
+- ;;
+- siemens)
+- ## LD is ld it makes a PLAMLIB
+- ## CC just makes a GrossModule.
+- archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- reload_cmds_GCJ='$CC -r -o $output$reload_objs'
+- hardcode_direct_GCJ=no
+- ;;
+- motorola)
+- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
+- ;;
+- esac
+- runpath_var='LD_RUN_PATH'
+- hardcode_shlibpath_var_GCJ=no
+- ;;
+/usr/include/X11
+/usr/include/X11R6
+/usr/include/X11R5
+/usr/include/X11R4
-- if test "$enable_shared" = yes && test "$GCC" = yes; then
-- case $archive_cmds_GCJ in
-- *'~'*)
-- # FIXME: we may have to deal with multi-command sequences.
+- sysv4.3*)
+- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var_GCJ=no
+- export_dynamic_flag_spec_GCJ='-Bexport'
- ;;
-- '$CC '*)
-- # Test whether the compiler implicitly links with -lc since on some
-- # systems, -lgcc has to come before -lc. If gcc already passes -lc
-- # to ld, don't add -lc before -lgcc.
-- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-- $rm conftest*
-- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+/usr/local/X11/include
+/usr/local/X11R6/include
+/usr/local/X11R5/include
+/usr/local/X11R4/include
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_shlibpath_var_GCJ=no
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ld_shlibs_GCJ=yes
+- fi
+- ;;
+/usr/local/include/X11
+/usr/local/include/X11R6
+/usr/local/include/X11R5
+/usr/local/include/X11R4
-+
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+- no_undefined_flag_GCJ='${wl}-z,text'
+- archive_cmds_need_lc_GCJ=no
+- hardcode_shlibpath_var_GCJ=no
+- runpath_var='LD_RUN_PATH'
+-
+- if test "$GCC" = yes; then
+- archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- else
+- archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- fi
+- ;;
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
-+
+
+- sysv5* | sco3.2v5* | sco5v6*)
+- # Note: We can NOT use -z defs as we might desire, because we do not
+- # link with -lc, and that would cause any symbols used from libc to
+- # always be unresolved, which means just about no library would
+- # ever link correctly. If we're not using GNU ld we use -z text
+- # though, which does catch some bad symbols but isn't as heavy-handed
+- # as -z defs.
+- no_undefined_flag_GCJ='${wl}-z,text'
+- allow_undefined_flag_GCJ='${wl}-z,nodefs'
+- archive_cmds_need_lc_GCJ=no
+- hardcode_shlibpath_var_GCJ=no
+- hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+- hardcode_libdir_separator_GCJ=':'
+- link_all_deplibs_GCJ=yes
+- export_dynamic_flag_spec_GCJ='${wl}-Bexport'
+- runpath_var='LD_RUN_PATH'
+/usr/include
+/usr/local/include
+/usr/unsupported/include
+/usr/athena/include
+/usr/local/x11r5/include
+/usr/lpp/Xamples/include
-+
+
+- if test "$GCC" = yes; then
+- archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+- else
+- archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+- fi
+- ;;
+/usr/openwin/include
+/usr/openwin/share/include'
-+
+
+- uts4*)
+- archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec_GCJ='-L$libdir'
+- hardcode_shlibpath_var_GCJ=no
+- ;;
+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.
@@ -36852,11 +36835,65 @@
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
++ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
++ # We can compile using X headers with no special include directory.
++ac_x_includes=
++else
++ $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- *)
+- ld_shlibs_GCJ=no
+- ;;
+- esac
++ for ac_dir in $ac_x_header_dirs; do
++ if test -r "$ac_dir/X11/Xlib.h"; then
++ ac_x_includes=$ac_dir
++ break
+ fi
++done
++fi
+
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-$as_echo "$ld_shlibs_GCJ" >&6; }
+-test "$ld_shlibs_GCJ" = no && can_build_shared=no
+-
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$archive_cmds_need_lc_GCJ" in
+-x|xyes)
+- # Assume -lc should be added
+- archive_cmds_need_lc_GCJ=yes
+-
+- if test "$enable_shared" = yes && test "$GCC" = yes; then
+- case $archive_cmds_GCJ in
+- *'~'*)
+- # FIXME: we may have to deal with multi-command sequences.
+- ;;
+- '$CC '*)
+- # Test whether the compiler implicitly links with -lc since on some
+- # systems, -lgcc has to come before -lc. If gcc already passes -lc
+- # to ld, don't add -lc before -lgcc.
+- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+- $rm conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++rm -f conftest.err conftest.$ac_ext
++fi # $ac_x_includes = no
+
+- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } 2>conftest.err; then
- soname=conftest
- lib=conftest
@@ -36873,27 +36910,6 @@
- allow_undefined_flag_GCJ=
- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
- (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+ (exit $ac_status); } >/dev/null && {
-+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ }; then
-+ # We can compile using X headers with no special include directory.
-+ac_x_includes=
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ for ac_dir in $ac_x_header_dirs; do
-+ if test -r "$ac_dir/X11/Xlib.h"; then
-+ ac_x_includes=$ac_dir
-+ break
-+ fi
-+done
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+fi # $ac_x_includes = no
-+
+if test "$ac_x_libraries" = no; then
+ # Check for the libraries.
+ # See if we find them without any special options.
@@ -36946,6 +36962,7 @@
- esac
- fi
- ;;
+-esac
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
@@ -36959,41 +36976,6 @@
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ LIBS=$ac_save_LIBS
-+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!
-+ for ac_extension in a so sl dylib la dll; do
-+ if test -r "$ac_dir/libX11.$ac_extension"; then
-+ ac_x_libraries=$ac_dir
-+ break 2
-+ fi
-+ done
-+done
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi # $ac_x_libraries = no
-+
-+case $ac_x_includes,$ac_x_libraries in #(
-+ no,* | *,no | *\'*)
-+ # Didn't find X, or a directory has "'" in its name.
-+ ac_cv_have_x="have_x=no";; #(
-+ *)
-+ # Record where we found X for the cache.
-+ ac_cv_have_x="have_x=yes\
-+ ac_x_includes='$ac_x_includes'\
-+ ac_x_libraries='$ac_x_libraries'"
- esac
-+fi
-+;; #(
-+ *) have_x=yes;;
-+ esac
-+ eval "$ac_cv_have_x"
-+fi # $with_x != no
-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
@@ -37010,6 +36992,51 @@
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
++ LIBS=$ac_save_LIBS
++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!
++ for ac_extension in a so sl dylib la dll; do
++ if test -r "$ac_dir/libX11.$ac_extension"; then
++ ac_x_libraries=$ac_dir
++ break 2
++ fi
++ done
++done
++fi
+
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++fi # $ac_x_libraries = no
+
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
++case $ac_x_includes,$ac_x_libraries in #(
++ no,* | *,no | *\'*)
++ # Didn't find X, or a directory has "'" in its name.
++ ac_cv_have_x="have_x=no";; #(
++ *)
++ # Record where we found X for the cache.
++ ac_cv_have_x="have_x=yes\
++ ac_x_includes='$ac_x_includes'\
++ ac_x_libraries='$ac_x_libraries'"
++esac
++fi
++;; #(
++ *) have_x=yes;;
++ esac
++ eval "$ac_cv_have_x"
++fi # $with_x != no
+
+-case $host_os in
+-aix3*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+- shlibpath_var=LIBPATH
+if test "$have_x" != yes; then
+ { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
@@ -37026,48 +37053,11 @@
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
+fi
--need_lib_prefix=unknown
--hardcode_into_libs=no
-+if test "$no_x" = yes; then
-+ # Not all programs may use this symbol, but it does not hurt to define it.
-
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--need_version=unknown
-+cat >>confdefs.h <<\_ACEOF
-+#define X_DISPLAY_MISSING 1
-+_ACEOF
-
--case $host_os in
--aix3*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-- shlibpath_var=LIBPATH
-+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-+else
-+ if test -n "$x_includes"; then
-+ X_CFLAGS="$X_CFLAGS -I$x_includes"
-+ fi
-
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
-+ # It would also be nice to do this for all -L options, not just this one.
-+ if test -n "$x_libraries"; then
-+ 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 . . . .
-+ { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+$as_echo_n "checking whether -R must be followed by a space... " >&6; }
-+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+ ac_xsave_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
++if test "$no_x" = yes; then
++ # Not all programs may use this symbol, but it does not hurt to define it.
-aix[4-9]*)
- version_type=linux
@@ -37112,19 +37102,43 @@
- shlibpath_var=LIBPATH
- fi
- ;;
--
++cat >>confdefs.h <<\_ACEOF
++#define X_DISPLAY_MISSING 1
++_ACEOF
+
-amigaos*)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
--
++ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
++else
++ if test -n "$x_includes"; then
++ X_CFLAGS="$X_CFLAGS -I$x_includes"
++ fi
+
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
- ;;
--
++ # It would also be nice to do this for all -L options, not just this one.
++ if test -n "$x_libraries"; then
++ 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 . . . .
++ { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
++$as_echo_n "checking whether -R must be followed by a space... " >&6; }
++ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
++ ac_xsave_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
-bsdi[45]*)
- version_type=linux
- need_version=no
@@ -40994,7 +41008,7 @@
;
return 0;
}
-@@ -23555,98 +15493,140 @@ $as_echo "$ac_try_echo") >&5
+@@ -23555,98 +15503,140 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -41201,7 +41215,7 @@
;
return 0;
}
-@@ -23672,25 +15652,47 @@ $as_echo "$ac_try_echo") >&5
+@@ -23672,25 +15662,47 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -41255,7 +41269,7 @@
;
return 0;
}
-@@ -23716,46 +15718,55 @@ $as_echo "$ac_try_echo") >&5
+@@ -23716,46 +15728,55 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -41334,7 +41348,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -23763,11 +15774,18 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23763,11 +15784,18 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -41355,7 +41369,7 @@
;
return 0;
}
-@@ -23793,18 +15811,29 @@ $as_echo "$ac_try_echo") >&5
+@@ -23793,18 +15821,29 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -41390,7 +41404,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23818,11 +15847,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23818,11 +15857,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -41404,7 +41418,7 @@
;
return 0;
}
-@@ -23848,12 +15877,12 @@ $as_echo "$ac_try_echo") >&5
+@@ -23848,12 +15887,12 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -41419,7 +41433,7 @@
fi
rm -rf conftest.dSYM
-@@ -23861,20 +15890,31 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -23861,20 +15900,31 @@ rm -f core conftest.err conftest.$ac_obj
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41460,7 +41474,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23888,11 +15928,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23888,11 +15938,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -41474,7 +41488,7 @@
;
return 0;
}
-@@ -23918,12 +15958,12 @@ $as_echo "$ac_try_echo") >&5
+@@ -23918,12 +15968,12 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -41489,7 +41503,7 @@
fi
rm -rf conftest.dSYM
-@@ -23931,55 +15971,39 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -23931,55 +15981,39 @@ rm -f core conftest.err conftest.$ac_obj
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -41566,7 +41580,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -23987,18 +16011,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -23987,18 +16021,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -41587,7 +41601,7 @@
;
return 0;
}
-@@ -24024,60 +16041,60 @@ $as_echo "$ac_try_echo") >&5
+@@ -24024,60 +16051,60 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -41676,7 +41690,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24086,168 +16103,374 @@ $as_echo "$ac_try_echo") >&5
+@@ -24086,168 +16113,374 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -42181,7 +42195,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24256,101 +16479,117 @@ $as_echo "$ac_try_echo") >&5
+@@ -24256,101 +16489,117 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -42357,7 +42371,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -24359,41 +16598,11 @@ _ACEOF
+@@ -24359,41 +16608,11 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -42401,7 +42415,7 @@
;
return 0;
}
-@@ -24419,206 +16628,194 @@ $as_echo "$ac_try_echo") >&5
+@@ -24419,206 +16638,194 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -42721,7 +42735,7 @@
;
return 0;
}
-@@ -24644,62 +16841,41 @@ $as_echo "$ac_try_echo") >&5
+@@ -24644,62 +16851,41 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -42797,7 +42811,7 @@
;
return 0;
}
-@@ -24725,52 +16901,55 @@ $as_echo "$ac_try_echo") >&5
+@@ -24725,52 +16911,55 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -42879,7 +42893,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -24778,11 +16957,18 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24778,11 +16967,18 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -42900,7 +42914,7 @@
;
return 0;
}
-@@ -24808,60 +16994,79 @@ $as_echo "$ac_try_echo") >&5
+@@ -24808,60 +17004,79 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -43005,7 +43019,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24870,366 +17075,275 @@ $as_echo "$ac_try_echo") >&5
+@@ -24870,366 +17085,275 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -43591,7 +43605,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -25238,116 +17352,221 @@ $as_echo "$ac_try_echo") >&5
+@@ -25238,116 +17362,221 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -43881,7 +43895,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25356,11 +17575,41 @@ _ACEOF
+@@ -25356,11 +17585,41 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -43925,7 +43939,7 @@
;
return 0;
}
-@@ -25386,179 +17635,186 @@ $as_echo "$ac_try_echo") >&5
+@@ -25386,179 +17645,186 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -44239,7 +44253,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25567,13 +17823,41 @@ _ACEOF
+@@ -25567,13 +17833,41 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44283,7 +44297,7 @@
;
return 0;
}
-@@ -25599,26 +17883,156 @@ $as_echo "$ac_try_echo") >&5
+@@ -25599,26 +17893,156 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -44448,7 +44462,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25627,26 +18041,28 @@ _ACEOF
+@@ -25627,26 +18051,28 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -44483,7 +44497,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -25655,167 +18071,96 @@ $as_echo "$ac_try_echo") >&5
+@@ -25655,167 +18081,96 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -44704,7 +44718,7 @@
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -25823,73 +18168,84 @@ case "(($ac_try" in
+@@ -25823,73 +18178,84 @@ case "(($ac_try" in
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
@@ -44833,7 +44847,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -25898,143 +18254,152 @@ $as_echo "$ac_try_echo") >&5
+@@ -25898,143 +18264,152 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -45069,7 +45083,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -26043,176 +18408,154 @@ $as_echo "$ac_try_echo") >&5
+@@ -26043,176 +18418,154 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -45340,7 +45354,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -26221,108 +18564,25 @@ $as_echo "$ac_try_echo") >&5
+@@ -26221,108 +18574,25 @@ $as_echo "$ac_try_echo") >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -45461,7 +45475,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26331,12 +18591,12 @@ _ACEOF
+@@ -26331,12 +18601,12 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -45477,7 +45491,7 @@
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
-@@ -26346,7 +18606,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -26346,7 +18616,7 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <assert.h>
#endif
@@ -45486,7 +45500,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -26354,18 +18614,18 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -26354,18 +18624,18 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -45508,7 +45522,7 @@
;
return 0;
}
-@@ -26391,70 +18651,126 @@ $as_echo "$ac_try_echo") >&5
+@@ -26391,70 +18661,126 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
@@ -45675,7 +45689,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -26464,7 +18780,7 @@ do
+@@ -26464,7 +18790,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -45684,7 +45698,7 @@
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -26472,2623 +18788,2450 @@ done
+@@ -26472,2623 +18798,2450 @@ done
done
IFS=$as_save_IFS
@@ -50455,7 +50469,7 @@
{ { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
{ (exit 1); exit 1; }; }
-@@ -29146,8 +21289,8 @@ if test "$no_create" != yes; then
+@@ -29146,8 +21299,8 @@ if test "$no_create" != yes; then
$ac_cs_success || { (exit 1); exit 1; }
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
@@ -50466,9 +50480,10 @@
fi
-diff -pruN gnome-session-2.26.0.90.orig/data/icons/16x16/Makefile.in gnome-session-2.26.0.90/data/icons/16x16/Makefile.in
---- gnome-session-2.26.0.90.orig/data/icons/16x16/Makefile.in 2009-04-08 16:08:31.000000000 +0200
-+++ gnome-session-2.26.0.90/data/icons/16x16/Makefile.in 2009-04-11 14:53:55.998046734 +0200
+Index: gnome-session-2.26.0.90/data/icons/16x16/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/data/icons/16x16/Makefile.in 2009-04-11 15:49:02.778049709 +0200
++++ gnome-session-2.26.0.90/data/icons/16x16/Makefile.in 2009-04-12 10:31:36.889977343 +0200
@@ -72,10 +72,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -50566,9 +50581,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/data/icons/22x22/Makefile.in gnome-session-2.26.0.90/data/icons/22x22/Makefile.in
---- gnome-session-2.26.0.90.orig/data/icons/22x22/Makefile.in 2009-04-08 16:08:31.000000000 +0200
-+++ gnome-session-2.26.0.90/data/icons/22x22/Makefile.in 2009-04-11 14:53:56.086046257 +0200
+Index: gnome-session-2.26.0.90/data/icons/22x22/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/data/icons/22x22/Makefile.in 2009-04-11 15:49:02.702050455 +0200
++++ gnome-session-2.26.0.90/data/icons/22x22/Makefile.in 2009-04-12 10:31:36.981978421 +0200
@@ -72,10 +72,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -50666,9 +50682,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/data/icons/24x24/Makefile.in gnome-session-2.26.0.90/data/icons/24x24/Makefile.in
---- gnome-session-2.26.0.90.orig/data/icons/24x24/Makefile.in 2009-04-08 16:08:31.000000000 +0200
-+++ gnome-session-2.26.0.90/data/icons/24x24/Makefile.in 2009-04-11 14:53:56.170046667 +0200
+Index: gnome-session-2.26.0.90/data/icons/24x24/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/data/icons/24x24/Makefile.in 2009-04-11 15:49:02.678048941 +0200
++++ gnome-session-2.26.0.90/data/icons/24x24/Makefile.in 2009-04-12 10:31:37.069976965 +0200
@@ -72,10 +72,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -50766,9 +50783,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/data/icons/32x32/Makefile.in gnome-session-2.26.0.90/data/icons/32x32/Makefile.in
---- gnome-session-2.26.0.90.orig/data/icons/32x32/Makefile.in 2009-04-08 16:08:31.000000000 +0200
-+++ gnome-session-2.26.0.90/data/icons/32x32/Makefile.in 2009-04-11 14:53:56.258046679 +0200
+Index: gnome-session-2.26.0.90/data/icons/32x32/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/data/icons/32x32/Makefile.in 2009-04-11 15:49:02.630052268 +0200
++++ gnome-session-2.26.0.90/data/icons/32x32/Makefile.in 2009-04-12 10:31:37.161976577 +0200
@@ -72,10 +72,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -50866,9 +50884,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/data/icons/48x48/Makefile.in gnome-session-2.26.0.90/data/icons/48x48/Makefile.in
---- gnome-session-2.26.0.90.orig/data/icons/48x48/Makefile.in 2009-04-08 16:08:31.000000000 +0200
-+++ gnome-session-2.26.0.90/data/icons/48x48/Makefile.in 2009-04-11 14:53:56.346047179 +0200
+Index: gnome-session-2.26.0.90/data/icons/48x48/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/data/icons/48x48/Makefile.in 2009-04-11 15:49:02.606061998 +0200
++++ gnome-session-2.26.0.90/data/icons/48x48/Makefile.in 2009-04-12 10:31:37.277977214 +0200
@@ -72,10 +72,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -50966,9 +50985,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/data/icons/Makefile.in gnome-session-2.26.0.90/data/icons/Makefile.in
---- gnome-session-2.26.0.90.orig/data/icons/Makefile.in 2009-04-08 16:08:31.000000000 +0200
-+++ gnome-session-2.26.0.90/data/icons/Makefile.in 2009-04-11 14:53:56.430049057 +0200
+Index: gnome-session-2.26.0.90/data/icons/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/data/icons/Makefile.in 2009-04-11 15:49:02.574052972 +0200
++++ gnome-session-2.26.0.90/data/icons/Makefile.in 2009-04-12 10:31:37.365976736 +0200
@@ -74,10 +74,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -51066,9 +51086,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/data/icons/scalable/Makefile.in gnome-session-2.26.0.90/data/icons/scalable/Makefile.in
---- gnome-session-2.26.0.90.orig/data/icons/scalable/Makefile.in 2009-04-08 16:08:31.000000000 +0200
-+++ gnome-session-2.26.0.90/data/icons/scalable/Makefile.in 2009-04-11 14:53:56.518046623 +0200
+Index: gnome-session-2.26.0.90/data/icons/scalable/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/data/icons/scalable/Makefile.in 2009-04-11 15:49:02.554052525 +0200
++++ gnome-session-2.26.0.90/data/icons/scalable/Makefile.in 2009-04-12 10:31:37.457977814 +0200
@@ -72,10 +72,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -51166,9 +51187,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/data/Makefile.in gnome-session-2.26.0.90/data/Makefile.in
---- gnome-session-2.26.0.90.orig/data/Makefile.in 2009-04-08 16:08:31.000000000 +0200
-+++ gnome-session-2.26.0.90/data/Makefile.in 2009-04-11 14:53:55.914046812 +0200
+Index: gnome-session-2.26.0.90/data/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/data/Makefile.in 2009-04-11 15:49:02.502052341 +0200
++++ gnome-session-2.26.0.90/data/Makefile.in 2009-04-12 10:31:36.797977731 +0200
@@ -96,10 +96,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -51266,9 +51288,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/doc/dbus/Makefile.in gnome-session-2.26.0.90/doc/dbus/Makefile.in
---- gnome-session-2.26.0.90.orig/doc/dbus/Makefile.in 2009-04-08 16:08:32.000000000 +0200
-+++ gnome-session-2.26.0.90/doc/dbus/Makefile.in 2009-04-11 14:53:56.698047223 +0200
+Index: gnome-session-2.26.0.90/doc/dbus/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/doc/dbus/Makefile.in 2009-04-11 15:49:02.478052293 +0200
++++ gnome-session-2.26.0.90/doc/dbus/Makefile.in 2009-04-12 10:31:37.645977616 +0200
@@ -73,10 +73,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -51366,9 +51389,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/doc/Makefile.in gnome-session-2.26.0.90/doc/Makefile.in
---- gnome-session-2.26.0.90.orig/doc/Makefile.in 2009-04-08 16:08:31.000000000 +0200
-+++ gnome-session-2.26.0.90/doc/Makefile.in 2009-04-11 14:53:56.610046724 +0200
+Index: gnome-session-2.26.0.90/doc/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/doc/Makefile.in 2009-04-11 15:49:02.426060420 +0200
++++ gnome-session-2.26.0.90/doc/Makefile.in 2009-04-12 10:31:37.554479116 +0200
@@ -74,10 +74,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -51466,9 +51490,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/doc/man/Makefile.in gnome-session-2.26.0.90/doc/man/Makefile.in
---- gnome-session-2.26.0.90.orig/doc/man/Makefile.in 2009-04-08 16:08:32.000000000 +0200
-+++ gnome-session-2.26.0.90/doc/man/Makefile.in 2009-04-11 14:53:56.786046745 +0200
+Index: gnome-session-2.26.0.90/doc/man/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/doc/man/Makefile.in 2009-04-11 15:49:02.406052640 +0200
++++ gnome-session-2.26.0.90/doc/man/Makefile.in 2009-04-12 10:31:37.733977628 +0200
@@ -66,10 +66,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -51566,9 +51591,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/egg/Makefile.in gnome-session-2.26.0.90/egg/Makefile.in
---- gnome-session-2.26.0.90.orig/egg/Makefile.in 2009-04-08 16:08:32.000000000 +0200
-+++ gnome-session-2.26.0.90/egg/Makefile.in 2009-04-11 14:53:56.930046540 +0200
+Index: gnome-session-2.26.0.90/egg/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/egg/Makefile.in 2009-04-11 15:49:02.378057392 +0200
++++ gnome-session-2.26.0.90/egg/Makefile.in 2009-04-12 10:31:37.877977913 +0200
@@ -98,10 +98,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -51666,9 +51692,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/gnome-session/Makefile.in gnome-session-2.26.0.90/gnome-session/Makefile.in
---- gnome-session-2.26.0.90.orig/gnome-session/Makefile.in 2009-04-08 16:08:32.000000000 +0200
-+++ gnome-session-2.26.0.90/gnome-session/Makefile.in 2009-04-11 14:53:57.074046826 +0200
+Index: gnome-session-2.26.0.90/gnome-session/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/gnome-session/Makefile.in 2009-04-11 15:49:02.354053923 +0200
++++ gnome-session-2.26.0.90/gnome-session/Makefile.in 2009-04-12 10:31:38.053977936 +0200
@@ -120,10 +120,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -51766,9 +51793,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/ltmain.sh gnome-session-2.26.0.90/ltmain.sh
---- gnome-session-2.26.0.90.orig/ltmain.sh 2009-03-09 14:27:10.000000000 +0100
-+++ gnome-session-2.26.0.90/ltmain.sh 2009-04-11 14:53:17.810051262 +0200
+Index: gnome-session-2.26.0.90/ltmain.sh
+===================================================================
+--- gnome-session-2.26.0.90.orig/ltmain.sh 2009-04-11 15:49:02.326050852 +0200
++++ gnome-session-2.26.0.90/ltmain.sh 2009-04-12 10:31:25.622477912 +0200
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -65973,9 +66001,10 @@
# End:
+# vi:sw=2
+
-diff -pruN gnome-session-2.26.0.90.orig/Makefile.in gnome-session-2.26.0.90/Makefile.in
---- gnome-session-2.26.0.90.orig/Makefile.in 2009-04-08 16:08:32.000000000 +0200
-+++ gnome-session-2.26.0.90/Makefile.in 2009-04-11 14:53:57.442046740 +0200
+Index: gnome-session-2.26.0.90/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/Makefile.in 2009-04-11 15:49:02.282553425 +0200
++++ gnome-session-2.26.0.90/Makefile.in 2009-04-12 10:31:38.457976208 +0200
@@ -90,10 +90,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -66073,9 +66102,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/splash/Makefile.in gnome-session-2.26.0.90/splash/Makefile.in
---- gnome-session-2.26.0.90.orig/splash/Makefile.in 2009-04-08 16:08:32.000000000 +0200
-+++ gnome-session-2.26.0.90/splash/Makefile.in 2009-04-11 14:53:57.226046312 +0200
+Index: gnome-session-2.26.0.90/splash/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/splash/Makefile.in 2009-04-11 15:49:02.242548620 +0200
++++ gnome-session-2.26.0.90/splash/Makefile.in 2009-04-12 10:31:38.201978310 +0200
@@ -100,10 +100,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
@@ -66173,9 +66203,10 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-diff -pruN gnome-session-2.26.0.90.orig/tools/Makefile.in gnome-session-2.26.0.90/tools/Makefile.in
---- gnome-session-2.26.0.90.orig/tools/Makefile.in 2009-04-08 16:08:32.000000000 +0200
-+++ gnome-session-2.26.0.90/tools/Makefile.in 2009-04-11 14:53:57.338046859 +0200
+Index: gnome-session-2.26.0.90/tools/Makefile.in
+===================================================================
+--- gnome-session-2.26.0.90.orig/tools/Makefile.in 2009-04-11 15:49:02.214551905 +0200
++++ gnome-session-2.26.0.90/tools/Makefile.in 2009-04-12 10:31:38.337977927 +0200
@@ -87,10 +87,6 @@ COMPAT_CFLAGS = @COMPAT_CFLAGS@
COMPAT_LIBS = @COMPAT_LIBS@
CPP = @CPP@
Modified: desktop/experimental/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/series?rev=19552&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/series (original)
+++ desktop/experimental/gnome-session/debian/patches/series Sun Apr 12 08:37:01 2009
@@ -1,2 +1,3 @@
01_gnome-wm.patch
+10_session_save.patch
90_relibtoolize.patch
More information about the pkg-gnome-commits
mailing list