r15636 - in /desktop/experimental/gnome-panel/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sat Apr 12 18:35:24 UTC 2008
Author: sjoerd
Date: Sat Apr 12 18:35:23 2008
New Revision: 15636
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15636
Log:
* New upstream release
* debian/patches/03_gnome-panel-logout.patch
debian/patches/09_default_icons.patch
debian/patches/70_relibtoolize.patch
debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch
- Refreshed to apply again
* debian/patches/60_caldav-clock-appointments:
- Removed. Merged upstream
- Refreshed
* debian/patches/80_from_bugzilla_use_correct_current_timezone.patch:
- Removed. Merged upstream
Removed:
desktop/experimental/gnome-panel/debian/patches/60_caldav-clock-appointments.patch
desktop/experimental/gnome-panel/debian/patches/80_from_bugzilla_use_correct_current_timezone.patch
Modified:
desktop/experimental/gnome-panel/debian/changelog
desktop/experimental/gnome-panel/debian/control
desktop/experimental/gnome-panel/debian/patches/03_gnome-panel-logout.patch
desktop/experimental/gnome-panel/debian/patches/09_default_icons.patch
desktop/experimental/gnome-panel/debian/patches/70_relibtoolize.patch
desktop/experimental/gnome-panel/debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch
desktop/experimental/gnome-panel/debian/patches/series
Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=15636&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog (original)
+++ desktop/experimental/gnome-panel/debian/changelog Sat Apr 12 18:35:23 2008
@@ -1,12 +1,26 @@
-gnome-panel (2.22.0-2) UNRELEASED; urgency=low
-
+gnome-panel (2.22.1-1) UNRELEASED; urgency=low
+
+ [ Loic Minier ]
* Refresh patches 02_switch-user_lock, 03_gnome-panel-logout,
60_caldav-clock-appointments and 99_ltmain_as-needed to apply cleanly.
* New patch, 90_dont-cleanup-calendard-backend-when-not-loaded, avoids
crashing when shutting down evolution forcefully as intlclock tries to
cleanup data from the calendar backend it didn't load; GNOME #378854.
- -- Loic Minier <lool at dooz.org> Wed, 19 Mar 2008 14:09:13 +0100
+ [ Sjoerd Simons ]
+ * New upstream release
+ * debian/patches/03_gnome-panel-logout.patch
+ debian/patches/09_default_icons.patch
+ debian/patches/70_relibtoolize.patch
+ debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch
+ - Refreshed to apply again
+ * debian/patches/60_caldav-clock-appointments:
+ - Removed. Merged upstream
+ - Refreshed
+ * debian/patches/80_from_bugzilla_use_correct_current_timezone.patch:
+ - Removed. Merged upstream
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 12 Apr 2008 20:26:14 +0200
gnome-panel (2.22.0-1) experimental; urgency=low
Modified: desktop/experimental/gnome-panel/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/control?rev=15636&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/control (original)
+++ desktop/experimental/gnome-panel/debian/control Sat Apr 12 18:35:23 2008
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Standards-Version: 3.7.3
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5),
Modified: desktop/experimental/gnome-panel/debian/patches/03_gnome-panel-logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/03_gnome-panel-logout.patch?rev=15636&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/03_gnome-panel-logout.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/03_gnome-panel-logout.patch Sat Apr 12 18:35:23 2008
@@ -1,7 +1,54 @@
-Bugzilla #507391
-
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/gnome-panel/gnome-panel-logout.c 2008-03-19 14:09:20.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/configure.in gnome-panel-2.22.1/configure.in
+--- gnome-panel-2.22.1.orig/configure.in 2008-04-12 20:13:44.000000000 +0200
++++ gnome-panel-2.22.1/configure.in 2008-04-12 20:13:54.000000000 +0200
+@@ -74,6 +74,10 @@
+ AC_SUBST(PANEL_CFLAGS)
+ AC_SUBST(PANEL_LIBS)
+
++PKG_CHECK_MODULES(LOGOUT, gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
++AC_SUBST(LOGOUT_CFLAGS)
++AC_SUBST(LOGOUT_LIBS)
++
+ PKG_CHECK_MODULES(LIBPANEL_APPLET, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
+ AC_SUBST(LIBPANEL_APPLET_CFLAGS)
+ AC_SUBST(LIBPANEL_APPLET_LIBS)
+diff -Naur gnome-panel-2.22.1.orig/gnome-panel/Makefile.am gnome-panel-2.22.1/gnome-panel/Makefile.am
+--- gnome-panel-2.22.1.orig/gnome-panel/Makefile.am 2008-04-12 20:13:44.000000000 +0200
++++ gnome-panel-2.22.1/gnome-panel/Makefile.am 2008-04-12 20:13:54.000000000 +0200
+@@ -29,6 +29,7 @@
+
+ bin_PROGRAMS = \
+ gnome-panel \
++ gnome-panel-logout \
+ gnome-desktop-item-edit
+
+ $(gnome_panel_OBJECTS): $(BUILT_SOURCES)
+@@ -165,6 +166,22 @@
+
+ gnome_panel_LDFLAGS = -export-dynamic
+
++gnome_panel_logout_SOURCES = \
++ gnome-panel-logout.c \
++ panel-logout.c \
++ panel-gdm.c \
++ panel-power-manager.c \
++ panel-session.c \
++ panel-util.c
++
++gnome_panel_logout_CFLAGS = -DBUILDING_STANDALONE_LOGOUT
++
++gnome_panel_logout_LDADD = \
++ $(LOGOUT_LIBS) \
++ $(X_LIBS)
++
++gnome_panel_logout_LDFLAGS = -export-dynamic
++
+ gnome_desktop_item_edit_SOURCES = \
+ gnome-desktop-item-edit.c \
+ panel-ditem-editor.c \
+diff -Naur gnome-panel-2.22.1.orig/gnome-panel/gnome-panel-logout.c gnome-panel-2.22.1/gnome-panel/gnome-panel-logout.c
+--- gnome-panel-2.22.1.orig/gnome-panel/gnome-panel-logout.c 1970-01-01 01:00:00.000000000 +0100
++++ gnome-panel-2.22.1/gnome-panel/gnome-panel-logout.c 2008-04-12 20:13:54.000000000 +0200
@@ -0,0 +1,49 @@
+/* GNOME panel : logout/shutdown request standalone binary
+ *
@@ -52,143 +99,9 @@
+ g_object_unref (program);
+ return 0;
+}
---- a/gnome-panel/panel-session.c 2008-03-19 14:09:06.000000000 +0100
-+++ b/gnome-panel/panel-session.c 2008-03-19 14:09:20.000000000 +0100
-@@ -29,8 +29,10 @@
-
- #include <stdlib.h>
-
-+#ifndef BUILDING_STANDALONE_LOGOUT
- #include "panel-profile.h"
- #include "panel-shell.h"
-+#endif // BUILDING_STANDALONE_LOGOUT
-
- void
- panel_session_request_logout (void)
-@@ -60,6 +62,7 @@
- recursion_guard--;
- }
-
-+#ifndef BUILDING_STANDALONE_LOGOUT
- static void
- panel_session_handle_die_request (GnomeClient *client)
- {
-@@ -107,3 +110,4 @@
- g_signal_connect (client, "die",
- G_CALLBACK (panel_session_handle_die_request), NULL);
- }
-+#endif // BUILDING_STANDALONE_LOGOUT
---- a/gnome-panel/panel-util.c 2008-03-19 14:09:06.000000000 +0100
-+++ b/gnome-panel/panel-util.c 2008-03-19 14:09:20.000000000 +0100
-@@ -28,6 +28,7 @@
- #include <libgnome/gnome-util.h>
- #include <libgnomeui/gnome-help.h>
-
-+#ifndef BUILDING_STANDALONE_LOGOUT
- #include "applet.h"
- #include "nothing.h"
- #include "xstuff.h"
-@@ -466,6 +467,7 @@
- GINT_TO_POINTER (busy));
- }
- }
-+#endif // BUILDING_STANDALONE_LOGOUT
-
- gboolean
- panel_is_program_in_path (const char *program)
-@@ -479,6 +481,7 @@
- }
- }
-
-+#ifndef BUILDING_STANDALONE_LOGOUT
- static gboolean
- panel_ensure_dir (const char *dirname)
- {
-@@ -675,6 +678,7 @@
-
- return retval;
- }
-+#endif // BUILDING_STANDALONE_LOGOUT
-
- static char *
- panel_lock_screen_action_get_command (const char *action)
-@@ -747,6 +751,7 @@
- return;
-
- if (!gdk_spawn_command_line_on_screen (screen, command, &error)) {
-+#ifndef BUILDING_STANDALONE_LOGOUT
- char *primary;
-
- primary = g_strdup_printf (_("Could not execute '%s'"),
-@@ -755,6 +760,7 @@
- "cannot_exec_screensaver", TRUE,
- primary, error->message);
- g_free (primary);
-+#endif // BUILDING_STANDALONE_LOGOUT
- g_error_free (error);
- }
-
-@@ -768,6 +774,7 @@
- }
-
-
-+#ifndef BUILDING_STANDALONE_LOGOUT
- char *
- panel_make_full_path (const char *dir,
- const char *filename)
-@@ -1823,3 +1830,4 @@
-
- return file;
- }
-+#endif // BUILDING_STANDALONE_LOGOUT
---- a/configure.in 2008-03-19 14:09:06.000000000 +0100
-+++ b/configure.in 2008-03-19 14:09:20.000000000 +0100
-@@ -73,6 +73,10 @@
- AC_SUBST(PANEL_CFLAGS)
- AC_SUBST(PANEL_LIBS)
-
-+PKG_CHECK_MODULES(LOGOUT, gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
-+AC_SUBST(LOGOUT_CFLAGS)
-+AC_SUBST(LOGOUT_LIBS)
-+
- PKG_CHECK_MODULES(LIBPANEL_APPLET, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
- AC_SUBST(LIBPANEL_APPLET_CFLAGS)
- AC_SUBST(LIBPANEL_APPLET_LIBS)
---- a/gnome-panel/Makefile.am 2008-03-19 14:09:06.000000000 +0100
-+++ b/gnome-panel/Makefile.am 2008-03-19 14:09:20.000000000 +0100
-@@ -29,6 +29,7 @@
-
- bin_PROGRAMS = \
- gnome-panel \
-+ gnome-panel-logout \
- gnome-desktop-item-edit
-
- $(gnome_panel_OBJECTS): $(BUILT_SOURCES)
-@@ -165,6 +166,22 @@
-
- gnome_panel_LDFLAGS = -export-dynamic
-
-+gnome_panel_logout_SOURCES = \
-+ gnome-panel-logout.c \
-+ panel-logout.c \
-+ panel-gdm.c \
-+ panel-power-manager.c \
-+ panel-session.c \
-+ panel-util.c
-+
-+gnome_panel_logout_CFLAGS = -DBUILDING_STANDALONE_LOGOUT
-+
-+gnome_panel_logout_LDADD = \
-+ $(LOGOUT_LIBS) \
-+ $(X_LIBS)
-+
-+gnome_panel_logout_LDFLAGS = -export-dynamic
-+
- gnome_desktop_item_edit_SOURCES = \
- gnome-desktop-item-edit.c \
- panel-ditem-editor.c \
---- a/gnome-panel/panel-logout.c 2008-03-19 14:09:09.000000000 +0100
-+++ b/gnome-panel/panel-logout.c 2008-03-19 14:09:20.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/gnome-panel/panel-logout.c gnome-panel-2.22.1/gnome-panel/panel-logout.c
+--- gnome-panel-2.22.1.orig/gnome-panel/panel-logout.c 2008-04-12 20:13:44.000000000 +0200
++++ gnome-panel-2.22.1/gnome-panel/panel-logout.c 2008-04-12 20:13:54.000000000 +0200
@@ -181,8 +181,6 @@
gtk_widget_destroy (GTK_WIDGET (logout_dialog));
@@ -216,7 +129,7 @@
}
static gboolean
-@@ -311,8 +313,10 @@
+@@ -316,8 +318,10 @@
if (current_dialog != NULL) {
if (current_dialog->priv->type == type) {
@@ -229,7 +142,7 @@
gtk_window_present_with_time (GTK_WINDOW (current_dialog),
activate_time);
panel_logout_set_timeout (current_dialog);
-@@ -395,7 +399,9 @@
+@@ -400,7 +404,9 @@
panel_logout_set_timeout (logout_dialog);
@@ -240,3 +153,94 @@
gtk_widget_show (GTK_WIDGET (logout_dialog));
gdk_window_focus (GTK_WIDGET (current_dialog)->window, activate_time);
}
+diff -Naur gnome-panel-2.22.1.orig/gnome-panel/panel-session.c gnome-panel-2.22.1/gnome-panel/panel-session.c
+--- gnome-panel-2.22.1.orig/gnome-panel/panel-session.c 2008-04-12 20:13:44.000000000 +0200
++++ gnome-panel-2.22.1/gnome-panel/panel-session.c 2008-04-12 20:13:54.000000000 +0200
+@@ -29,8 +29,10 @@
+
+ #include <stdlib.h>
+
++#ifndef BUILDING_STANDALONE_LOGOUT
+ #include "panel-profile.h"
+ #include "panel-shell.h"
++#endif // BUILDING_STANDALONE_LOGOUT
+
+ void
+ panel_session_request_logout (void)
+@@ -60,6 +62,7 @@
+ recursion_guard--;
+ }
+
++#ifndef BUILDING_STANDALONE_LOGOUT
+ static void
+ panel_session_handle_die_request (GnomeClient *client)
+ {
+@@ -107,3 +110,4 @@
+ g_signal_connect (client, "die",
+ G_CALLBACK (panel_session_handle_die_request), NULL);
+ }
++#endif // BUILDING_STANDALONE_LOGOUT
+diff -Naur gnome-panel-2.22.1.orig/gnome-panel/panel-util.c gnome-panel-2.22.1/gnome-panel/panel-util.c
+--- gnome-panel-2.22.1.orig/gnome-panel/panel-util.c 2008-04-12 20:13:44.000000000 +0200
++++ gnome-panel-2.22.1/gnome-panel/panel-util.c 2008-04-12 20:13:54.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <libgnome/gnome-util.h>
+ #include <libgnomeui/gnome-help.h>
+
++#ifndef BUILDING_STANDALONE_LOGOUT
+ #include "applet.h"
+ #include "nothing.h"
+ #include "xstuff.h"
+@@ -466,6 +467,7 @@
+ GINT_TO_POINTER (busy));
+ }
+ }
++#endif // BUILDING_STANDALONE_LOGOUT
+
+ gboolean
+ panel_is_program_in_path (const char *program)
+@@ -479,6 +481,7 @@
+ }
+ }
+
++#ifndef BUILDING_STANDALONE_LOGOUT
+ static gboolean
+ panel_ensure_dir (const char *dirname)
+ {
+@@ -675,6 +678,7 @@
+
+ return retval;
+ }
++#endif // BUILDING_STANDALONE_LOGOUT
+
+ static char *
+ panel_lock_screen_action_get_command (const char *action)
+@@ -747,6 +751,7 @@
+ return;
+
+ if (!gdk_spawn_command_line_on_screen (screen, command, &error)) {
++#ifndef BUILDING_STANDALONE_LOGOUT
+ char *primary;
+
+ primary = g_strdup_printf (_("Could not execute '%s'"),
+@@ -755,6 +760,7 @@
+ "cannot_exec_screensaver", TRUE,
+ primary, error->message);
+ g_free (primary);
++#endif // BUILDING_STANDALONE_LOGOUT
+ g_error_free (error);
+ }
+
+@@ -768,6 +774,7 @@
+ }
+
+
++#ifndef BUILDING_STANDALONE_LOGOUT
+ char *
+ panel_make_full_path (const char *dir,
+ const char *filename)
+@@ -1823,3 +1830,4 @@
+
+ return file;
+ }
++#endif // BUILDING_STANDALONE_LOGOUT
Modified: desktop/experimental/gnome-panel/debian/patches/09_default_icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/09_default_icons.patch?rev=15636&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/09_default_icons.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/09_default_icons.patch Sat Apr 12 18:35:23 2008
@@ -1,8 +1,8 @@
-diff -Nur gnome-panel-2.11.1.orig/gnome-panel/menu.c gnome-panel-2.11.1/gnome-panel/menu.c
---- gnome-panel-2.11.1.orig/gnome-panel/menu.c 2005-04-27 11:56:04.000000000 +0200
-+++ gnome-panel-2.11.1/gnome-panel/menu.c 2005-05-19 19:59:02.220319600 +0200
-@@ -1360,7 +1360,7 @@
- NULL,
+diff -Naur gnome-panel-2.22.1.orig/gnome-panel/menu.c gnome-panel-2.22.1/gnome-panel/menu.c
+--- gnome-panel-2.22.1.orig/gnome-panel/menu.c 2008-04-12 20:18:29.000000000 +0200
++++ gnome-panel-2.22.1/gnome-panel/menu.c 2008-04-12 20:18:42.000000000 +0200
+@@ -1555,7 +1555,7 @@
+ NULL, NULL,
alias_directory ? gmenu_tree_directory_get_icon (alias_directory) :
gmenu_tree_entry_get_icon (entry),
- NULL);
@@ -10,9 +10,9 @@
setup_menuitem (menuitem,
panel_menu_icon_get_size (),
-diff -Nur gnome-panel-2.11.1.orig/gnome-panel/panel-stock-icons.h gnome-panel-2.11.1/gnome-panel/panel-stock-icons.h
---- gnome-panel-2.11.1.orig/gnome-panel/panel-stock-icons.h 2005-02-02 08:49:08.000000000 +0100
-+++ gnome-panel-2.11.1/gnome-panel/panel-stock-icons.h 2005-05-19 19:56:16.416525608 +0200
+diff -Naur gnome-panel-2.22.1.orig/gnome-panel/panel-stock-icons.h gnome-panel-2.22.1/gnome-panel/panel-stock-icons.h
+--- gnome-panel-2.22.1.orig/gnome-panel/panel-stock-icons.h 2008-04-12 20:18:29.000000000 +0200
++++ gnome-panel-2.22.1/gnome-panel/panel-stock-icons.h 2008-04-12 20:18:42.000000000 +0200
@@ -43,6 +43,8 @@
#define PANEL_STOCK_EXECUTE "panel-execute"
#define PANEL_STOCK_CLEAR "panel-clear"
Modified: desktop/experimental/gnome-panel/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/70_relibtoolize.patch?rev=15636&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/70_relibtoolize.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/70_relibtoolize.patch Sat Apr 12 18:35:23 2008
@@ -1,6 +1,156 @@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/aclocal.m4 gnome-panel-2.22.0/aclocal.m4
---- gnome-panel-2.22.0.old/aclocal.m4 2008-03-10 22:11:32.000000000 +0100
-+++ gnome-panel-2.22.0/aclocal.m4 2008-03-17 13:41:49.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/INSTALL gnome-panel-2.22.1/INSTALL
+--- gnome-panel-2.22.1.orig/INSTALL 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/INSTALL 2008-04-12 20:22:59.000000000 +0200
+@@ -2,7 +2,7 @@
+ *************************
+
+ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+-2006 Free Software Foundation, Inc.
++2006, 2007 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+ unlimited permission to copy, distribute and modify it.
+@@ -67,6 +67,9 @@
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
++ 6. Often, you can also type `make uninstall' to remove the installed
++ files again.
++
+ Compilers and Options
+ =====================
+
+diff -Naur gnome-panel-2.22.1.orig/Makefile.in gnome-panel-2.22.1/Makefile.in
+--- gnome-panel-2.22.1.orig/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/Makefile.in 2008-04-12 20:22:59.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -38,10 +38,7 @@
+ INSTALL NEWS compile config.guess config.sub depcomp \
+ install-sh ltmain.sh missing mkinstalldirs
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+@@ -111,6 +108,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
+ DLLTOOL = @DLLTOOL@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -170,6 +168,8 @@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -180,6 +180,7 @@
+ MSGMERGE = @MSGMERGE@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -207,6 +208,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -439,8 +441,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -465,8 +467,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -476,13 +478,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -552,6 +553,10 @@
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
++dist-lzma: distdir
++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
++ $(am__remove_distdir)
++
+ dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+@@ -578,6 +583,8 @@
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ *.tar.lzma*) \
++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+@@ -721,8 +728,8 @@
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+- distclean-generic distclean-hdr distclean-libtool \
++ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
++ distclean distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+diff -Naur gnome-panel-2.22.1.orig/aclocal.m4 gnome-panel-2.22.1/aclocal.m4
+--- gnome-panel-2.22.1.orig/aclocal.m4 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/aclocal.m4 2008-04-12 20:22:51.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -11,7 +161,7 @@
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -11,4699 +11,4490 @@
+@@ -11,4699 +11,4795 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -1137,10 +1287,6 @@
- AC_SUBST(MAINT)dnl
-]
-)
--
--AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
--
--# Check to see how 'make' treats includes. -*- Autoconf -*-
+ ## -W is not all that useful. And it cannot be controlled
+ ## with individual -Wno-xxx flags, unlike -Wall
+ if test "x$enable_cxx_warnings" = "xyes"; then
@@ -1150,17 +1296,13 @@
+ fi
+ AC_MSG_RESULT($warnCXXFLAGS)
--# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+ AC_ARG_ENABLE(iso-cxx,
+ AC_HELP_STRING([--enable-iso-cxx],
+ [Try to warn if code is not ISO C++ ]),,
+ [enable_iso_cxx=no])
--# serial 3
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+ complCXXFLAGS=
+ if test "x$enable_iso_cxx" != "xno"; then
@@ -1169,6 +1311,24 @@
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+ esac
+
+-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ case " $CXXFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCXXFLAGS)
+
+-# serial 3
++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
++ AC_SUBST(WARN_CXXFLAGS)
++])
-# AM_MAKE_INCLUDE()
-# -----------------
@@ -1204,28 +1364,61 @@
- am__include=.include
- am__quote="\""
- _am_result=BSD
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-+ esac
-+ fi
- fi
+- fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
--])
--
++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
++AC_DEFUN([GNOME_DOC_DEFINES],
++[
++AC_ARG_WITH([help-dir],
++ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
++ [with_help_dir='${datadir}/gnome/help'])
++HELP_DIR="$with_help_dir"
++AC_SUBST(HELP_DIR)
++
++AC_ARG_WITH([omf-dir],
++ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
++ [with_omf_dir='${datadir}/omf'])
++OMF_DIR="$with_omf_dir"
++AC_SUBST(OMF_DIR)
++
++AC_ARG_WITH([help-formats],
++ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
++ [with_help_formats=''])
++DOC_USER_FORMATS="$with_help_formats"
++AC_SUBST(DOC_USER_FORMATS)
++
++AC_ARG_ENABLE([scrollkeeper],
++ [AC_HELP_STRING([--disable-scrollkeeper],
++ [do not make updates to the scrollkeeper database])],,
++ enable_scrollkeeper=yes)
++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
++
++dnl disable scrollkeeper automatically for distcheck
++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
++
++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
+ ])
+
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
--#
++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+ #
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
--
++AC_DEFUN([GNOME_DOC_INIT],
++[
++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
+
-# serial 5
-+ AC_MSG_RESULT($complCXXFLAGS)
++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-# AM_PROG_CC_C_O
-# --------------
@@ -1245,26 +1438,57 @@
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
--fi
++if test "$gdu_cv_have_gdu" = "yes"; then
++ ifelse([$2],,[:],[$2])
++else
++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
+ fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-+ AC_SUBST(WARN_CXXFLAGS)
++
++GNOME_DOC_DEFINES
])
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
--
++dnl -*- mode: autoconf -*-
+
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
--
++# serial 1
+
-# serial 5
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
++dnl Usage:
++dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
++AC_DEFUN([GTK_DOC_CHECK],
++[
++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++ dnl for overriding the documentation installation directory
++ AC_ARG_WITH([html-dir],
++ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
++ [with_html_dir='${datadir}/gtk-doc/html'])
++ HTML_DIR="$with_html_dir"
++ AC_SUBST([HTML_DIR])
++
++ dnl enable/disable documentation building
++ AC_ARG_ENABLE([gtk-doc],
++ AS_HELP_STRING([--enable-gtk-doc],
++ [use gtk-doc to build documentation [[default=no]]]),,
++ [enable_gtk_doc=no])
++
++ if test x$enable_gtk_doc = xyes; then
++ ifelse([$1],[],
++ [PKG_CHECK_EXISTS([gtk-doc],,
++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
++ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
++ fi
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
@@ -1272,8 +1496,10 @@
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
-
++ AC_MSG_CHECKING([whether to build gtk-doc documentation])
++ AC_MSG_RESULT($enable_gtk_doc)
+
++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
-# AM_MISSING_HAS_RUN
-# ------------------
@@ -1290,15 +1516,9 @@
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
--])
-+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-+# -----------------------------------------------------------
-+# If this macro is not defined by Autoconf, define it here.
-+m4_ifdef([AC_PROVIDE_IFELSE],
-+ [],
-+ [m4_define([AC_PROVIDE_IFELSE],
-+ [m4_ifdef([AC_PROVIDE_$1],
-+ [$2], [$3])])])
++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ ])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
@@ -1307,8 +1527,7 @@
-# with or without modifications, as long as this notice is preserved.
-# AM_PROG_MKDIR_P
-+# AC_PROG_LIBTOOL
- # ---------------
+-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
@@ -1324,101 +1543,247 @@
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
--])
-+AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+ [AC_LIBTOOL_CXX],
-+ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-+ ])])
-+dnl And a similar setup for Fortran 77 support
-+ AC_PROVIDE_IFELSE([AC_PROG_F77],
-+ [AC_LIBTOOL_F77],
-+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-+])])
++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
++# serial 36 IT_PROG_INTLTOOL
++AC_DEFUN([IT_PROG_INTLTOOL],
++[AC_PREREQ([2.50])dnl
++
++case "$am__api_version" in
++ 1.[01234])
++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
++ ;;
++ *)
++ ;;
+ esac
++
++if test -n "$1"; then
++ AC_MSG_CHECKING([for intltool >= $1])
++
++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
++ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
++ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++ ]
++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
++ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
++fi
++
++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++
++AC_SUBST(INTLTOOL_DESKTOP_RULE)
++AC_SUBST(INTLTOOL_DIRECTORY_RULE)
++AC_SUBST(INTLTOOL_KEYS_RULE)
++AC_SUBST(INTLTOOL_PROP_RULE)
++AC_SUBST(INTLTOOL_OAF_RULE)
++AC_SUBST(INTLTOOL_PONG_RULE)
++AC_SUBST(INTLTOOL_SERVER_RULE)
++AC_SUBST(INTLTOOL_SHEET_RULE)
++AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
++AC_SUBST(INTLTOOL_UI_RULE)
++AC_SUBST(INTLTOOL_XAM_RULE)
++AC_SUBST(INTLTOOL_KBD_RULE)
++AC_SUBST(INTLTOOL_XML_RULE)
++AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
++AC_SUBST(INTLTOOL_CAVES_RULE)
++AC_SUBST(INTLTOOL_SCHEMAS_RULE)
++AC_SUBST(INTLTOOL_THEME_RULE)
++AC_SUBST(INTLTOOL_SERVICE_RULE)
++AC_SUBST(INTLTOOL_POLICY_RULE)
++
++# Check the gettext tools to make sure they are GNU
++AC_PATH_PROG(XGETTEXT, xgettext)
++AC_PATH_PROG(MSGMERGE, msgmerge)
++AC_PATH_PROG(MSGFMT, msgfmt)
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
++
++# Use the tools built into the package, not the ones that are installed.
++AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
++AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
++AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
++
++AC_PATH_PROG(INTLTOOL_PERL, perl)
++if test -z "$INTLTOOL_PERL"; then
++ AC_MSG_ERROR([perl not found; required for intltool])
++fi
++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
++ AC_MSG_ERROR([perl 5.x required for intltool])
++fi
++if test "x$2" != "xno-xml"; then
++ AC_MSG_CHECKING([for XML::Parser])
++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++ AC_MSG_RESULT([ok])
++ else
++ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++ fi
++fi
++
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
++AC_SUBST(ALL_LINGUAS)
++
++# Set DATADIRNAME correctly if it is not set yet
++# (copied from glib-gettext.m4)
++if test -z "$DATADIRNAME"; then
++ AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([[]],
++ [[extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr]])],
++ [DATADIRNAME=share],
++ [case $host in
++ *-*-solaris*)
++ dnl On Solaris, if bind_textdomain_codeset is in libc,
++ dnl GNU format message catalog is always supported,
++ dnl since both are added to the libc all together.
++ dnl Hence, we'd like to go with DATADIRNAME=share
++ dnl in this case.
++ AC_CHECK_FUNC(bind_textdomain_codeset,
++ [DATADIRNAME=share], [DATADIRNAME=lib])
++ ;;
++ *)
++ [DATADIRNAME=lib]
++ ;;
++ esac])
++fi
++AC_SUBST(DATADIRNAME)
++
++IT_PO_SUBDIR([po])
++
++dnl The following is very similar to
++dnl
++dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
++dnl
++dnl with the following slight differences:
++dnl - the *.in files are in ac_aux_dir,
++dnl - if the file haven't changed upon reconfigure, it's not touched,
++dnl - the evaluation of the third parameter enables a hack which computes
++dnl the actual value of $libdir,
++dnl - the user sees "executing intltool commands", instead of
++dnl "creating intltool-extract" and such.
++dnl
++dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
++dnl a reason for it.
++
++AC_CONFIG_COMMANDS([intltool], [
++
++for file in intltool-extract intltool-merge intltool-update; do
++ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
++ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
++ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
++ < ${ac_aux_dir}/${file}.in > ${file}.out
++ if cmp -s ${file} ${file}.out 2>/dev/null; then
++ rm -f ${file}.out
++ else
++ mv -f ${file}.out ${file}
++ fi
++ chmod ugo+x ${file}
++ chmod u+w ${file}
++done
++
++],
++[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
++prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
++
+ ])
-# Helper functions for option handling. -*- Autoconf -*-
-+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-+ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-+ [AC_LIBTOOL_GCJ],
-+ [ifdef([AC_PROG_GCJ],
-+ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+ ifdef([A][M_PROG_GCJ],
-+ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+ ifdef([LT_AC_PROG_GCJ],
-+ [define([LT_AC_PROG_GCJ],
-+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-+])])# AC_PROG_LIBTOOL
-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--#
++# IT_PO_SUBDIR(DIRNAME)
++# ---------------------
++# All po subdirs have to be declared with this macro; the subdir "po" is
++# declared by IT_PROG_INTLTOOL.
+ #
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
++AC_DEFUN([IT_PO_SUBDIR],
++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
++dnl
++dnl The following CONFIG_COMMANDS should be exetuted at the very end
++dnl of config.status.
++AC_CONFIG_COMMANDS_PRE([
++ AC_CONFIG_COMMANDS([$1/stamp-it], [
++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
++ >"$1/stamp-it.tmp"
++ [sed '/^#/d
++ s/^[[].*] *//
++ /^[ ]*$/d
++ '"s|^| $ac_top_srcdir/|" \
++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
++ ]
++ if test ! -f "$1/Makefile"; then
++ AC_MSG_ERROR([$1/Makefile is not ready.])
++ fi
++ mv "$1/Makefile" "$1/Makefile.tmp"
++ [sed '/^POTFILES =/,/[^\\]$/ {
++ /^POTFILES =/!d
++ r $1/POTFILES
++ }
++ ' "$1/Makefile.tmp" >"$1/Makefile"]
++ rm -f "$1/Makefile.tmp"
++ mv "$1/stamp-it.tmp" "$1/stamp-it"
++ ])
++])dnl
++])
-# serial 3
-+# _AC_PROG_LIBTOOL
-+# ----------------
-+AC_DEFUN([_AC_PROG_LIBTOOL],
-+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++# deprecated macros
++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
++# A hint is needed for aclocal from Automake <= 1.9.4:
++# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
-+])# _AC_PROG_LIBTOOL
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
-+# AC_LIBTOOL_SETUP
-+# ----------------
-+AC_DEFUN([AC_LIBTOOL_SETUP],
-+[AC_PREREQ(2.50)dnl
-+AC_REQUIRE([AC_ENABLE_SHARED])dnl
-+AC_REQUIRE([AC_ENABLE_STATIC])dnl
-+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_PROG_LD])dnl
-+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-+AC_REQUIRE([AC_PROG_NM])dnl
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
@@ -1426,22 +1791,20 @@
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
-+dnl
-+AC_LIBTOOL_SYS_MAX_CMD_LEN
-+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+AC_LIBTOOL_OBJDIR
++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
++# -----------------------------------------------------------
++# If this macro is not defined by Autoconf, define it here.
++m4_ifdef([AC_PROVIDE_IFELSE],
++ [],
++ [m4_define([AC_PROVIDE_IFELSE],
++ [m4_ifdef([AC_PROVIDE_$1],
++ [$2], [$3])])])
-# serial 4
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+_LT_AC_PROG_ECHO_BACKSLASH
-# AM_SANITY_CHECK
--# ---------------
++# AC_PROG_LIBTOOL
+ # ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
@@ -1461,18 +1824,7 @@
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+case $host_os in
-+aix3*)
-+ # AIX sometimes has problems with the GCC collect2 program. For some
-+ # reason, if we set the COLLECT_NAMES environment variable, the problems
-+ # vanish in a puff of smoke.
-+ if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+ fi
-+ ;;
-+esac
-
+-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
@@ -1480,10 +1832,19 @@
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-+# Sed substitution that helps us do robust quoting. It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e 1s/^X//'
-+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
++ AC_PROVIDE_IFELSE([AC_PROG_CXX],
++ [AC_LIBTOOL_CXX],
++ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
++ ])])
++dnl And a similar setup for Fortran 77 support
++ AC_PROVIDE_IFELSE([AC_PROG_F77],
++ [AC_LIBTOOL_F77],
++ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
++])])
- test "$[2]" = conftest.file
- )
@@ -1495,17 +1856,29 @@
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-+# Same as above, but do not quote variable references.
-+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
++ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++ [AC_LIBTOOL_GCJ],
++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++ [AC_LIBTOOL_GCJ],
++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
++ [AC_LIBTOOL_GCJ],
++ [ifdef([AC_PROG_GCJ],
++ [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++ ifdef([A][M_PROG_GCJ],
++ [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++ ifdef([LT_AC_PROG_GCJ],
++ [define([LT_AC_PROG_GCJ],
++ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
++])])# AC_PROG_LIBTOOL
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-# AM_PROG_INSTALL_STRIP
-# ---------------------
@@ -1528,46 +1901,56 @@
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
++# _AC_PROG_LIBTOOL
++# ----------------
++AC_DEFUN([_AC_PROG_LIBTOOL],
++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-# Copyright (C) 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+# Constants:
-+rm="rm -f"
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
-# Check how to create a tarball. -*- Autoconf -*-
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])# _AC_PROG_LIBTOOL
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-+AC_CHECK_TOOL(AR, ar, false)
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
-# serial 2
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
++# AC_LIBTOOL_SETUP
++# ----------------
++AC_DEFUN([AC_LIBTOOL_SETUP],
++[AC_PREREQ(2.50)dnl
++AC_REQUIRE([AC_ENABLE_SHARED])dnl
++AC_REQUIRE([AC_ENABLE_STATIC])dnl
++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_LD])dnl
++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
++AC_REQUIRE([AC_PROG_NM])dnl
-# _AM_PROG_TAR(FORMAT)
-# --------------------
@@ -1624,49 +2007,28 @@
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$SED" && SED=sed
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+ case $host_os in
-+ openbsd*)
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
+- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
-+ *)
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
-+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
+- ;;
+- esac
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++dnl
++AC_LIBTOOL_SYS_MAX_CMD_LEN
++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++AC_LIBTOOL_OBJDIR
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-+_LT_CC_BASENAME([$compiler])
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++_LT_AC_PROG_ECHO_BACKSLASH
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
@@ -1677,24 +2039,25 @@
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-- fi
++case $host_os in
++aix3*)
++ # AIX sometimes has problems with the GCC collect2 program. For some
++ # reason, if we set the COLLECT_NAMES environment variable, the problems
++ # vanish in a puff of smoke.
++ if test "X${COLLECT_NAMES+set}" != Xset; then
++ COLLECT_NAMES=
++ export COLLECT_NAMES
+ fi
-done
-rm -rf conftest.dir
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+ AC_PATH_MAGIC
-+ fi
-+ ;;
-+esac
-
+-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-+_LT_REQUIRED_DARWIN_CHECKS
++ ;;
++esac
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
@@ -1702,9 +2065,10 @@
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl you should install foo.schemas files
-dnl
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-+enable_win32_dll=yes, enable_win32_dll=no)
++# Sed substitution that helps us do robust quoting. It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e 1s/^X//'
++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
@@ -1713,43 +2077,40 @@
- else
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
- fi
-+AC_ARG_ENABLE([libtool-lock],
-+ [AC_HELP_STRING([--disable-libtool-lock],
-+ [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
- AC_ARG_WITH(gconf-source,
- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-+AC_ARG_WITH([pic],
-+ [AC_HELP_STRING([--with-pic],
-+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+ [pic_mode="$withval"],
-+ [pic_mode=default])
-+test -z "$pic_mode" && pic_mode=default
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+# Use C for the default configuration in the libtool script
-+tagname=
-+AC_LIBTOOL_LANG_C_CONFIG
-+_LT_AC_TAGCONFIG
-+])# AC_LIBTOOL_SETUP
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
- fi
++# Constants:
++rm="rm -f"
- AC_ARG_WITH(gconf-schema-file-dir,
- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
-+# _LT_AC_SYS_COMPILER
-+# -------------------
-+AC_DEFUN([_LT_AC_SYS_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
- AC_ARG_ENABLE(schemas-install,
- [ --disable-schemas-install Disable the schemas installation],
@@ -1758,28 +2119,10 @@
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
- esac])
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_AC_SYS_COMPILER
-+
-+
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-+AC_DEFUN([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+ case $cc_temp in
-+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+ \-*) ;;
-+ *) break;;
-+ esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- ])
+-])
++AC_CHECK_TOOL(AR, ar, false)
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -1813,6 +2156,8 @@
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
-dnl
-dnl We go to great lengths to make sure that aclocal won't
@@ -1825,18 +2170,23 @@
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+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*
-+])# _LT_COMPILER_BOILERPLATE
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
-# GLIB_LC_MESSAGES
-#--------------------
@@ -1851,6 +2201,10 @@
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
@@ -1865,7 +2219,12 @@
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
-- *)
++if test -n "$RANLIB"; then
++ case $host_os in
++ openbsd*)
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ ;;
+ *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
@@ -1874,77 +2233,7 @@
- ac_cv_path_$1="$ac_dir/$ac_word"
- break
- fi
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+AC_DEFUN([_LT_LINKER_BOILERPLATE],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+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*
-+])# _LT_LINKER_BOILERPLATE
-+
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# --------------------------
-+# Check for some things on darwin
-+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-+ case $host_os in
-+ rhapsody* | darwin*)
-+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+
-+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+ [lt_cv_apple_cc_single_mod=no
-+ if test -z "${LT_MULTI_MODULE}"; then
-+ # By default we will add the -single_module flag. You can override
-+ # by either setting the environment variable LT_MULTI_MODULE
-+ # non-empty at configure time, or by adding -multi_module to the
-+ # link flags.
-+ echo "int foo(void){return 1;}" > conftest.c
-+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+ -dynamiclib ${wl}-single_module conftest.c
-+ if test -f libconftest.dylib; then
-+ lt_cv_apple_cc_single_mod=yes
-+ rm -rf libconftest.dylib*
-+ fi
-+ rm conftest.c
-+ fi])
-+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+ [lt_cv_ld_exported_symbols_list],
-+ [lt_cv_ld_exported_symbols_list=no
-+ save_LDFLAGS=$LDFLAGS
-+ echo "_main" > conftest.sym
-+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+ [lt_cv_ld_exported_symbols_list=yes],
-+ [lt_cv_ld_exported_symbols_list=no])
-+ LDFLAGS="$save_LDFLAGS"
-+ ])
-+ case $host_os in
-+ rhapsody* | darwin1.[[0123]])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ darwin*)
-+ # if running on 10.5 or later, the deployment target defaults
-+ # to the OS version, if on x86, and 10.4, the deployment
-+ # target defaults to 10.4. Don't you love it?
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ 10.[[012]]*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ 10.*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ esac
-+ ;;
-+ esac
-+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+ _lt_dar_single_mod='$single_module'
- fi
+- fi
- done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
@@ -1958,21 +2247,13 @@
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
--fi
--AC_SUBST($1)dnl
-+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+ else
-+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+ fi
-+ if test "$DSYMUTIL" != ":"; then
-+ _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+ else
-+ _lt_dsymutil=
-+ fi
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
- ])
++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+-AC_SUBST($1)dnl
+-])
-# GLIB_WITH_NLS
-#-----------------
@@ -1980,50 +2261,29 @@
- dnl NLS is obligatory
- [USE_NLS=yes
- AC_SUBST(USE_NLS)
-+# _LT_AC_SYS_LIBPATH_AIX
-+# ----------------------
-+# Links a minimal program and checks the executable
-+# for the system default hardcoded library path. In most cases,
-+# this is /usr/lib:/lib, but when the MPI compilers are used
-+# the location of the communication and MPI libs are included too.
-+# If we don't find anything, use the default library path according
-+# to the aix ld manual.
-+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# 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"`
-+fi],[])
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+])# _LT_AC_SYS_LIBPATH_AIX
++_LT_CC_BASENAME([$compiler])
- gt_cv_have_gettext=no
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++ AC_PATH_MAGIC
++ fi
++ ;;
++esac
- CATOBJEXT=NONE
- XGETTEXT=:
- INTLLIBS=
-+# _LT_AC_SHELL_INIT(ARG)
-+# ----------------------
-+AC_DEFUN([_LT_AC_SHELL_INIT],
-+[ifdef([AC_DIVERSION_NOTICE],
-+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+ [AC_DIVERT_PUSH(NOTICE)])
-+$1
-+AC_DIVERT_POP
-+])# _LT_AC_SHELL_INIT
++_LT_REQUIRED_DARWIN_CHECKS
- AC_CHECK_HEADER(libintl.h,
- [gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
- #
- # First check in libc
@@ -2051,7 +2311,11 @@
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
--
++AC_ARG_ENABLE([libtool-lock],
++ [AC_HELP_STRING([--disable-libtool-lock],
++ [avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
- #
- # If we don't have everything we want, check in libintl
- #
@@ -2063,14 +2327,12 @@
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
-+# _LT_AC_PROG_ECHO_BACKSLASH
-+# --------------------------
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
-+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-+[_LT_AC_SHELL_INIT([
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
++AC_ARG_WITH([pic],
++ [AC_HELP_STRING([--with-pic],
++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++ [pic_mode="$withval"],
++ [pic_mode=default])
++test -z "$pic_mode" && pic_mode=default
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
@@ -2082,12 +2344,11 @@
- :,-liconv)],
- :,-liconv)
- fi
-+case X$ECHO in
-+X*--fallback-echo)
-+ # Remove one level of quotation (which was required for Make).
-+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+ ;;
-+esac
++# Use C for the default configuration in the libtool script
++tagname=
++AC_LIBTOOL_LANG_C_CONFIG
++_LT_AC_TAGCONFIG
++])# AC_LIBTOOL_SETUP
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
@@ -2100,20 +2361,6 @@
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
-+echo=${ECHO-echo}
-+if test "X[$]1" = X--no-reexec; then
-+ # Discard the --no-reexec flag, and continue.
-+ shift
-+elif test "X[$]1" = X--fallback-echo; then
-+ # Avoid inline document here, it may be left over
-+ :
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-+ # Yippee, $echo works!
-+ :
-+else
-+ # Restart under the correct shell.
-+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+fi
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
@@ -2125,14 +2372,10 @@
- fi
- fi
- fi
-+if test "X[$]1" = X--fallback-echo; then
-+ # used as fallback echo
-+ shift
-+ cat <<EOF
-+[$]*
-+EOF
-+ exit 0
-+fi
++# _LT_AC_SYS_COMPILER
++# -------------------
++AC_DEFUN([_LT_AC_SYS_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
@@ -2198,26 +2441,15 @@
- fi
- fi
- ])
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
- if test "$gt_cv_have_gettext" = "yes" ; then
- AC_DEFINE(ENABLE_NLS, 1,
- [always defined to indicate that i18n is enabled])
-+if test -z "$ECHO"; then
-+if test "X${echo_test_string+set}" != Xset; then
-+# find a string as large as possible, as long as the shell can cope with it
-+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+ echo_test_string=`eval $cmd` &&
-+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-+ then
-+ break
- fi
-+ done
-+fi
+- fi
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
@@ -2230,6 +2462,385 @@
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
+- fi
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_AC_SYS_COMPILER
+
+- # We need to process the po/ directory.
+- POSUB=po
+
+- AC_OUTPUT_COMMANDS(
+- [case "$CONFIG_FILES" in *po/Makefile.in*)
+- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+- esac])
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++ case $cc_temp in
++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
+
+- dnl These rules are solely for the distribution goal. While doing this
+- dnl we only have to keep exactly one list of the available catalogs
+- dnl in configure.in.
+- for lang in $ALL_LINGUAS; do
+- GMOFILES="$GMOFILES $lang.gmo"
+- POFILES="$POFILES $lang.po"
+- done
+
+- dnl Make all variables we use known to autoconf.
+- AC_SUBST(CATALOGS)
+- AC_SUBST(CATOBJEXT)
+- AC_SUBST(DATADIRNAME)
+- AC_SUBST(GMOFILES)
+- AC_SUBST(INSTOBJEXT)
+- AC_SUBST(INTLLIBS)
+- AC_SUBST(PO_IN_DATADIR_TRUE)
+- AC_SUBST(PO_IN_DATADIR_FALSE)
+- AC_SUBST(POFILES)
+- AC_SUBST(POSUB)
+- ])
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++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*
++])# _LT_COMPILER_BOILERPLATE
+
+-# AM_GLIB_GNU_GETTEXT
+-# -------------------
+-# Do checks necessary for use of gettext. If a suitable implementation
+-# of gettext is found in either in libintl or in the C library,
+-# it will set INTLLIBS to the libraries needed for use of gettext
+-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+-# on various variables needed by the Makefile.in.in installed by
+-# glib-gettextize.
+-dnl
+-glib_DEFUN([GLIB_GNU_GETTEXT],
+- [AC_REQUIRE([AC_PROG_CC])dnl
+- AC_REQUIRE([AC_HEADER_STDC])dnl
+-
+- GLIB_LC_MESSAGES
+- GLIB_WITH_NLS
+
+- if test "$gt_cv_have_gettext" = "yes"; then
+- if test "x$ALL_LINGUAS" = "x"; then
+- LINGUAS=
+- else
+- AC_MSG_CHECKING(for catalogs to be installed)
+- NEW_LINGUAS=
+- for presentlang in $ALL_LINGUAS; do
+- useit=no
+- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+- desiredlanguages="$LINGUAS"
+- else
+- desiredlanguages="$ALL_LINGUAS"
+- fi
+- for desiredlang in $desiredlanguages; do
+- # Use the presentlang catalog if desiredlang is
+- # a. equal to presentlang, or
+- # b. a variant of presentlang (because in this case,
+- # presentlang can be used as a fallback for messages
+- # which are not translated in the desiredlang catalog).
+- case "$desiredlang" in
+- "$presentlang"*) useit=yes;;
+- esac
+- done
+- if test $useit = yes; then
+- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+- fi
+- done
+- LINGUAS=$NEW_LINGUAS
+- AC_MSG_RESULT($LINGUAS)
+- fi
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++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*
++])# _LT_LINKER_BOILERPLATE
+
+- dnl Construct list of names of catalog files to be constructed.
+- if test -n "$LINGUAS"; then
+- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+- fi
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
+ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
+
+- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+- dnl Try to locate is.
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+- fi
+- AC_SUBST(MKINSTALLDIRS)
++# _LT_AC_SYS_LIBPATH_AIX
++# ----------------------
++# Links a minimal program and checks the executable
++# for the system default hardcoded library path. In most cases,
++# this is /usr/lib:/lib, but when the MPI compilers are used
++# the location of the communication and MPI libs are included too.
++# If we don't find anything, use the default library path according
++# to the aix ld manual.
++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++# 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"`
++fi],[])
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++])# _LT_AC_SYS_LIBPATH_AIX
+
+- dnl Generate list of files to be processed by xgettext which will
+- dnl be included in po/Makefile.
+- test -d po || mkdir po
+- if test "x$srcdir" != "x."; then
+- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+- posrcprefix="$srcdir/"
+- else
+- posrcprefix="../$srcdir/"
+- fi
+- else
+- posrcprefix="../"
+- fi
+- rm -f po/POTFILES
+- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+- < $srcdir/po/POTFILES.in > po/POTFILES
+- ])
+
+-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+-# -------------------------------
+-# Define VARIABLE to the location where catalog files will
+-# be installed by po/Makefile.
+-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+-glib_save_prefix="$prefix"
+-glib_save_exec_prefix="$exec_prefix"
+-glib_save_datarootdir="$datarootdir"
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
+- localedir=`eval echo "${libdir}/locale"`
+-else
+- localedir=`eval echo "${datadir}/locale"`
+-fi
+-prefix="$glib_save_prefix"
+-exec_prefix="$glib_save_exec_prefix"
+-datarootdir="$glib_save_datarootdir"
+-AC_DEFINE_UNQUOTED($1, "$localedir",
+- [Define the location where the catalogs will be installed])
+-])
++# _LT_AC_SHELL_INIT(ARG)
++# ----------------------
++AC_DEFUN([_LT_AC_SHELL_INIT],
++[ifdef([AC_DIVERSION_NOTICE],
++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++ [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])# _LT_AC_SHELL_INIT
+
+-dnl
+-dnl Now the definitions that aclocal will find
+-dnl
+-ifdef(glib_configure_in,[],[
+-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+-])dnl
+
+-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+-#
+-# Create a temporary file with TEST-FILE as its contents and pass the
+-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+-# 0 and perform ACTION-IF-FAIL for any other exit status.
+-AC_DEFUN([GLIB_RUN_PROG],
+-[cat >conftest.foo <<_ACEOF
+-$2
+-_ACEOF
+-if AC_RUN_LOG([$1 conftest.foo]); then
+- m4_ifval([$3], [$3], [:])
+-m4_ifvaln([$4], [else $4])dnl
+-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+-fi])
++# _LT_AC_PROG_ECHO_BACKSLASH
++# --------------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
++[_LT_AC_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
+
++case X$ECHO in
++X*--fallback-echo)
++ # Remove one level of quotation (which was required for Make).
++ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++ ;;
++esac
+
+-# gnome-common.m4
+-#
++echo=${ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++ # Discard the --no-reexec flag, and continue.
++ shift
++elif test "X[$]1" = X--fallback-echo; then
++ # Avoid inline document here, it may be left over
++ :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++ # Yippee, $echo works!
++ :
++else
++ # Restart under the correct shell.
++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
++fi
+
+-dnl GNOME_COMMON_INIT
++if test "X[$]1" = X--fallback-echo; then
++ # used as fallback echo
++ shift
++ cat <<EOF
++[$]*
++EOF
++ exit 0
++fi
+
+-AC_DEFUN([GNOME_COMMON_INIT],
+-[
+- dnl this macro should come after AC_CONFIG_MACRO_DIR
+- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+- dnl ensure that when the Automake generated makefile calls aclocal,
+- dnl it honours the $ACLOCAL_FLAGS environment variable
+- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+- if test -n "$ac_macro_dir"; then
+- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+- fi
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
++ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++ then
++ break
++ fi
++ done
++fi
+
+- AC_SUBST([ACLOCAL_AMFLAGS])
+-])
+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
@@ -2240,7 +2851,13 @@
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
-+
+
+-AC_DEFUN([GNOME_DEBUG_CHECK],
+-[
+- AC_ARG_ENABLE([debug],
+- AC_HELP_STRING([--enable-debug],
+- [turn on debugging]),,
+- [enable_debug=no])
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
@@ -2250,12 +2867,15 @@
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ echo="$dir/echo"
+ break
- fi
++ fi
+ done
+ IFS="$lt_save_ifs"
-- # We need to process the po/ directory.
-- POSUB=po
+- if test x$enable_debug = xyes ; then
+- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
+- [Enable additional debugging at the expense of performance and size])
+- fi
+-])
+ if test "X$echo" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
@@ -2297,18 +2917,12 @@
+ # maybe with a smaller string...
+ prev=:
-- AC_OUTPUT_COMMANDS(
-- [case "$CONFIG_FILES" in *po/Makefile.in*)
-- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-- esac])
--
-- dnl These rules are solely for the distribution goal. While doing this
-- dnl we only have to keep exactly one list of the available catalogs
-- dnl in configure.in.
-- for lang in $ALL_LINGUAS; do
-- GMOFILES="$GMOFILES $lang.gmo"
-- POFILES="$POFILES $lang.po"
-- done
+-dnl GNOME_MAINTAINER_MODE_DEFINES ()
+-dnl define DISABLE_DEPRECATED
+-dnl
+-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+-[
+- AC_REQUIRE([AM_MAINTAINER_MODE])
+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+ then
@@ -2317,48 +2931,32 @@
+ prev="$cmd"
+ done
-- dnl Make all variables we use known to autoconf.
-- AC_SUBST(CATALOGS)
-- AC_SUBST(CATOBJEXT)
-- AC_SUBST(DATADIRNAME)
-- AC_SUBST(GMOFILES)
-- AC_SUBST(INSTOBJEXT)
-- AC_SUBST(INTLLIBS)
-- AC_SUBST(PO_IN_DATADIR_TRUE)
-- AC_SUBST(PO_IN_DATADIR_FALSE)
-- AC_SUBST(POFILES)
-- AC_SUBST(POSUB)
-- ])
+- if test $USE_MAINTAINER_MODE = yes; then
+- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
+ if test "$prev" != 'sed 50q "[$]0"'; then
+ echo_test_string=`eval $prev`
+ export echo_test_string
+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+ else
+ else
+- DISABLE_DEPRECATED=""
+ # Oops. We lost completely, so just stick with echo.
+ echo=echo
-+ fi
+ fi
+- AC_SUBST(DISABLE_DEPRECATED)
+-])
+ fi
+ fi
+ fi
+fi
+fi
--# AM_GLIB_GNU_GETTEXT
--# -------------------
--# Do checks necessary for use of gettext. If a suitable implementation
--# of gettext is found in either in libintl or in the C library,
--# it will set INTLLIBS to the libraries needed for use of gettext
--# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
--# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
--# on various variables needed by the Makefile.in.in installed by
--# glib-gettextize.
--dnl
--glib_DEFUN([GLIB_GNU_GETTEXT],
-- [AC_REQUIRE([AC_PROG_CC])dnl
-- AC_REQUIRE([AC_HEADER_STDC])dnl
--
-- GLIB_LC_MESSAGES
-- GLIB_WITH_NLS
+-dnl GNOME_COMPILE_WARNINGS
+-dnl Turn on many useful compiler warnings
+-dnl For now, only works on GCC
+-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+- dnl ******************************
+- dnl More compiler warnings
+- dnl ******************************
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+ECHO=$echo
@@ -2366,56 +2964,20 @@
+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
-- if test "$gt_cv_have_gettext" = "yes"; then
-- if test "x$ALL_LINGUAS" = "x"; then
-- LINGUAS=
-- else
-- AC_MSG_CHECKING(for catalogs to be installed)
-- NEW_LINGUAS=
-- for presentlang in $ALL_LINGUAS; do
-- useit=no
-- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
-- desiredlanguages="$LINGUAS"
-- else
-- desiredlanguages="$ALL_LINGUAS"
-- fi
-- for desiredlang in $desiredlanguages; do
-- # Use the presentlang catalog if desiredlang is
-- # a. equal to presentlang, or
-- # b. a variant of presentlang (because in this case,
-- # presentlang can be used as a fallback for messages
-- # which are not translated in the desiredlang catalog).
-- case "$desiredlang" in
-- "$presentlang"*) useit=yes;;
-- esac
-- done
-- if test $useit = yes; then
-- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
-- fi
-- done
-- LINGUAS=$NEW_LINGUAS
-- AC_MSG_RESULT($LINGUAS)
-- fi
+- AC_ARG_ENABLE(compile-warnings,
+- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+- [Turn on compiler warnings]),,
+- [enable_compile_warnings="m4_default([$1],[yes])"])
+AC_SUBST(ECHO)
+])])# _LT_AC_PROG_ECHO_BACKSLASH
-- dnl Construct list of names of catalog files to be constructed.
-- if test -n "$LINGUAS"; then
-- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-- fi
-- fi
-
-- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
-- dnl Try to locate is.
-- MKINSTALLDIRS=
-- if test -n "$ac_aux_dir"; then
-- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-- fi
-- if test -z "$MKINSTALLDIRS"; then
-- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-- fi
-- AC_SUBST(MKINSTALLDIRS)
+- warnCFLAGS=
+- if test "x$GCC" != xyes; then
+- enable_compile_warnings=no
+- fi
+
+- warning_flags=
+- realsave_CFLAGS="$CFLAGS"
+# _LT_AC_LOCK
+# -----------
+AC_DEFUN([_LT_AC_LOCK],
@@ -2424,15 +2986,42 @@
+ [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-- dnl Generate list of files to be processed by xgettext which will
-- dnl be included in po/Makefile.
-- test -d po || mkdir po
-- if test "x$srcdir" != "x."; then
-- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-- posrcprefix="$srcdir/"
-- else
-- posrcprefix="../$srcdir/"
-- fi
+- case "$enable_compile_warnings" in
+- no)
+- warning_flags=
+- ;;
+- minimum)
+- warning_flags="-Wall"
+- ;;
+- yes)
+- warning_flags="-Wall -Wmissing-prototypes"
+- ;;
+- maximum|error)
+- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+- CFLAGS="$warning_flags $CFLAGS"
+- for option in -Wno-sign-compare; do
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS $option"
+- AC_MSG_CHECKING([whether gcc understands $option])
+- AC_TRY_COMPILE([], [],
+- has_option=yes,
+- has_option=no,)
+- CFLAGS="$SAVE_CFLAGS"
+- AC_MSG_RESULT($has_option)
+- if test $has_option = yes; then
+- warning_flags="$warning_flags $option"
+- fi
+- unset has_option
+- unset SAVE_CFLAGS
+- done
+- unset option
+- if test "$enable_compile_warnings" = "error" ; then
+- warning_flags="$warning_flags -Werror"
+- fi
+- ;;
+- *)
+- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+- ;;
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
@@ -2447,8 +3036,62 @@
+ *ELF-64*)
+ HPUX_IA64_MODE="64"
+ ;;
-+ esac
-+ fi
+ esac
+- CFLAGS="$realsave_CFLAGS"
+- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+- AC_MSG_RESULT($warning_flags)
+-
+- AC_ARG_ENABLE(iso-c,
+- AC_HELP_STRING([--enable-iso-c],
+- [Try to warn if code is not ISO C ]),,
+- [enable_iso_c=no])
+-
+- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+- complCFLAGS=
+- if test "x$enable_iso_c" != "xno"; then
+- if test "x$GCC" = "xyes"; then
+- case " $CFLAGS " in
+- *[\ \ ]-ansi[\ \ ]*) ;;
+- *) complCFLAGS="$complCFLAGS -ansi" ;;
+- esac
+- case " $CFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) complCFLAGS="$complCFLAGS -pedantic" ;;
+- esac
+- fi
+- fi
+- AC_MSG_RESULT($complCFLAGS)
+-
+- WARN_CFLAGS="$warning_flags $complCFLAGS"
+- AC_SUBST(WARN_CFLAGS)
+-])
+-
+-dnl For C++, do basically the same thing.
+-
+-AC_DEFUN([GNOME_CXX_WARNINGS],[
+- AC_ARG_ENABLE(cxx-warnings,
+- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+- [Turn on compiler warnings.]),,
+- [enable_cxx_warnings="m4_default([$1],[minimum])"])
+-
+- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+- warnCXXFLAGS=
+- if test "x$GXX" != xyes; then
+- enable_cxx_warnings=no
+ fi
+- if test "x$enable_cxx_warnings" != "xno"; then
+- if test "x$GXX" = "xyes"; then
+- case " $CXXFLAGS " in
+- *[\ \ ]-Wall[\ \ ]*) ;;
+- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+- esac
+-
+- ## -W is not all that useful. And it cannot be controlled
+- ## with individual -Wno-xxx flags, unlike -Wall
+- if test "x$enable_cxx_warnings" = "xyes"; then
+- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
+- fi
+- fi
+ rm -rf conftest*
+ ;;
+*-*-irix6*)
@@ -2467,8 +3110,7 @@
+ LD="${LD-ld} -melf64bmip"
+ ;;
+ esac
- else
-- posrcprefix="../"
++ else
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -32"
@@ -2480,102 +3122,24 @@
+ LD="${LD-ld} -64"
+ ;;
+ esac
- fi
-- rm -f po/POTFILES
-- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-- < $srcdir/po/POTFILES.in > po/POTFILES
-- ])
++ fi
+ fi
+- AC_MSG_RESULT($warnCXXFLAGS)
-
--# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
--# -------------------------------
--# Define VARIABLE to the location where catalog files will
--# be installed by po/Makefile.
--glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
--[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
--glib_save_prefix="$prefix"
--glib_save_exec_prefix="$exec_prefix"
--glib_save_datarootdir="$datarootdir"
--test "x$prefix" = xNONE && prefix=$ac_default_prefix
--test "x$exec_prefix" = xNONE && exec_prefix=$prefix
--datarootdir=`eval echo "${datarootdir}"`
--if test "x$CATOBJEXT" = "x.mo" ; then
-- localedir=`eval echo "${libdir}/locale"`
--else
-- localedir=`eval echo "${datadir}/locale"`
--fi
--prefix="$glib_save_prefix"
--exec_prefix="$glib_save_exec_prefix"
--datarootdir="$glib_save_datarootdir"
--AC_DEFINE_UNQUOTED($1, "$localedir",
-- [Define the location where the catalogs will be installed])
--])
--
--dnl
--dnl Now the definitions that aclocal will find
--dnl
--ifdef(glib_configure_in,[],[
--AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
--AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
--])dnl
--
--# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
--#
--# Create a temporary file with TEST-FILE as its contents and pass the
--# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
--# 0 and perform ACTION-IF-FAIL for any other exit status.
--AC_DEFUN([GLIB_RUN_PROG],
--[cat >conftest.foo <<_ACEOF
--$2
--_ACEOF
--if AC_RUN_LOG([$1 conftest.foo]); then
-- m4_ifval([$3], [$3], [:])
--m4_ifvaln([$4], [else $4])dnl
--echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
--sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
--fi])
--
--
--# gnome-common.m4
--#
--
--dnl GNOME_COMMON_INIT
--
--AC_DEFUN([GNOME_COMMON_INIT],
--[
-- dnl this macro should come after AC_CONFIG_MACRO_DIR
-- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
--
-- dnl ensure that when the Automake generated makefile calls aclocal,
-- dnl it honours the $ACLOCAL_FLAGS environment variable
-- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-- if test -n "$ac_macro_dir"; then
-- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
- fi
+- AC_ARG_ENABLE(iso-cxx,
+- AC_HELP_STRING([--enable-iso-cxx],
+- [Try to warn if code is not ISO C++ ]),,
+- [enable_iso_cxx=no])
+ rm -rf conftest*
+ ;;
-- AC_SUBST([ACLOCAL_AMFLAGS])
--])
--
--AC_DEFUN([GNOME_DEBUG_CHECK],
--[
-- AC_ARG_ENABLE([debug],
-- AC_HELP_STRING([--enable-debug],
-- [turn on debugging]),,
-- [enable_debug=no])
--
-- if test x$enable_debug = xyes ; then
-- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-- [Enable additional debugging at the expense of performance and size])
-- fi
--])
--
--dnl GNOME_MAINTAINER_MODE_DEFINES ()
--dnl define DISABLE_DEPRECATED
--dnl
--AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
--[
-- AC_REQUIRE([AM_MAINTAINER_MODE])
+- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+- complCXXFLAGS=
+- if test "x$enable_iso_cxx" != "xno"; then
+- if test "x$GXX" = "xyes"; then
+- case " $CXXFLAGS " in
+- *[\ \ ]-ansi[\ \ ]*) ;;
+- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
@@ -2618,17 +3182,16 @@
+ sparc*-*linux*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
-+ esac
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
-- if test $USE_MAINTAINER_MODE = yes; then
-- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"
-- else
-- DISABLE_DEPRECATED=""
+- case " $CXXFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
@@ -2653,24 +3216,21 @@
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
- fi
-- AC_SUBST(DISABLE_DEPRECATED)
--])
++ fi
+ ;;
-+ esac
+ esac
+- fi
+- fi
+- AC_MSG_RESULT($complCXXFLAGS)
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
--dnl GNOME_COMPILE_WARNINGS
--dnl Turn on many useful compiler warnings
--dnl For now, only works on GCC
--AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-- dnl ******************************
-- dnl More compiler warnings
-- dnl ******************************
+- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+- AC_SUBST(WARN_CXXFLAGS)
+-])
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -2680,61 +3240,21 @@
+ ])
+esac
-- AC_ARG_ENABLE(compile-warnings,
-- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-- [Turn on compiler warnings]),,
-- [enable_compile_warnings="m4_default([$1],[yes])"])
+-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+need_locks="$enable_libtool_lock"
-- warnCFLAGS=
-- if test "x$GCC" != xyes; then
-- enable_compile_warnings=no
-- fi
+-# serial 48 AC_PROG_LIBTOOL
+])# _LT_AC_LOCK
-- warning_flags=
-- realsave_CFLAGS="$CFLAGS"
-
-- case "$enable_compile_warnings" in
-- no)
-- warning_flags=
-- ;;
-- minimum)
-- warning_flags="-Wall"
-- ;;
-- yes)
-- warning_flags="-Wall -Wmissing-prototypes"
-- ;;
-- maximum|error)
-- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-- CFLAGS="$warning_flags $CFLAGS"
-- for option in -Wno-sign-compare; do
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS $option"
-- AC_MSG_CHECKING([whether gcc understands $option])
-- AC_TRY_COMPILE([], [],
-- has_option=yes,
-- has_option=no,)
-- CFLAGS="$SAVE_CFLAGS"
-- AC_MSG_RESULT($has_option)
-- if test $has_option = yes; then
-- warning_flags="$warning_flags $option"
-- fi
-- unset has_option
-- unset SAVE_CFLAGS
-- done
-- unset option
-- if test "$enable_compile_warnings" = "error" ; then
-- warning_flags="$warning_flags -Werror"
-- fi
-- ;;
-- *)
-- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-- ;;
-- esac
-- CFLAGS="$realsave_CFLAGS"
-- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-- AC_MSG_RESULT($warning_flags)
+
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+- [],
+- [m4_define([AC_PROVIDE_IFELSE],
+- [m4_ifdef([AC_PROVIDE_$1],
+- [$2], [$3])])])
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
@@ -2772,10 +3292,6 @@
+ $rm conftest*
+])
-- AC_ARG_ENABLE(iso-c,
-- AC_HELP_STRING([--enable-iso-c],
-- [Try to warn if code is not ISO C ]),,
-- [enable_iso_c=no])
+if test x"[$]$2" = xyes; then
+ ifelse([$5], , :, [$5])
+else
@@ -2783,24 +3299,39 @@
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
-- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-- complCFLAGS=
-- if test "x$enable_iso_c" != "xno"; then
-- if test "x$GCC" = "xyes"; then
-- case " $CFLAGS " in
-- *[\ \ ]-ansi[\ \ ]*) ;;
-- *) complCFLAGS="$complCFLAGS -ansi" ;;
-- esac
-- case " $CFLAGS " in
-- *[\ \ ]-pedantic[\ \ ]*) ;;
-- *) complCFLAGS="$complCFLAGS -pedantic" ;;
-- esac
-- fi
-- fi
-- AC_MSG_RESULT($complCFLAGS)
-
-- WARN_CFLAGS="$warning_flags $complCFLAGS"
-- AC_SUBST(WARN_CFLAGS)
+-# AC_PROG_LIBTOOL
+-# ---------------
+-AC_DEFUN([AC_PROG_LIBTOOL],
+-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+- AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [AC_LIBTOOL_CXX],
+- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+- ])])
+-dnl And a similar setup for Fortran 77 support
+- AC_PROVIDE_IFELSE([AC_PROG_F77],
+- [AC_LIBTOOL_F77],
+- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+-])])
+
+-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+- [AC_LIBTOOL_GCJ],
+- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+- [AC_LIBTOOL_GCJ],
+- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+- [AC_LIBTOOL_GCJ],
+- [ifdef([AC_PROG_GCJ],
+- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+- ifdef([A][M_PROG_GCJ],
+- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+- ifdef([LT_AC_PROG_GCJ],
+- [define([LT_AC_PROG_GCJ],
+- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+-])])# AC_PROG_LIBTOOL
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
@@ -2829,9 +3360,8 @@
+ fi
+ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
- ])
-
--dnl For C++, do basically the same thing.
++])
+
+if test x"[$]$2" = xyes; then
+ ifelse([$4], , :, [$4])
+else
@@ -2839,32 +3369,16 @@
+fi
+])# AC_LIBTOOL_LINKER_OPTION
--AC_DEFUN([GNOME_CXX_WARNINGS],[
-- AC_ARG_ENABLE(cxx-warnings,
-- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-- [Turn on compiler warnings.]),,
-- [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
-- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-- warnCXXFLAGS=
-- if test "x$GXX" != xyes; then
-- enable_cxx_warnings=no
-- fi
-- if test "x$enable_cxx_warnings" != "xno"; then
-- if test "x$GXX" = "xyes"; then
-- case " $CXXFLAGS " in
-- *[\ \ ]-Wall[\ \ ]*) ;;
-- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-- esac
--
-- ## -W is not all that useful. And it cannot be controlled
-- ## with individual -Wno-xxx flags, unlike -Wall
-- if test "x$enable_cxx_warnings" = "xyes"; then
-- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-- fi
-- fi
-- fi
-- AC_MSG_RESULT($warnCXXFLAGS)
+-# _AC_PROG_LIBTOOL
+-# ----------------
+-AC_DEFUN([_AC_PROG_LIBTOOL],
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
@@ -2874,10 +3388,9 @@
+ i=0
+ teststring="ABCD"
-- AC_ARG_ENABLE(iso-cxx,
-- AC_HELP_STRING([--enable-iso-cxx],
-- [Try to warn if code is not ISO C++ ]),,
-- [enable_iso_cxx=no])
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -2887,14 +3400,9 @@
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
-- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-- complCXXFLAGS=
-- if test "x$enable_iso_cxx" != "xno"; then
-- if test "x$GXX" = "xyes"; then
-- case " $CXXFLAGS " in
-- *[\ \ ]-ansi[\ \ ]*) ;;
-- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-- esac
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
@@ -2902,13 +3410,6 @@
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
-- case " $CXXFLAGS " in
-- *[\ \ ]-pedantic[\ \ ]*) ;;
-- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-- esac
-- fi
-- fi
-- AC_MSG_RESULT($complCXXFLAGS)
+ cygwin* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
@@ -2920,16 +3421,31 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
-- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-- AC_SUBST(WARN_CXXFLAGS)
--])
+-# AC_LIBTOOL_SETUP
+-# ----------------
+-AC_DEFUN([AC_LIBTOOL_SETUP],
+-[AC_PREREQ(2.50)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
--# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
+-dnl
+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
@@ -2944,12 +3460,16 @@
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
--# serial 48 AC_PROG_LIBTOOL
+-AC_LIBTOOL_SYS_MAX_CMD_LEN
+-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-AC_LIBTOOL_OBJDIR
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-_LT_AC_PROG_ECHO_BACKSLASH
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -3006,54 +3526,34 @@
+fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
--# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
--# -----------------------------------------------------------
--# If this macro is not defined by Autoconf, define it here.
--m4_ifdef([AC_PROVIDE_IFELSE],
-- [],
-- [m4_define([AC_PROVIDE_IFELSE],
-- [m4_ifdef([AC_PROVIDE_$1],
-- [$2], [$3])])])
-
+-case $host_os in
+-aix3*)
+- # AIX sometimes has problems with the GCC collect2 program. For some
+- # reason, if we set the COLLECT_NAMES environment variable, the problems
+- # vanish in a puff of smoke.
+- if test "X${COLLECT_NAMES+set}" != Xset; then
+- COLLECT_NAMES=
+- export COLLECT_NAMES
+- fi
+- ;;
+-esac
+
+-# Sed substitution that helps us do robust quoting. It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
+-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
+[AC_CHECK_HEADERS(dlfcn.h)dnl
+])# _LT_AC_CHECK_DLFCN
--# AC_PROG_LIBTOOL
--# ---------------
--AC_DEFUN([AC_PROG_LIBTOOL],
--[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
--dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
--dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-- AC_PROVIDE_IFELSE([AC_PROG_CXX],
-- [AC_LIBTOOL_CXX],
-- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-- ])])
--dnl And a similar setup for Fortran 77 support
-- AC_PROVIDE_IFELSE([AC_PROG_F77],
-- [AC_LIBTOOL_F77],
-- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
--])])
-
--dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
--dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
--dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-- [AC_LIBTOOL_GCJ],
-- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-- [AC_LIBTOOL_GCJ],
-- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-- [AC_LIBTOOL_GCJ],
-- [ifdef([AC_PROG_GCJ],
-- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-- ifdef([A][M_PROG_GCJ],
-- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-- ifdef([LT_AC_PROG_GCJ],
-- [define([LT_AC_PROG_GCJ],
-- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
--])])# AC_PROG_LIBTOOL
+-# Same as above, but do not quote variable references.
+-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
@@ -3068,21 +3568,19 @@
+[#line __oline__ "configure"
+#include "confdefs.h"
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
--# _AC_PROG_LIBTOOL
--# ----------------
--AC_DEFUN([_AC_PROG_LIBTOOL],
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+-# Constants:
+-rm="rm -f"
+#include <stdio.h>
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
@@ -3093,9 +3591,12 @@
+# endif
+#endif
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
+-# All known linkers require a `.a' archive for static linking (except MSVC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
@@ -3118,140 +3619,20 @@
+# endif
+#endif
--# Prevent multiple expansion
--define([AC_PROG_LIBTOOL], [])
--])# _AC_PROG_LIBTOOL
+-AC_CHECK_TOOL(AR, ar, false)
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
+#ifdef __cplusplus
+extern "C" void exit (int);
+#endif
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
+void fnord() { int i=42;}
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
-
--# AC_LIBTOOL_SETUP
--# ----------------
--AC_DEFUN([AC_LIBTOOL_SETUP],
--[AC_PREREQ(2.50)dnl
--AC_REQUIRE([AC_ENABLE_SHARED])dnl
--AC_REQUIRE([AC_ENABLE_STATIC])dnl
--AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_LD])dnl
--AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
--AC_REQUIRE([AC_PROG_NM])dnl
--
--AC_REQUIRE([AC_PROG_LN_S])dnl
--AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
--# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--AC_REQUIRE([AC_OBJEXT])dnl
--AC_REQUIRE([AC_EXEEXT])dnl
--dnl
--
--AC_LIBTOOL_SYS_MAX_CMD_LEN
--AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--AC_LIBTOOL_OBJDIR
--
--AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--_LT_AC_PROG_ECHO_BACKSLASH
-+ if (self)
-+ {
-+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+ /* dlclose (self); */
-+ }
-+ else
-+ puts (dlerror ());
-
--case $host_os in
--aix3*)
-- # AIX sometimes has problems with the GCC collect2 program. For some
-- # reason, if we set the COLLECT_NAMES environment variable, the problems
-- # vanish in a puff of smoke.
-- if test "X${COLLECT_NAMES+set}" != Xset; then
-- COLLECT_NAMES=
-- export COLLECT_NAMES
-+ exit (status);
-+}]
-+EOF
-+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-+ lt_status=$?
-+ case x$lt_status in
-+ x$lt_dlno_uscore) $1 ;;
-+ x$lt_dlneed_uscore) $2 ;;
-+ x$lt_dlunknown|x*) $3 ;;
-+ esac
-+ else :
-+ # compilation failed
-+ $3
- fi
-- ;;
--esac
--
--# Sed substitution that helps us do robust quoting. It backslashifies
--# metacharacters that are still active within double-quoted strings.
--Xsed='sed -e 1s/^X//'
--[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
--
--# Same as above, but do not quote variable references.
--[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
--
--# Constants:
--rm="rm -f"
-+fi
-+rm -fr conftest*
-+])# _LT_AC_TRY_DLOPEN_SELF
-
--# Global variables:
--default_ofile=libtool
--can_build_shared=yes
-
--# All known linkers require a `.a' archive for static linking (except MSVC,
--# which needs '.lib').
--libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
--ofile="$default_ofile"
--with_gnu_ld="$lt_cv_prog_gnu_ld"
-+# AC_LIBTOOL_DLOPEN_SELF
-+# ----------------------
-+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+ enable_dlopen=unknown
-+ enable_dlopen_self=unknown
-+ enable_dlopen_self_static=unknown
-+else
-+ lt_cv_dlopen=no
-+ lt_cv_dlopen_libs=
-
--AC_CHECK_TOOL(AR, ar, false)
--AC_CHECK_TOOL(RANLIB, ranlib, :)
--AC_CHECK_TOOL(STRIP, strip, :)
-+ case $host_os in
-+ beos*)
-+ lt_cv_dlopen="load_add_on"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ;;
-
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
-+ mingw* | pw32*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
@@ -3270,15 +3651,71 @@
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
++ if (self)
++ {
++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++ /* dlclose (self); */
++ }
++ else
++ puts (dlerror ());
+
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
++ exit (status);
++}]
++EOF
++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
++ lt_status=$?
++ case x$lt_status in
++ x$lt_dlno_uscore) $1 ;;
++ x$lt_dlneed_uscore) $2 ;;
++ x$lt_dlunknown|x*) $3 ;;
++ esac
++ else :
++ # compilation failed
++ $3
++ fi
++fi
++rm -fr conftest*
++])# _LT_AC_TRY_DLOPEN_SELF
++
++
++# AC_LIBTOOL_DLOPEN_SELF
++# ----------------------
++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
++ enable_dlopen=unknown
++ enable_dlopen_self=unknown
++ enable_dlopen_self_static=unknown
++else
++ lt_cv_dlopen=no
++ lt_cv_dlopen_libs=
+
+-if test -n "$RANLIB"; then
+ case $host_os in
+- openbsd*)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ beos*)
++ lt_cv_dlopen="load_add_on"
++ lt_cv_dlopen_libs=
++ lt_cv_dlopen_self=yes
+ ;;
++
++ mingw* | pw32*)
++ lt_cv_dlopen="LoadLibrary"
++ lt_cv_dlopen_libs=
++ ;;
++
+ cygwin*)
+ lt_cv_dlopen="dlopen"
+ lt_cv_dlopen_libs=
+ ;;
-
--# Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
--old_postinstall_cmds='chmod 644 $oldlib'
--old_postuninstall_cmds=
++
+ darwin*)
+ # if libdl is installed we need to link against it
+ AC_CHECK_LIB([dl], [dlopen],
@@ -3288,12 +3725,7 @@
+ lt_cv_dlopen_self=yes
+ ])
+ ;;
-
--if test -n "$RANLIB"; then
-- case $host_os in
-- openbsd*)
-- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-- ;;
++
*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ AC_CHECK_FUNC([shl_load],
@@ -3402,14 +3834,8 @@
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-+ case $lt_cv_dlopen_self_static in
-+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+ *) enable_dlopen_self_static=unknown ;;
-+ esac
-+fi
-+])# AC_LIBTOOL_DLOPEN_SELF
-
-
+-
+-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
@@ -3420,12 +3846,17 @@
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
-- esac
++ case $lt_cv_dlopen_self_static in
++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++ *) enable_dlopen_self_static=unknown ;;
+ esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
--
++fi
++])# AC_LIBTOOL_DLOPEN_SELF
+
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
@@ -3437,7 +3868,7 @@
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
--
+
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
@@ -3647,7 +4078,7 @@
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
+-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
@@ -3660,6 +4091,12 @@
- break
- fi
- done
+-fi
+
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- :
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
@@ -3670,7 +4107,22 @@
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ AC_MSG_RESULT([yes])
-+else
+ else
+- # The Solaris, AIX, and Digital Unix default echo programs unquote
+- # backslashes. This makes it impossible to quote backslashes using
+- # echo "$something" | sed 's/\\/\\\\/g'
+- #
+- # So, first we look for a working echo in the user's PATH.
+-
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for dir in $PATH /usr/ucb; do
+- IFS="$lt_save_ifs"
+- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+- test "X$echo_testing_string" = "X$echo_test_string"; then
+- echo="$dir/echo"
+- break
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
@@ -3686,29 +4138,10 @@
+ AC_MSG_RESULT([no])
+ ;;
+ esac
- fi
++fi
+])# AC_LIBTOOL_SYS_LIB_STRIP
-
--if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-- test "X$echo_testing_string" = "X$echo_test_string"; then
-- :
--else
-- # The Solaris, AIX, and Digital Unix default echo programs unquote
-- # backslashes. This makes it impossible to quote backslashes using
-- # echo "$something" | sed 's/\\/\\\\/g'
-- #
-- # So, first we look for a working echo in the user's PATH.
-
-- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-- for dir in $PATH /usr/ucb; do
-- IFS="$lt_save_ifs"
-- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-- test "X$echo_testing_string" = "X$echo_test_string"; then
-- echo="$dir/echo"
-- break
++
++
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
@@ -3918,7 +4351,7 @@
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
-
++
+bsdi[[45]]*)
+ version_type=linux
+ need_version=no
@@ -3933,6 +4366,12 @@
+ # libtool to hard-code these into programs
+ ;;
++cygwin* | mingw* | pw32*)
++ version_type=windows
++ shrext_cmds=".dll"
++ need_version=no
++ need_lib_prefix=no
+
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
@@ -3940,22 +4379,6 @@
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+cygwin* | mingw* | pw32*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
-
--# Some flags need to be propagated to the compiler or linker for good
--# libtool support.
--case $host in
--ia64-*-hpux*)
-- # Find out which ABI we are using.
-- echo 'int i;' > conftest.$ac_ext
-- if AC_TRY_EVAL(ac_compile); then
-- case `/usr/bin/file conftest.$ac_objext` in
-- *ELF-32*)
-- HPUX_IA64_MODE="32"
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
@@ -3970,48 +4393,30 @@
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+ shlibpath_overrides_runpath=yes
-+
+
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-ia64-*-hpux*)
+- # Find out which ABI we are using.
+- echo 'int i;' > conftest.$ac_ext
+- if AC_TRY_EVAL(ac_compile); then
+- case `/usr/bin/file conftest.$ac_objext` in
+- *ELF-32*)
+- HPUX_IA64_MODE="32"
+- ;;
+- *ELF-64*)
+- HPUX_IA64_MODE="64"
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
;;
-- *ELF-64*)
-- HPUX_IA64_MODE="64"
-+ mingw*)
-+ # MinGW DLLs use traditional 'lib' prefix
-+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-+ # It is most probably a Windows format PATH printed by
-+ # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+ # path with ; separators, and with drive letters. We can handle the
-+ # drive letters (cygwin fileutils understands them), so leave them,
-+ # especially as we might pass files found there to a mingw objdump,
-+ # which wouldn't understand a cygwinified path. Ahh.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+ ;;
-+ pw32*)
-+ # pw32 DLLs use 'pw' prefix rather than 'lib'
-+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
+- esac
- fi
- rm -rf conftest*
-+ ;;
-+
-+ *)
-+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+ ;;
-+ esac
-+ dynamic_linker='Win32 ld.exe'
-+ # FIXME: first we should search . and the directory the executable is in
-+ shlibpath_var=PATH
- ;;
+- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
@@ -4035,28 +4440,41 @@
- ;;
- *N32*)
- LD="${LD-ld} -n32"
-- ;;
++ mingw*)
++ # MinGW DLLs use traditional 'lib' prefix
++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
++ # It is most probably a Windows format PATH printed by
++ # mingw gcc, but we are running on Cygwin. Gcc prints its search
++ # path with ; separators, and with drive letters. We can handle the
++ # drive letters (cygwin fileutils understands them), so leave them,
++ # especially as we might pass files found there to a mingw objdump,
++ # which wouldn't understand a cygwinified path. Ahh.
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
+ ;;
- *64-bit*)
- LD="${LD-ld} -64"
-- ;;
-- esac
++ pw32*)
++ # pw32 DLLs use 'pw' prefix rather than 'lib'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
- fi
- fi
- rm -rf conftest*
-+
-+darwin* | rhapsody*)
-+ dynamic_linker="$host_os dyld"
-+ version_type=darwin
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+ soname_spec='${libname}${release}${major}$shared_ext'
-+ shlibpath_overrides_runpath=yes
-+ shlibpath_var=DYLD_LIBRARY_PATH
-+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+ m4_if([$1], [],[
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++ ;;
++
++ *)
++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++ ;;
++ esac
++ dynamic_linker='Win32 ld.exe'
++ # FIXME: first we should search . and the directory the executable is in
++ shlibpath_var=PATH
;;
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
@@ -4099,13 +4517,19 @@
- esac
- fi
- rm -rf conftest*
-+dgux*)
-+ version_type=linux
++darwin* | rhapsody*)
++ dynamic_linker="$host_os dyld"
++ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
++ library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++ soname_spec='${libname}${release}${major}$shared_ext'
++ shlibpath_overrides_runpath=yes
++ shlibpath_var=DYLD_LIBRARY_PATH
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++ m4_if([$1], [],[
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-*-*-sco3.2v5*)
@@ -4120,8 +4544,13 @@
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
-+freebsd1*)
-+ dynamic_linker=no
++dgux*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
@@ -4134,6 +4563,10 @@
- *) LD="${LD-ld} -64" ;;
- esac
- ;;
++
++freebsd1*)
++ dynamic_linker=no
++ ;;
+
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
@@ -4294,6 +4727,14 @@
- fi
- $rm conftest*
-])
+-
+-if test x"[$]$2" = xyes; then
+- ifelse([$5], , :, [$5])
+-else
+- ifelse([$6], , :, [$6])
+-fi
+-])# AC_LIBTOOL_COMPILER_OPTION
+-
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
@@ -4331,32 +4772,6 @@
+ hardcode_into_libs=yes
+ ;;
--if test x"[$]$2" = xyes; then
-- ifelse([$5], , :, [$5])
--else
-- ifelse([$6], , :, [$6])
--fi
--])# AC_LIBTOOL_COMPILER_OPTION
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+ version_type=linux
-+ need_lib_prefix=no
-+ need_version=no
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ # This implies no fast_install, which is unacceptable.
-+ # Some rework will be needed to allow for fast_install
-+ # before this can be enabled.
-+ hardcode_into_libs=yes
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
@@ -4385,11 +4800,10 @@
- $rm conftest*
- LDFLAGS="$save_LDFLAGS"
-])
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++ dynamic_linker=no
++ ;;
-if test x"[$]$2" = xyes; then
- ifelse([$4], , :, [$4])
@@ -4397,6 +4811,35 @@
- ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ # This implies no fast_install, which is unacceptable.
++ # Some rework will be needed to allow for fast_install
++ # before this can be enabled.
++ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
+
+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-# --------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+-[# find the maximum length of command line arguments
+-AC_MSG_CHECKING([the maximum length of command line arguments])
+-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+- i=0
+- teststring="ABCD"
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
@@ -4406,6 +4849,14 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+- case $build_os in
+- msdosdjgpp*)
+- # On DJGPP, this test can blow up pretty badly due to problems in libc
+- # (any single argument exceeding 2000 bytes causes a buffer overrun
+- # during glob expansion). Even if it were fixed, the result of this
+- # check would be larger than it should be.
+- lt_cv_sys_max_cmd_len=12288; # 12K is about right
+- ;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -4418,14 +4869,12 @@
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
--# AC_LIBTOOL_SYS_MAX_CMD_LEN
--# --------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
--[# find the maximum length of command line arguments
--AC_MSG_CHECKING([the maximum length of command line arguments])
--AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-- i=0
-- teststring="ABCD"
+- gnu*)
+- # Under GNU Hurd, this test is not required because there is
+- # no limit to the length of command line arguments.
+- # Libtool will interpret -1 as no limit whatsoever
+- lt_cv_sys_max_cmd_len=-1;
+- ;;
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
@@ -4444,13 +4893,15 @@
+ hardcode_into_libs=yes
+ ;;
-- case $build_os in
-- msdosdjgpp*)
-- # On DJGPP, this test can blow up pretty badly due to problems in libc
-- # (any single argument exceeding 2000 bytes causes a buffer overrun
-- # during glob expansion). Even if it were fixed, the result of this
-- # check would be larger than it should be.
-- lt_cv_sys_max_cmd_len=12288; # 12K is about right
+- cygwin* | mingw*)
+- # On Win9x/ME, this test blows up -- it succeeds, but takes
+- # about 5 minutes as the teststring grows exponentially.
+- # Worse, since 9x/ME are not pre-emptively multitasking,
+- # you end up with a "frozen" computer, even though with patience
+- # the test eventually succeeds (with a max line length of 256k).
+- # Instead, let's just punt: use the minimum linelength reported by
+- # all of the supported platforms: 8192 (on NT/2K/XP).
+- lt_cv_sys_max_cmd_len=8192;
- ;;
+newsos6)
+ version_type=linux
@@ -4459,11 +4910,10 @@
+ shlibpath_overrides_runpath=yes
+ ;;
-- gnu*)
-- # Under GNU Hurd, this test is not required because there is
-- # no limit to the length of command line arguments.
-- # Libtool will interpret -1 as no limit whatsoever
-- lt_cv_sys_max_cmd_len=-1;
+- amigaos*)
+- # On AmigaOS with pdksh, this test takes hours, literally.
+- # So we just punt and use a minimum line length of 8192.
+- lt_cv_sys_max_cmd_len=8192;
- ;;
+nto-qnx*)
+ version_type=linux
@@ -4475,15 +4925,18 @@
+ shlibpath_overrides_runpath=yes
+ ;;
-- cygwin* | mingw*)
-- # On Win9x/ME, this test blows up -- it succeeds, but takes
-- # about 5 minutes as the teststring grows exponentially.
-- # Worse, since 9x/ME are not pre-emptively multitasking,
-- # you end up with a "frozen" computer, even though with patience
-- # the test eventually succeeds (with a max line length of 256k).
-- # Instead, let's just punt: use the minimum linelength reported by
-- # all of the supported platforms: 8192 (on NT/2K/XP).
-- lt_cv_sys_max_cmd_len=8192;
+- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+- # This has been around since 386BSD, at least. Likely further.
+- if test -x /sbin/sysctl; then
+- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+- elif test -x /usr/sbin/sysctl; then
+- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+- else
+- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+- fi
+- # And add a safety zone
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
- ;;
+openbsd*)
+ version_type=sunos
@@ -4511,10 +4964,9 @@
+ fi
+ ;;
-- amigaos*)
-- # On AmigaOS with pdksh, this test takes hours, literally.
-- # So we just punt and use a minimum line length of 8192.
-- lt_cv_sys_max_cmd_len=8192;
+- interix*)
+- # We know the value 262144 and hardcode it with a safety zone (like BSD)
+- lt_cv_sys_max_cmd_len=196608
- ;;
+os2*)
+ libname_spec='$name'
@@ -4523,38 +4975,6 @@
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
-+ ;;
-
-- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-- # This has been around since 386BSD, at least. Likely further.
-- if test -x /sbin/sysctl; then
-- lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-- elif test -x /usr/sbin/sysctl; then
-- lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-- else
-- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
-- fi
-- # And add a safety zone
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-- ;;
-+osf3* | osf4* | osf5*)
-+ version_type=osf
-+ need_lib_prefix=no
-+ need_version=no
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+ ;;
-
-- interix*)
-- # We know the value 262144 and hardcode it with a safety zone (like BSD)
-- lt_cv_sys_max_cmd_len=196608
-- ;;
-+rdos*)
-+ dynamic_linker=no
+ ;;
- osf*)
@@ -4601,6 +5021,65 @@
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
- ;;
+- esac
+-])
+-if test -n $lt_cv_sys_max_cmd_len ; then
+- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+-else
+- AC_MSG_RESULT(none)
+-fi
+-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-
+-
+-# _LT_AC_CHECK_DLFCN
+-# ------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)dnl
+-])# _LT_AC_CHECK_DLFCN
+-
+-
+-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ---------------------------------------------------------------------
+-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "$cross_compiling" = yes; then :
+- [$4]
+-else
+- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+- lt_status=$lt_dlunknown
+- cat > conftest.$ac_ext <<EOF
+-[#line __oline__ "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++osf3* | osf4* | osf5*)
++ version_type=osf
++ need_lib_prefix=no
++ need_version=no
++ soname_spec='${libname}${release}${shared_ext}$major'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ shlibpath_var=LD_LIBRARY_PATH
++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++ ;;
+
+-#include <stdio.h>
++rdos*)
++ dynamic_linker=no
++ ;;
+
+-#ifdef RTLD_GLOBAL
+-# define LT_DLGLOBAL RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-# define LT_DLGLOBAL DL_GLOBAL
+-# else
+-# define LT_DLGLOBAL 0
+-# endif
+-#endif
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
@@ -4613,7 +5092,28 @@
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
-+
+
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+- find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-# ifdef RTLD_LAZY
+-# define LT_DLLAZY_OR_NOW RTLD_LAZY
+-# else
+-# ifdef DL_LAZY
+-# define LT_DLLAZY_OR_NOW DL_LAZY
+-# else
+-# ifdef RTLD_NOW
+-# define LT_DLLAZY_OR_NOW RTLD_NOW
+-# else
+-# ifdef DL_NOW
+-# define LT_DLLAZY_OR_NOW DL_NOW
+-# else
+-# define LT_DLLAZY_OR_NOW 0
+-# endif
+-# endif
+-# endif
+-# endif
+-#endif
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -4625,7 +5125,10 @@
+ fi
+ need_version=yes
+ ;;
-+
+
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -4647,16 +5150,14 @@
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
- esac
--])
--if test -n $lt_cv_sys_max_cmd_len ; then
-- AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
--else
-- AC_MSG_RESULT(none)
--fi
--])# AC_LIBTOOL_SYS_MAX_CMD_LEN
++ esac
+ ;;
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
@@ -4666,11 +5167,12 @@
+ fi
+ ;;
--# _LT_AC_CHECK_DLFCN
--# ------------------
--AC_DEFUN([_LT_AC_CHECK_DLFCN],
--[AC_CHECK_HEADERS(dlfcn.h)dnl
--])# _LT_AC_CHECK_DLFCN
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
@@ -4682,139 +5184,9 @@
+ if test "$with_gnu_ld" = yes; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ shlibpath_overrides_runpath=no
-+ else
-+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+ shlibpath_overrides_runpath=yes
-+ case $host_os in
-+ sco3.2v5*)
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+ ;;
-+ esac
-+ fi
-+ sys_lib_dlsearch_path_spec='/usr/lib'
-+ ;;
-
-+uts4*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ ;;
-
--# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
--# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
--# ---------------------------------------------------------------------
--AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
--[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
--if test "$cross_compiling" = yes; then :
-- [$4]
--else
-- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-- lt_status=$lt_dlunknown
-- cat > conftest.$ac_ext <<EOF
--[#line __oline__ "configure"
--#include "confdefs.h"
-+*)
-+ dynamic_linker=no
-+ ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
-
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
-+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
--#include <stdio.h>
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
--#ifdef RTLD_GLOBAL
--# define LT_DLGLOBAL RTLD_GLOBAL
--#else
--# ifdef DL_GLOBAL
--# define LT_DLGLOBAL DL_GLOBAL
--# else
--# define LT_DLGLOBAL 0
--# endif
--#endif
-
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-- find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--# ifdef RTLD_LAZY
--# define LT_DLLAZY_OR_NOW RTLD_LAZY
--# else
--# ifdef DL_LAZY
--# define LT_DLLAZY_OR_NOW DL_LAZY
--# else
--# ifdef RTLD_NOW
--# define LT_DLLAZY_OR_NOW RTLD_NOW
--# else
--# ifdef DL_NOW
--# define LT_DLLAZY_OR_NOW DL_NOW
--# else
--# define LT_DLLAZY_OR_NOW 0
--# endif
--# endif
--# endif
--# endif
--#endif
-+# _LT_AC_TAGCONFIG
-+# ----------------
-+AC_DEFUN([_LT_AC_TAGCONFIG],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_ARG_WITH([tags],
-+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-+ [include additional configurations @<:@automatic@:>@])],
-+ [tagnames="$withval"])
-
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
-+if test -f "$ltmain" && test -n "$tagnames"; then
-+ if test ! -f "${ofile}"; then
-+ AC_MSG_WARN([output file `$ofile' does not exist])
-+ fi
-
--void fnord() { int i=42;}
--int main ()
--{
-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-- int status = $lt_dlunknown;
-+ if test -z "$LTCC"; then
-+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-+ if test -z "$LTCC"; then
-+ AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-+ else
-+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-+ fi
-+ fi
-+ if test -z "$LTCFLAGS"; then
-+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-+ fi
-
-- if (self)
-- {
-- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-- /* dlclose (self); */
-- }
-- else
+ else
- puts (dlerror ());
-+ # Extract list of available tagged configurations in $ofile.
-+ # Note that this assumes the entire list is on one line.
-+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
+-
- exit (status);
-}]
-EOF
@@ -4825,27 +5197,29 @@
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
- x$lt_dlunknown|x*) $3 ;;
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for tagname in $tagnames; do
-+ IFS="$lt_save_ifs"
-+ # Check whether tagname contains only valid characters
-+ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-+ "") ;;
-+ *) AC_MSG_ERROR([invalid tag name: $tagname])
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
esac
- else :
- # compilation failed
- $3
-- fi
+ fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-+ then
-+ AC_MSG_ERROR([tag name \"$tagname\" already exists])
-+ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
+
++uts4*)
++ version_type=linux
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ ;;
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
@@ -4858,9 +5232,12 @@
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-+ # Update the list of available tags.
-+ if test -n "$tagname"; then
-+ echo appending configuration tag \"$tagname\" to $ofile
++*)
++ dynamic_linker=no
++ ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
- case $host_os in
- beos*)
@@ -4868,40 +5245,27 @@
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-+ case $tagname in
-+ CXX)
-+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xg++"))) ; then
-+ AC_LIBTOOL_LANG_CXX_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
-+ F77)
-+ if test -n "$F77" && test "X$F77" != "Xno"; then
-+ AC_LIBTOOL_LANG_F77_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-+ GCJ)
-+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+ AC_LIBTOOL_LANG_GCJ_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
- darwin*)
- # if libdl is installed we need to link against it
@@ -4912,10 +5276,7 @@
- lt_cv_dlopen_self=yes
- ])
- ;;
-+ RC)
-+ AC_LIBTOOL_LANG_RC_CONFIG
-+ ;;
-
+-
- *)
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
@@ -4936,49 +5297,48 @@
- ])
- ;;
- esac
-+ *)
-+ AC_MSG_ERROR([Unsupported tag name: $tagname])
-+ ;;
-+ esac
++# _LT_AC_TAGCONFIG
++# ----------------
++AC_DEFUN([_LT_AC_TAGCONFIG],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
++ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
++ [include additional configurations @<:@automatic@:>@])],
++ [tagnames="$withval"])
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
-+ # Append the new tag name to the list of available tags.
-+ if test -n "$tagname" ; then
-+ available_tags="$available_tags $tagname"
-+ fi
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+
-+ # Now substitute the updated list of available tags.
-+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-+ mv "${ofile}T" "$ofile"
-+ chmod +x "$ofile"
- else
+- else
- enable_dlopen=no
-+ rm -f "${ofile}T"
-+ AC_MSG_ERROR([unable to update list of available tagged configurations.])
++if test -f "$ltmain" && test -n "$tagnames"; then
++ if test ! -f "${ofile}"; then
++ AC_MSG_WARN([output file `$ofile' does not exist])
fi
-+fi
-+])# _LT_AC_TAGCONFIG
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
+-
- save_LDFLAGS="$LDFLAGS"
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# AC_LIBTOOL_DLOPEN
-+# -----------------
-+# enable checks for dlopen support
-+AC_DEFUN([AC_LIBTOOL_DLOPEN],
-+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_DLOPEN
++ if test -z "$LTCC"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++ if test -z "$LTCC"; then
++ AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
++ else
++ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
++ fi
++ fi
++ if test -z "$LTCFLAGS"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++ fi
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
++ # Extract list of available tagged configurations in $ofile.
++ # Note that this assumes the entire list is on one line.
++ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
- AC_CACHE_CHECK([whether a program can dlopen itself],
- lt_cv_dlopen_self, [dnl
@@ -4986,12 +5346,15 @@
- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- ])
-+# AC_LIBTOOL_WIN32_DLL
-+# --------------------
-+# declare package support for building win32 DLLs
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_WIN32_DLL
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for tagname in $tagnames; do
++ IFS="$lt_save_ifs"
++ # Check whether tagname contains only valid characters
++ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
++ "") ;;
++ *) AC_MSG_ERROR([invalid tag name: $tagname])
++ ;;
++ esac
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
@@ -5001,46 +5364,24 @@
- lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- ])
-- fi
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++ then
++ AC_MSG_ERROR([tag name \"$tagname\" already exists])
+ fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-+# AC_ENABLE_SHARED([DEFAULT])
-+# ---------------------------
-+# implement the --enable-shared flag
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([shared],
-+ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_shared=yes ;;
-+ no) enable_shared=no ;;
-+ *)
-+ enable_shared=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_shared=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-+])# AC_ENABLE_SHARED
-
+-
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
++ # Update the list of available tags.
++ if test -n "$tagname"; then
++ echo appending configuration tag \"$tagname\" to $ofile
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
@@ -5048,14 +5389,24 @@
- esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-+# AC_DISABLE_SHARED
-+# -----------------
-+# set the default shared flag to --disable-shared
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_SHARED(no)
-+])# AC_DISABLE_SHARED
-
++ case $tagname in
++ CXX)
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_LIBTOOL_LANG_CXX_CONFIG
++ else
++ tagname=""
++ fi
++ ;;
+
++ F77)
++ if test -n "$F77" && test "X$F77" != "Xno"; then
++ AC_LIBTOOL_LANG_F77_CONFIG
++ else
++ tagname=""
++ fi
++ ;;
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
@@ -5070,34 +5421,13 @@
- cd conftest
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+# AC_ENABLE_STATIC([DEFAULT])
-+# ---------------------------
-+# implement the --enable-static flag
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([static],
-+ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_static=yes ;;
-+ no) enable_static=no ;;
-+ *)
-+ enable_static=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_static=yes
++ GCJ)
++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++ AC_LIBTOOL_LANG_GCJ_CONFIG
++ else
++ tagname=""
+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-+])# AC_ENABLE_STATIC
++ ;;
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
@@ -5134,20 +5464,27 @@
- $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-+# AC_DISABLE_STATIC
-+# -----------------
-+# set the default static flag to --disable-static
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_STATIC(no)
-+])# AC_DISABLE_STATIC
++ RC)
++ AC_LIBTOOL_LANG_RC_CONFIG
++ ;;
+
++ *)
++ AC_MSG_ERROR([Unsupported tag name: $tagname])
++ ;;
++ esac
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
++ # Append the new tag name to the list of available tags.
++ if test -n "$tagname" ; then
++ available_tags="$available_tags $tagname"
++ fi
++ fi
++ done
++ IFS="$lt_save_ifs"
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
@@ -5163,43 +5500,24 @@
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
- need_locks=warn
-- fi
++ # Now substitute the updated list of available tags.
++ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++ mv "${ofile}T" "$ofile"
++ chmod +x "$ofile"
++ else
++ rm -f "${ofile}T"
++ AC_MSG_ERROR([unable to update list of available tagged configurations.])
+ fi
-else
- need_locks=no
--fi
+ fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-+# AC_ENABLE_FAST_INSTALL([DEFAULT])
-+# ---------------------------------
-+# implement the --enable-fast-install flag
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([fast-install],
-+ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_fast_install=yes ;;
-+ no) enable_fast_install=no ;;
-+ *)
-+ enable_fast_install=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_fast_install=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-+])# AC_ENABLE_FAST_INSTALL
++])# _LT_AC_TAGCONFIG
-# AC_LIBTOOL_OBJDIR
--# -----------------
++# AC_LIBTOOL_DLOPEN
+ # -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
@@ -5213,13 +5531,10 @@
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-+# AC_DISABLE_FAST_INSTALL
-+# -----------------------
-+# set the default to --disable-fast-install
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_FAST_INSTALL(no)
-+])# AC_DISABLE_FAST_INSTALL
++# enable checks for dlopen support
++AC_DEFUN([AC_LIBTOOL_DLOPEN],
++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_DLOPEN
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
@@ -5231,14 +5546,12 @@
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+# AC_LIBTOOL_PICMODE([MODE])
-+# --------------------------
-+# implement the --with-pic flag
-+# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-+AC_DEFUN([AC_LIBTOOL_PICMODE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+pic_mode=ifelse($#,1,$1,default)
-+])# AC_LIBTOOL_PICMODE
++# AC_LIBTOOL_WIN32_DLL
++# --------------------
++# declare package support for building win32 DLLs
++AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_WIN32_DLL
- # We can hardcode non-existant directories.
- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -5269,19 +5582,34 @@
- enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-+# AC_PROG_EGREP
-+# -------------
-+# This is predefined starting with Autoconf 2.54, so this conditional
-+# definition can be removed once we require Autoconf 2.54 or later.
-+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-+ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-+ then ac_cv_prog_egrep='grep -E'
-+ else ac_cv_prog_egrep='egrep'
-+ fi])
-+ EGREP=$ac_cv_prog_egrep
-+ AC_SUBST([EGREP])
-+])])
++# AC_ENABLE_SHARED([DEFAULT])
++# ---------------------------
++# implement the --enable-shared flag
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_SHARED],
++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([shared],
++ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_shared=yes ;;
++ no) enable_shared=no ;;
++ *)
++ enable_shared=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_shared=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
++])# AC_ENABLE_SHARED
-# AC_LIBTOOL_SYS_LIB_STRIP
@@ -5294,64 +5622,7 @@
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT([yes])
-+# AC_PATH_TOOL_PREFIX
-+# -------------------
-+# find a file program which can recognize shared library
-+AC_DEFUN([AC_PATH_TOOL_PREFIX],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] | ?:[\\/]*])
-+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+ ;;
-+*)
-+ lt_save_MAGIC_CMD="$MAGIC_CMD"
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word. This closes a longstanding sh security hole.
-+ ac_dummy="ifelse([$2], , $PATH, [$2])"
-+ for ac_dir in $ac_dummy; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$1; then
-+ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+ if test -n "$file_magic_test_file"; then
-+ case $deplibs_check_method in
-+ "file_magic "*)
-+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+ $EGREP "$file_magic_regex" > /dev/null; then
-+ :
-+ else
-+ cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such. This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem. Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
-+
-+EOF
-+ fi ;;
-+ esac
-+ fi
-+ break
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ MAGIC_CMD="$lt_save_MAGIC_CMD"
-+ ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+ AC_MSG_RESULT($MAGIC_CMD)
- else
+-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
@@ -5366,10 +5637,15 @@
- AC_MSG_RESULT([no])
- ;;
- esac
-+ AC_MSG_RESULT(no)
- fi
+-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-+])# AC_PATH_TOOL_PREFIX
++# AC_DISABLE_SHARED
++# -----------------
++# set the default shared flag to --disable-shared
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)
++])# AC_DISABLE_SHARED
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
@@ -5398,6 +5674,354 @@
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
++# AC_ENABLE_STATIC([DEFAULT])
++# ---------------------------
++# implement the --enable-static flag
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([static],
++ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_static=yes ;;
++ no) enable_static=no ;;
++ *)
++ enable_static=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_static=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_static=]AC_ENABLE_STATIC_DEFAULT)
++])# AC_ENABLE_STATIC
+
+-# 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 $host_os in
+-aix3*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+- shlibpath_var=LIBPATH
++# AC_DISABLE_STATIC
++# -----------------
++# set the default static flag to --disable-static
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)
++])# AC_DISABLE_STATIC
+
+- # AIX 3 has no versioning support, so we append a major version to the name.
+- soname_spec='${libname}${release}${shared_ext}$major'
+- ;;
+
+-aix4* | aix5*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- hardcode_into_libs=yes
+- if test "$host_cpu" = ia64; then
+- # AIX 5 supports IA64
+- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
+- else
+- # With GCC up to 2.95.x, collect2 would create an import file
+- # for dependence libraries. The import file would start with
+- # the line `#! .'. This would cause the generated library to
+- # depend on `.', always an invalid library. This was fixed in
+- # development snapshots of GCC prior to 3.0.
+- case $host_os in
+- aix4 | aix4.[[01]] | aix4.[[01]].*)
+- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+- echo ' yes '
+- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+- :
+- else
+- can_build_shared=no
+- fi
++# AC_ENABLE_FAST_INSTALL([DEFAULT])
++# ---------------------------------
++# implement the --enable-fast-install flag
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([fast-install],
++ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_fast_install=yes ;;
++ no) enable_fast_install=no ;;
++ *)
++ enable_fast_install=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_fast_install=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
+ ;;
+- esac
+- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+- # soname into executable. Probably we can add versioning support to
+- # collect2, so additional links can be useful in future.
+- if test "$aix_use_runtimelinking" = yes; then
+- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+- # instead of lib<name>.a to let people know that these are not
+- # typical AIX shared libraries.
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- else
+- # We preserve .a as extension for shared libraries through AIX4.2
+- # and later when we are not doing run time linking.
+- library_names_spec='${libname}${release}.a $libname.a'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- fi
+- shlibpath_var=LIBPATH
+- fi
+- ;;
++ esac],
++ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
++])# AC_ENABLE_FAST_INSTALL
+
+-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'
+- ;;
+
+-beos*)
+- library_names_spec='${libname}${shared_ext}'
+- dynamic_linker="$host_os ld.so"
+- shlibpath_var=LIBRARY_PATH
+- ;;
++# AC_DISABLE_FAST_INSTALL
++# -----------------------
++# set the default to --disable-fast-install
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)
++])# AC_DISABLE_FAST_INSTALL
+
+-bsdi[[45]]*)
+- version_type=linux
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+- # the default ld.so.conf also contains /usr/contrib/lib and
+- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+- # libtool to hard-code these into programs
+- ;;
+
+-cygwin* | mingw* | pw32*)
+- version_type=windows
+- shrext_cmds=".dll"
+- need_version=no
+- need_lib_prefix=no
++# AC_LIBTOOL_PICMODE([MODE])
++# --------------------------
++# implement the --with-pic flag
++# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)
++])# AC_LIBTOOL_PICMODE
+
+- case $GCC,$host_os in
+- yes,cygwin* | yes,mingw* | yes,pw32*)
+- library_names_spec='$libname.dll.a'
+- # DLL is installed to $(libdir)/../bin by postinstall_cmds
+- postinstall_cmds='base_file=`basename \${file}`~
+- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+- dldir=$destdir/`dirname \$dlpath`~
+- test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname~
+- chmod a+x \$dldir/$dlname'
+- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+- dlpath=$dir/\$dldll~
+- $rm \$dlpath'
+- shlibpath_overrides_runpath=yes
+
+- case $host_os in
+- cygwin*)
+- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+- ;;
+- mingw*)
+- # MinGW DLLs use traditional 'lib' prefix
+- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+- # It is most probably a Windows format PATH printed by
+- # mingw gcc, but we are running on Cygwin. Gcc prints its search
+- # path with ; separators, and with drive letters. We can handle the
+- # drive letters (cygwin fileutils understands them), so leave them,
+- # especially as we might pass files found there to a mingw objdump,
+- # which wouldn't understand a cygwinified path. Ahh.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+- else
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- fi
+- ;;
+- pw32*)
+- # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+- ;;
+- esac
+- ;;
++# AC_PROG_EGREP
++# -------------
++# This is predefined starting with Autoconf 2.54, so this conditional
++# definition can be removed once we require Autoconf 2.54 or later.
++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
++ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++ then ac_cv_prog_egrep='grep -E'
++ else ac_cv_prog_egrep='egrep'
++ fi])
++ EGREP=$ac_cv_prog_egrep
++ AC_SUBST([EGREP])
++])])
+
+- *)
+- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+- ;;
+- esac
+- dynamic_linker='Win32 ld.exe'
+- # FIXME: first we should search . and the directory the executable is in
+- shlibpath_var=PATH
+- ;;
+
+-darwin* | rhapsody*)
+- dynamic_linker="$host_os dyld"
+- version_type=darwin
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+- soname_spec='${libname}${release}${major}$shared_ext'
+- shlibpath_overrides_runpath=yes
+- shlibpath_var=DYLD_LIBRARY_PATH
+- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
+- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++# AC_PATH_TOOL_PREFIX
++# -------------------
++# find a file program which can recognize shared library
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] | ?:[\\/]*])
++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ ;;
++*)
++ lt_save_MAGIC_CMD="$MAGIC_CMD"
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word. This closes a longstanding sh security hole.
++ ac_dummy="ifelse([$2], , $PATH, [$2])"
++ for ac_dir in $ac_dummy; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$1; then
++ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++ if test -n "$file_magic_test_file"; then
++ case $deplibs_check_method in
++ "file_magic "*)
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++ $EGREP "$file_magic_regex" > /dev/null; then
++ :
++ else
++ cat <<EOF 1>&2
+
+-dgux*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such. This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem. Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool at gnu.org
+
+-freebsd1*)
+- dynamic_linker=no
++EOF
++ fi ;;
++ esac
++ fi
++ break
++ fi
++ done
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++ AC_MSG_RESULT($MAGIC_CMD)
++else
++ AC_MSG_RESULT(no)
++fi
++])# AC_PATH_TOOL_PREFIX
+
+-kfreebsd*-gnu)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='GNU ld.so'
+- ;;
+
+-freebsd* | dragonfly*)
+- # DragonFly does not have aout. When/if they implement a new
+- # versioning mechanism, adjust this.
+- if test -x /usr/bin/objformat; then
+- objformat=`/usr/bin/objformat`
+# AC_PATH_MAGIC
+# -------------
+# find a file program which can recognize a shared library
@@ -5407,25 +6031,27 @@
+ if test -n "$ac_tool_prefix"; then
+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+- case $host_os in
+- freebsd[[123]]*) objformat=aout ;;
+- *) objformat=elf ;;
+- esac
+ MAGIC_CMD=:
fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
--need_lib_prefix=unknown
--hardcode_into_libs=no
+- version_type=freebsd-$objformat
+- case $version_type in
+- freebsd-elf*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+- need_version=no
+- need_lib_prefix=no
+- ;;
+- freebsd-*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+- need_version=yes
+- ;;
++fi
+])# AC_PATH_MAGIC
-
--# 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 $host_os in
--aix3*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-- shlibpath_var=LIBPATH
++
++
+# AC_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
@@ -5449,7 +6075,15 @@
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
+ esac
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_os in
+- freebsd2*)
+- shlibpath_overrides_runpath=yes
+- ;;
+- freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+ case $ac_prog in
+ # Accept absolute paths.
+ [[\\/]]* | ?:[[\\/]]*)
@@ -5464,12 +6098,21 @@
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
-+ ;;
+ ;;
+- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- ;;
+- freebsd*) # from 4.6 on
+- shlibpath_overrides_runpath=yes
+- hardcode_into_libs=yes
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
-+ ;;
-+ esac
+ ;;
+ esac
+- ;;
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
@@ -5510,8 +6153,14 @@
+AC_PROG_LD_GNU
+])# AC_PROG_LD
-- # AIX 3 has no versioning support, so we append a major version to the name.
+-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- hardcode_into_libs=yes
+
+# AC_PROG_LD_GNU
+# --------------
@@ -5530,40 +6179,23 @@
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# AC_PROG_LD_GNU
--aix4* | aix5*)
-- version_type=linux
+-hpux9* | hpux10* | hpux11*)
+- # Give a soname corresponding to the major version so that dld.sl refuses to
+- # link against other versions.
+- version_type=sunos
- need_lib_prefix=no
- need_version=no
-- hardcode_into_libs=yes
-- if test "$host_cpu" = ia64; then
-- # AIX 5 supports IA64
-- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+- case $host_cpu in
+- ia64*)
+- shrext_cmds='.so'
+- hardcode_into_libs=yes
+- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
-- else
-- # With GCC up to 2.95.x, collect2 would create an import file
-- # for dependence libraries. The import file would start with
-- # the line `#! .'. This would cause the generated library to
-- # depend on `.', always an invalid library. This was fixed in
-- # development snapshots of GCC prior to 3.0.
-- case $host_os in
-- aix4 | aix4.[[01]] | aix4.[[01]].*)
-- if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-- echo ' yes '
-- echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-- :
-- else
-- can_build_shared=no
-- fi
-- ;;
-- esac
-- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-- # soname into executable. Probably we can add versioning support to
-- # collect2, so additional links can be useful in future.
-- if test "$aix_use_runtimelinking" = yes; then
-- # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-- # instead of lib<name>.a to let people know that these are not
-- # typical AIX shared libraries.
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- if test "X$HPUX_IA64_MODE" = X32; then
+- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+
+# AC_PROG_LD_RELOAD_FLAG
+# ----------------------
@@ -5584,287 +6216,11 @@
+ if test "$GCC" = yes; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
else
-- # We preserve .a as extension for shared libraries through AIX4.2
-- # and later when we are not doing run time linking.
-- library_names_spec='${libname}${release}.a $libname.a'
-- soname_spec='${libname}${release}${shared_ext}$major'
+- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
-- shlibpath_var=LIBPATH
-- fi
-- ;;
-+ ;;
-+esac
-+])# AC_PROG_LD_RELOAD_FLAG
-
--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'
-+
-+# AC_DEPLIBS_CHECK_METHOD
-+# -----------------------
-+# how to check for library dependencies
-+# -- PORTME fill in with the dynamic library characteristics
-+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-+[AC_CACHE_CHECK([how to recognize dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix[[4-9]]*)
-+ lt_cv_deplibs_check_method=pass_all
- ;;
-
- beos*)
-- library_names_spec='${libname}${shared_ext}'
-- dynamic_linker="$host_os ld.so"
-- shlibpath_var=LIBRARY_PATH
-+ lt_cv_deplibs_check_method=pass_all
- ;;
-
- bsdi[[45]]*)
-- version_type=linux
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-- # the default ld.so.conf also contains /usr/contrib/lib and
-- # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-- # libtool to hard-code these into programs
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+ lt_cv_file_magic_cmd='/usr/bin/file -L'
-+ lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
-
--cygwin* | mingw* | pw32*)
-- version_type=windows
-- shrext_cmds=".dll"
-- need_version=no
-- need_lib_prefix=no
-+cygwin*)
-+ # func_win32_libid is a shell function defined in ltmain.sh
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ ;;
-
-- case $GCC,$host_os in
-- yes,cygwin* | yes,mingw* | yes,pw32*)
-- library_names_spec='$libname.dll.a'
-- # DLL is installed to $(libdir)/../bin by postinstall_cmds
-- postinstall_cmds='base_file=`basename \${file}`~
-- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-- dldir=$destdir/`dirname \$dlpath`~
-- test -d \$dldir || mkdir -p \$dldir~
-- $install_prog $dir/$dlname \$dldir/$dlname~
-- chmod a+x \$dldir/$dlname'
-- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-- dlpath=$dir/\$dldll~
-- $rm \$dlpath'
-- shlibpath_overrides_runpath=yes
--
-- case $host_os in
-- cygwin*)
-- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-- ;;
-- mingw*)
-- # MinGW DLLs use traditional 'lib' prefix
-- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-- # It is most probably a Windows format PATH printed by
-- # mingw gcc, but we are running on Cygwin. Gcc prints its search
-- # path with ; separators, and with drive letters. We can handle the
-- # drive letters (cygwin fileutils understands them), so leave them,
-- # especially as we might pass files found there to a mingw objdump,
-- # which wouldn't understand a cygwinified path. Ahh.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
-- ;;
-- pw32*)
-- # pw32 DLLs use 'pw' prefix rather than 'lib'
-- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-- ;;
-- esac
+- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
--
-- *)
-- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-- ;;
-- esac
-- dynamic_linker='Win32 ld.exe'
-- # FIXME: first we should search . and the directory the executable is in
-- shlibpath_var=PATH
-- ;;
-+mingw* | pw32*)
-+ # Base MSYS/MinGW do not provide the 'file' command needed by
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ if ( file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
-+ ;;
-
- darwin* | rhapsody*)
-- dynamic_linker="$host_os dyld"
-- version_type=darwin
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-- soname_spec='${libname}${release}${major}$shared_ext'
-- shlibpath_overrides_runpath=yes
-- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-- ;;
--
--dgux*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--freebsd1*)
-- dynamic_linker=no
-- ;;
--
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-+ lt_cv_deplibs_check_method=pass_all
- ;;
-
- freebsd* | dragonfly*)
-- # DragonFly does not have aout. When/if they implement a new
-- # versioning mechanism, adjust this.
-- if test -x /usr/bin/objformat; then
-- objformat=`/usr/bin/objformat`
-- else
-- case $host_os in
-- freebsd[[123]]*) objformat=aout ;;
-- *) objformat=elf ;;
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+ # Not sure whether the presence of OpenBSD here was a mistake.
-+ # Let's accept both of them until this is cleared up.
-+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+ ;;
- esac
-+ else
-+ lt_cv_deplibs_check_method=pass_all
- fi
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-- need_version=no
-- need_lib_prefix=no
-- ;;
-- freebsd-*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-- need_version=yes
-- ;;
-- esac
-- shlibpath_var=LD_LIBRARY_PATH
-- case $host_os in
-- freebsd2*)
-- shlibpath_overrides_runpath=yes
-- ;;
-- freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- ;;
-- freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-- freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- ;;
-- freebsd*) # from 4.6 on
-- shlibpath_overrides_runpath=yes
-- hardcode_into_libs=yes
-- ;;
-- esac
- ;;
-
- gnu*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- hardcode_into_libs=yes
-+ lt_cv_deplibs_check_method=pass_all
- ;;
-
--hpux9* | hpux10* | hpux11*)
-- # Give a soname corresponding to the major version so that dld.sl refuses to
-- # link against other versions.
-- version_type=sunos
-- need_lib_prefix=no
-- need_version=no
-+hpux10.20* | hpux11*)
-+ lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
- ia64*)
-- shrext_cmds='.so'
-- hardcode_into_libs=yes
-- dynamic_linker="$host_os dld.so"
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- if test "X$HPUX_IA64_MODE" = X32; then
-- sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-- else
-- sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-- fi
-- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
- shrext_cmds='.sl'
- hardcode_into_libs=yes
@@ -5883,18 +6239,13 @@
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
-+ hppa*64*)
-+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+ ;;
-+ *)
-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
- esac
+- esac
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
+- ;;
++esac
++])# AC_PROG_LD_RELOAD_FLAG
-interix3*)
- version_type=linux
@@ -5906,12 +6257,9 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-+interix[[3-9]]*)
-+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
- ;;
-
- irix5* | irix6* | nonstopux*)
+- ;;
+
+-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
- *)
@@ -5940,26 +6288,46 @@
- *) libsuff= shlibsuff= libmagic=never-match;;
- esac
- ;;
-+ case $LD in
-+ *-32|*"-32 ") libmagic=32-bit;;
-+ *-n32|*"-n32 ") libmagic=N32;;
-+ *-64|*"-64 ") libmagic=64-bit;;
-+ *) libmagic=never-match;;
- esac
+- esac
- shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
-- ;;
--
++# AC_DEPLIBS_CHECK_METHOD
++# -----------------------
++# how to check for library dependencies
++# -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix[[4-9]]*)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
- dynamic_linker=no
++beos*)
+ lt_cv_deplibs_check_method=pass_all
;;
- # This must be Linux ELF.
+-# This must be Linux ELF.
-linux*)
- version_type=linux
- need_lib_prefix=no
@@ -5973,7 +6341,12 @@
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
--
++bsdi[[45]]*)
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++ lt_cv_file_magic_cmd='/usr/bin/file -L'
++ lt_cv_file_magic_test_file=/shlib/libc.so
++ ;;
+
- # find out which ABI we are using
- libsuff=
- case "$host_cpu" in
@@ -5990,19 +6363,26 @@
- rm -rf conftest*
- ;;
- esac
-+linux* | k*bsd*-gnu)
-+ lt_cv_deplibs_check_method=pass_all
++cygwin*)
++ # func_win32_libid is a shell function defined in ltmain.sh
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+netbsd* | netbsdelf*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++mingw* | pw32*)
++ # Base MSYS/MinGW do not provide the 'file' command needed by
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
+ else
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -6024,8 +6404,10 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
-- ;;
--
++darwin* | rhapsody*)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
@@ -6034,11 +6416,23 @@
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- dynamic_linker='NetBSD (a.out) ld.so'
-- else
++freebsd* | dragonfly*)
++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++ case $host_cpu in
++ i*86 )
++ # Not sure whether the presence of OpenBSD here was a mistake.
++ # Let's accept both of them until this is cleared up.
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
++ lt_cv_file_magic_cmd=/usr/bin/file
++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++ ;;
++ esac
+ else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
-- fi
++ lt_cv_deplibs_check_method=pass_all
+ fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
@@ -6049,13 +6443,9 @@
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
-+newos6*)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
- nto-qnx*)
+-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
@@ -6063,10 +6453,11 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
-+ lt_cv_deplibs_check_method=unknown
++gnu*)
++ lt_cv_deplibs_check_method=pass_all
;;
- openbsd*)
+-openbsd*)
- version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
- need_lib_prefix=no
@@ -6074,11 +6465,26 @@
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
-- esac
++hpux10.20* | hpux11*)
++ lt_cv_file_magic_cmd=/usr/bin/file
++ case $host_cpu in
++ ia64*)
++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++ ;;
++ hppa*64*)
++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++ ;;
++ *)
++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++ lt_cv_file_magic_test_file=/usr/lib/libc.sl
++ ;;
+ esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
@@ -6087,11 +6493,9 @@
- shlibpath_overrides_runpath=yes
- ;;
- esac
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
- else
+- else
- shlibpath_overrides_runpath=yes
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- fi
+- fi
;;
-os2*)
@@ -6101,9 +6505,12 @@
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
-- ;;
--
- osf3* | osf4* | osf5*)
++interix[[3-9]]*)
++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+ ;;
+
+-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
@@ -6112,6 +6519,13 @@
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++irix5* | irix6* | nonstopux*)
++ case $LD in
++ *-32|*"-32 ") libmagic=32-bit;;
++ *-n32|*"-n32 ") libmagic=N32;;
++ *-64|*"-64 ") libmagic=64-bit;;
++ *) libmagic=never-match;;
++ esac
+ lt_cv_deplibs_check_method=pass_all
;;
@@ -6126,7 +6540,8 @@
- hardcode_into_libs=yes
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
-+rdos*)
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
;;
@@ -6138,18 +6553,21 @@
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
-- fi
++netbsd* | netbsdelf*-gnu)
++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++ else
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+ fi
- need_version=yes
-+solaris*)
-+ lt_cv_deplibs_check_method=pass_all
;;
- sysv4 | sysv4.3*)
+-sysv4 | sysv4.3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- case $host_vendor in
+- case $host_vendor in
- sni)
- shlibpath_overrides_runpath=no
- need_lib_prefix=no
@@ -6165,6 +6583,80 @@
- shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
- ;;
+- esac
++newos6*)
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++ lt_cv_file_magic_cmd=/usr/bin/file
++ lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ ;;
+
+-sysv4*MP*)
+- if test -d /usr/nec ;then
+- version_type=linux
+- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+- soname_spec='$libname${shared_ext}.$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- fi
++nto-qnx*)
++ lt_cv_deplibs_check_method=unknown
+ ;;
+
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+- version_type=freebsd-elf
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- hardcode_into_libs=yes
+- if test "$with_gnu_ld" = yes; then
+- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+- shlibpath_overrides_runpath=no
++openbsd*)
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+- shlibpath_overrides_runpath=yes
+- case $host_os in
+- sco3.2v5*)
+- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+- ;;
+- esac
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+- sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
++osf3* | osf4* | osf5*)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-*)
+- dynamic_linker=no
++rdos*)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+-esac
+-AC_MSG_RESULT([$dynamic_linker])
+-test "$dynamic_linker" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++solaris*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+
++sysv4 | sysv4.3*)
++ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
@@ -6187,63 +6679,9 @@
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
- esac
- ;;
-
--sysv4*MP*)
-- if test -d /usr/nec ;then
-- version_type=linux
-- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-- soname_spec='$libname${shared_ext}.$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- fi
-- ;;
--
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-- version_type=freebsd-elf
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- hardcode_into_libs=yes
-- if test "$with_gnu_ld" = yes; then
-- sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-- shlibpath_overrides_runpath=no
-- else
-- sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-- shlibpath_overrides_runpath=yes
-- case $host_os in
-- sco3.2v5*)
-- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-- ;;
-- esac
-- fi
-- sys_lib_dlsearch_path_spec='/usr/lib'
-- ;;
--
--uts4*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--*)
-- dynamic_linker=no
-+ lt_cv_deplibs_check_method=pass_all
- ;;
- esac
--AC_MSG_RESULT([$dynamic_linker])
--test "$dynamic_linker" = no && can_build_shared=no
--
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
-- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
--])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
--
--
++ esac
++ ;;
+
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -6251,6 +6689,10 @@
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
@@ -6326,7 +6768,7 @@
- # Extract list of available tagged configurations in $ofile.
- # Note that this assumes the entire list is on one line.
- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
--
+
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for tagname in $tagnames; do
- IFS="$lt_save_ifs"
@@ -6336,42 +6778,6 @@
- *) AC_MSG_ERROR([invalid tag name: $tagname])
- ;;
- esac
--
-- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-- then
-- AC_MSG_ERROR([tag name \"$tagname\" already exists])
-- fi
--
-- # Update the list of available tags.
-- if test -n "$tagname"; then
-- echo appending configuration tag \"$tagname\" to $ofile
--
-- case $tagname in
-- CXX)
-- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-- (test "X$CXX" != "Xg++"))) ; then
-- AC_LIBTOOL_LANG_CXX_CONFIG
-- else
-- tagname=""
-- fi
-- ;;
--
-- F77)
-- if test -n "$F77" && test "X$F77" != "Xno"; then
-- AC_LIBTOOL_LANG_F77_CONFIG
-- else
-- tagname=""
-- fi
-- ;;
-
-- GCJ)
-- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-- AC_LIBTOOL_LANG_GCJ_CONFIG
-- else
-- tagname=""
-- fi
-- ;;
+# AC_CHECK_LIBM
+# -------------
+# check for math library
@@ -6392,14 +6798,14 @@
+esac
+])# AC_CHECK_LIBM
-- RC)
-- AC_LIBTOOL_LANG_RC_CONFIG
-- ;;
-
-- *)
-- AC_MSG_ERROR([Unsupported tag name: $tagname])
-- ;;
-- esac
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+- then
+- AC_MSG_ERROR([tag name \"$tagname\" already exists])
+- fi
+
+- # Update the list of available tags.
+- if test -n "$tagname"; then
+- echo appending configuration tag \"$tagname\" to $ofile
+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl convenience library and
@@ -6424,18 +6830,24 @@
+ INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_CONVENIENCE
-- # Append the new tag name to the list of available tags.
-- if test -n "$tagname" ; then
-- available_tags="$available_tags $tagname"
-- fi
-- fi
-- done
-- IFS="$lt_save_ifs"
-
-- # Now substitute the updated list of available tags.
-- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-- mv "${ofile}T" "$ofile"
-- chmod +x "$ofile"
+- case $tagname in
+- CXX)
+- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+- (test "X$CXX" != "Xg++"))) ; then
+- AC_LIBTOOL_LANG_CXX_CONFIG
+- else
+- tagname=""
+- fi
+- ;;
+
+- F77)
+- if test -n "$F77" && test "X$F77" != "Xno"; then
+- AC_LIBTOOL_LANG_F77_CONFIG
+- else
+- tagname=""
+- fi
+- ;;
+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+# -----------------------------------
+# sets LIBLTDL to the link flags for the libltdl installable library and
@@ -6462,26 +6874,26 @@
+ ac_configure_args="$ac_configure_args --enable-ltdl-install"
+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
- else
-- rm -f "${ofile}T"
-- AC_MSG_ERROR([unable to update list of available tagged configurations.])
++ else
+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+ LIBLTDL="-lltdl"
+ LTDLINCL=
- fi
--fi
--])# _LT_AC_TAGCONFIG
++ fi
+ # For backwards non-gettext consistent compatibility...
+ INCLTDL="$LTDLINCL"
+])# AC_LIBLTDL_INSTALLABLE
-
--# AC_LIBTOOL_DLOPEN
--# -----------------
--# enable checks for dlopen support
--AC_DEFUN([AC_LIBTOOL_DLOPEN],
-- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_DLOPEN
+- GCJ)
+- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+- AC_LIBTOOL_LANG_GCJ_CONFIG
+- else
+- tagname=""
+- fi
+- ;;
+
+- RC)
+- AC_LIBTOOL_LANG_RC_CONFIG
+- ;;
+# AC_LIBTOOL_CXX
+# --------------
+# enable support for C++ libraries
@@ -6489,13 +6901,18 @@
+[AC_REQUIRE([_LT_AC_LANG_CXX])
+])# AC_LIBTOOL_CXX
-
--# AC_LIBTOOL_WIN32_DLL
--# --------------------
--# declare package support for building win32 DLLs
--AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
--[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_WIN32_DLL
+- *)
+- AC_MSG_ERROR([Unsupported tag name: $tagname])
+- ;;
+- esac
+
+- # Append the new tag name to the list of available tags.
+- if test -n "$tagname" ; then
+- available_tags="$available_tags $tagname"
+- fi
+- fi
+- done
+- IFS="$lt_save_ifs"
+# _LT_AC_LANG_CXX
+# ---------------
+AC_DEFUN([_LT_AC_LANG_CXX],
@@ -6504,6 +6921,14 @@
+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+])# _LT_AC_LANG_CXX
+- # Now substitute the updated list of available tags.
+- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+- mv "${ofile}T" "$ofile"
+- chmod +x "$ofile"
+- else
+- rm -f "${ofile}T"
+- AC_MSG_ERROR([unable to update list of available tagged configurations.])
+- fi
+# _LT_AC_PROG_CXXCPP
+# ------------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
@@ -6513,9 +6938,39 @@
+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+ (test "X$CXX" != "Xg++"))) ; then
+ AC_PROG_CXXCPP
-+fi
+ fi
+-])# _LT_AC_TAGCONFIG
+])# _LT_AC_PROG_CXXCPP
++# AC_LIBTOOL_F77
++# --------------
++# enable support for Fortran 77 libraries
++AC_DEFUN([AC_LIBTOOL_F77],
++[AC_REQUIRE([_LT_AC_LANG_F77])
++])# AC_LIBTOOL_F77
+
+-# AC_LIBTOOL_DLOPEN
+-# -----------------
+-# enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_DLOPEN
+
++# _LT_AC_LANG_F77
++# ---------------
++AC_DEFUN([_LT_AC_LANG_F77],
++[AC_REQUIRE([AC_PROG_F77])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
++])# _LT_AC_LANG_F77
+
+-# AC_LIBTOOL_WIN32_DLL
+-# --------------------
+-# declare package support for building win32 DLLs
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_WIN32_DLL
+
+-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
@@ -6544,12 +6999,12 @@
- esac],
- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-+# AC_LIBTOOL_F77
++# AC_LIBTOOL_GCJ
+# --------------
-+# enable support for Fortran 77 libraries
-+AC_DEFUN([AC_LIBTOOL_F77],
-+[AC_REQUIRE([_LT_AC_LANG_F77])
-+])# AC_LIBTOOL_F77
++# enable support for GCJ libraries
++AC_DEFUN([AC_LIBTOOL_GCJ],
++[AC_REQUIRE([_LT_AC_LANG_GCJ])
++])# AC_LIBTOOL_GCJ
-# AC_DISABLE_SHARED
@@ -6559,12 +7014,17 @@
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-+# _LT_AC_LANG_F77
++# _LT_AC_LANG_GCJ
+# ---------------
-+AC_DEFUN([_LT_AC_LANG_F77],
-+[AC_REQUIRE([AC_PROG_F77])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-+])# _LT_AC_LANG_F77
++AC_DEFUN([_LT_AC_LANG_GCJ],
++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
++ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
++ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
++ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
++])# _LT_AC_LANG_GCJ
-# AC_ENABLE_STATIC([DEFAULT])
@@ -6595,12 +7055,13 @@
- esac],
- [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-+# AC_LIBTOOL_GCJ
-+# --------------
-+# enable support for GCJ libraries
-+AC_DEFUN([AC_LIBTOOL_GCJ],
-+[AC_REQUIRE([_LT_AC_LANG_GCJ])
-+])# AC_LIBTOOL_GCJ
++# AC_LIBTOOL_RC
++# -------------
++# enable support for Windows resource files
++AC_DEFUN([AC_LIBTOOL_RC],
++[AC_REQUIRE([LT_AC_PROG_RC])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
++])# AC_LIBTOOL_RC
-# AC_DISABLE_STATIC
@@ -6610,18 +7071,18 @@
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-+# _LT_AC_LANG_GCJ
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_GCJ],
-+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-+ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-+ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-+ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-+])# _LT_AC_LANG_GCJ
-
++# AC_LIBTOOL_LANG_C_CONFIG
++# ------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined. Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
++AC_DEFUN([_LT_AC_LANG_C_CONFIG],
++[lt_save_CC="$CC"
++AC_LANG_PUSH(C)
+
++# Source file extension for C test sources.
++ac_ext=c
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
@@ -6651,14 +7112,12 @@
- esac],
- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-+# AC_LIBTOOL_RC
-+# -------------
-+# enable support for Windows resource files
-+AC_DEFUN([AC_LIBTOOL_RC],
-+[AC_REQUIRE([LT_AC_PROG_RC])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-+])# AC_LIBTOOL_RC
-
++# Object file extension for compiled C test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
@@ -6667,18 +7126,10 @@
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-+# AC_LIBTOOL_LANG_C_CONFIG
-+# ------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-+[lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
-
-+# Source file extension for C test sources.
-+ac_ext=c
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
+
++_LT_AC_SYS_COMPILER
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
@@ -6688,12 +7139,19 @@
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF
-# AC_PROG_EGREP
-# -------------
@@ -6708,10 +7166,12 @@
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
-
-+_LT_AC_SYS_COMPILER
++# Report which library types will actually be built
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
+
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
-# AC_PATH_TOOL_PREFIX
-# -------------------
@@ -6723,7 +7183,16 @@
-[case $MAGIC_CMD in
-[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-- ;;
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case $host_os in
++aix3*)
++ test "$enable_shared" = yes && enable_static=no
++ if test -n "$RANLIB"; then
++ archive_cmds="$archive_cmds~\$RANLIB \$lib"
++ postinstall_cmds='$RANLIB $lib'
++ fi
+ ;;
-*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -6746,9 +7215,6 @@
- :
- else
- cat <<EOF 1>&2
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -6758,15 +7224,13 @@
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool at gnu.org
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+AC_LIBTOOL_SYS_LIB_STRIP
-+AC_LIBTOOL_DLOPEN_SELF
++aix[[4-9]]*)
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
++ ;;
++esac
++AC_MSG_RESULT([$enable_shared])
-EOF
- fi ;;
@@ -6786,12 +7250,12 @@
- AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-+# Report which library types will actually be built
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
+
++AC_LIBTOOL_CONFIG($1)
-# AC_PATH_MAGIC
-# -------------
@@ -6803,26 +7267,13 @@
- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
- else
- MAGIC_CMD=:
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case $host_os in
-+aix3*)
-+ test "$enable_shared" = yes && enable_static=no
-+ if test -n "$RANLIB"; then
-+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+ postinstall_cmds='$RANLIB $lib'
- fi
+- fi
-fi
-])# AC_PATH_MAGIC
-+ ;;
-
-+aix[[4-9]]*)
-+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+ test "$enable_shared" = yes && enable_static=no
-+ fi
-+ ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
++AC_LANG_POP
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_C_CONFIG
+
-# AC_PROG_LD
-# ----------
@@ -6907,12 +7358,36 @@
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-
-+AC_LIBTOOL_CONFIG($1)
++# AC_LIBTOOL_LANG_CXX_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined. Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
++AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
++[AC_LANG_PUSH(C++)
++AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-# AC_PROG_LD_GNU
-# --------------
@@ -6930,10 +7405,16 @@
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_C_CONFIG
-
++# Dependencies to place before and after the object being linked:
++_LT_AC_TAGVAR(predep_objects, $1)=
++_LT_AC_TAGVAR(postdep_objects, $1)=
++_LT_AC_TAGVAR(predeps, $1)=
++_LT_AC_TAGVAR(postdeps, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
++# Source file extension for C++ test sources.
++ac_ext=cpp
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
@@ -6959,36 +7440,12 @@
- ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-+# AC_LIBTOOL_LANG_CXX_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-+[AC_LANG_PUSH(C++)
-+AC_REQUIRE([AC_PROG_CXX])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+_LT_AC_TAGVAR(always_export_symbols, $1)=no
-+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_direct, $1)=no
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+_LT_AC_TAGVAR(module_cmds, $1)=
-+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_AC_TAGVAR(no_undefined_flag, $1)=
-+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++# Object file extension for compiled C++ test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
@@ -7010,74 +7467,27 @@
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-+# Dependencies to place before and after the object being linked:
-+_LT_AC_TAGVAR(predep_objects, $1)=
-+_LT_AC_TAGVAR(postdep_objects, $1)=
-+_LT_AC_TAGVAR(predeps, $1)=
-+_LT_AC_TAGVAR(postdeps, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-case $host_os in
-aix4* | aix5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-+# Source file extension for C++ test sources.
-+ac_ext=cpp
-
--beos*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-
--bsdi[[45]]*)
-- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-- lt_cv_file_magic_cmd='/usr/bin/file -L'
-- lt_cv_file_magic_test_file=/shlib/libc.so
-- ;;
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
-
--cygwin*)
-- # func_win32_libid is a shell function defined in ltmain.sh
-- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-- lt_cv_file_magic_cmd='func_win32_libid'
-- ;;
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
--mingw* | pw32*)
-- # Base MSYS/MinGW do not provide the 'file' command needed by
-- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
-- ;;
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
--darwin* | rhapsody*)
+-beos*)
- lt_cv_deplibs_check_method=pass_all
- ;;
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
--freebsd* | kfreebsd*-gnu | dragonfly*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- case $host_cpu in
-- i*86 )
-- # Not sure whether the presence of OpenBSD here was a mistake.
-- # Let's accept both of them until this is cleared up.
-- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-- lt_cv_file_magic_cmd=/usr/bin/file
-- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-- ;;
-- esac
-- else
-- lt_cv_deplibs_check_method=pass_all
-- fi
+-bsdi[[45]]*)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+- lt_cv_file_magic_cmd='/usr/bin/file -L'
+- lt_cv_file_magic_test_file=/shlib/libc.so
- ;;
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
@@ -7102,8 +7512,10 @@
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
--gnu*)
-- lt_cv_deplibs_check_method=pass_all
+-cygwin*)
+- # func_win32_libid is a shell function defined in ltmain.sh
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+- lt_cv_file_magic_cmd='func_win32_libid'
- ;;
+# We don't want -fno-exception wen compiling C++ code, so set the
+# no_builtin_flag separately
@@ -7113,6 +7525,40 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+fi
+-mingw* | pw32*)
+- # Base MSYS/MinGW do not provide the 'file' command needed by
+- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
+- ;;
++if test "$GXX" = yes; then
++ # Set up default GNU C++ configuration
+
+-darwin* | rhapsody*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++ AC_PROG_LD
+
+-freebsd* | kfreebsd*-gnu | dragonfly*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+- case $host_cpu in
+- i*86 )
+- # Not sure whether the presence of OpenBSD here was a mistake.
+- # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+- ;;
+- esac
+- else
+- lt_cv_deplibs_check_method=pass_all
+- fi
+- ;;
+-
+-gnu*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
@@ -7130,14 +7576,16 @@
- ;;
- esac
- ;;
-+if test "$GXX" = yes; then
-+ # Set up default GNU C++ configuration
-
+-
-interix3*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
- ;;
-+ AC_PROG_LD
++ # Check if GNU C++ uses GNU ld as the underlying linker, since the
++ # archiving commands below assume that GNU ld is being used.
++ if test "$with_gnu_ld" = yes; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-irix5* | irix6* | nonstopux*)
- case $LD in
@@ -7148,44 +7596,21 @@
- esac
- lt_cv_deplibs_check_method=pass_all
- ;;
--
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
-# This must be Linux ELF.
-linux*)
- lt_cv_deplibs_check_method=pass_all
-- ;;
--
--netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-- else
-- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-- fi
-- ;;
-+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
-+ # archiving commands below assume that GNU ld is being used.
-+ if test "$with_gnu_ld" = yes; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
--newos6*)
-- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-- lt_cv_file_magic_cmd=/usr/bin/file
-- lt_cv_file_magic_test_file=/usr/lib/libnls.so
-- ;;
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
--nto-qnx*)
-- lt_cv_deplibs_check_method=unknown
- ;;
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+ # investigate it a little bit more. (MM)
+ wlarc='${wl}'
--openbsd*)
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+-netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+ grep 'no-whole-archive' > /dev/null; then
@@ -7194,10 +7619,27 @@
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
else
-- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+- fi
+- ;;
+-
+-newos6*)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=/usr/lib/libnls.so
+- ;;
+-
+-nto-qnx*)
+- lt_cv_deplibs_check_method=unknown
+- ;;
+ with_gnu_ld=no
+ wlarc=
-+
+
+-openbsd*)
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+- else
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ # A generic and very simple default shared library creation
+ # command for GNU C++ for the case where it uses the native
+ # linker, instead of GNU ld. If possible, this setting should
@@ -7336,8 +7778,14 @@
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
--
--
++ done
++ ;;
++ esac
+
++ exp_sym_flag='-bexport'
++ no_entry_flag='-bnoentry'
++ fi
+
-# AC_CHECK_LIBM
-# -------------
-# check for math library
@@ -7357,13 +7805,16 @@
- ;;
-esac
-])# AC_CHECK_LIBM
-+ done
-+ ;;
-+ esac
-
-+ exp_sym_flag='-bexport'
-+ no_entry_flag='-bnoentry'
-+ fi
++ # 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.
+
++ _LT_AC_TAGVAR(archive_cmds, $1)=''
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
@@ -7388,17 +7839,8 @@
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-+ # 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.
-
-+ _LT_AC_TAGVAR(archive_cmds, $1)=''
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
+-
+-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
@@ -7433,7 +7875,6 @@
- # For backwards non-gettext consistent compatibility...
- INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
--
+ if test "$GXX" = yes; then
+ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
@@ -7475,12 +7916,6 @@
+ fi
+ fi
--# AC_LIBTOOL_CXX
--# --------------
--# enable support for C++ libraries
--AC_DEFUN([AC_LIBTOOL_CXX],
--[AC_REQUIRE([_LT_AC_LANG_CXX])
--])# AC_LIBTOOL_CXX
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
@@ -7492,6 +7927,12 @@
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-# AC_LIBTOOL_CXX
+-# --------------
+-# enable support for C++ libraries
+-AC_DEFUN([AC_LIBTOOL_CXX],
+-[AC_REQUIRE([_LT_AC_LANG_CXX])
+-])# AC_LIBTOOL_CXX
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$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
+ if test "$host_cpu" = ia64; then
@@ -7515,13 +7956,6 @@
+ fi
+ ;;
--# _LT_AC_LANG_CXX
--# ---------------
--AC_DEFUN([_LT_AC_LANG_CXX],
--[AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([_LT_AC_PROG_CXXCPP])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
--])# _LT_AC_LANG_CXX
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -7531,6 +7965,22 @@
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
++ ;;
+
+-# _LT_AC_LANG_CXX
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_CXX],
+-[AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+-])# _LT_AC_LANG_CXX
++ chorus*)
++ case $cc_basename in
++ *)
++ # FIXME: insert proper C++ library support
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
+ ;;
-# _LT_AC_PROG_CXXCPP
@@ -7544,21 +7994,6 @@
- AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-+ chorus*)
-+ case $cc_basename in
-+ *)
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ esac
-+ ;;
-
--# AC_LIBTOOL_F77
--# --------------
--# enable support for Fortran 77 libraries
--AC_DEFUN([AC_LIBTOOL_F77],
--[AC_REQUIRE([_LT_AC_LANG_F77])
--])# AC_LIBTOOL_F77
+ cygwin* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
@@ -7567,6 +8002,12 @@
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-# AC_LIBTOOL_F77
+-# --------------
+-# enable support for Fortran 77 libraries
+-AC_DEFUN([AC_LIBTOOL_F77],
+-[AC_REQUIRE([_LT_AC_LANG_F77])
+-])# AC_LIBTOOL_F77
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
@@ -7617,12 +8058,6 @@
+ fi
+ ;;
--# _LT_AC_LANG_F77
--# ---------------
--AC_DEFUN([_LT_AC_LANG_F77],
--[AC_REQUIRE([AC_PROG_F77])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
--])# _LT_AC_LANG_F77
+ dgux*)
+ case $cc_basename in
+ ec++*)
@@ -7663,6 +8098,42 @@
+ # but as the default
+ # location of the library.
+-# _LT_AC_LANG_F77
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_F77],
+-[AC_REQUIRE([AC_PROG_F77])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+-])# _LT_AC_LANG_F77
+-
+-
+-# AC_LIBTOOL_GCJ
+-# --------------
+-# enable support for GCJ libraries
+-AC_DEFUN([AC_LIBTOOL_GCJ],
+-[AC_REQUIRE([_LT_AC_LANG_GCJ])
+-])# AC_LIBTOOL_GCJ
+-
+-
+-# _LT_AC_LANG_GCJ
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_GCJ],
+-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+-])# _LT_AC_LANG_GCJ
+-
+-
+-# AC_LIBTOOL_RC
+-# -------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+-])# AC_LIBTOOL_RC
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
@@ -7695,60 +8166,6 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# AC_LIBTOOL_GCJ
--# --------------
--# enable support for GCJ libraries
--AC_DEFUN([AC_LIBTOOL_GCJ],
--[AC_REQUIRE([_LT_AC_LANG_GCJ])
--])# AC_LIBTOOL_GCJ
--
--
--# _LT_AC_LANG_GCJ
--# ---------------
--AC_DEFUN([_LT_AC_LANG_GCJ],
--[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
--])# _LT_AC_LANG_GCJ
--
--
--# AC_LIBTOOL_RC
--# -------------
--# enable support for Windows resource files
--AC_DEFUN([AC_LIBTOOL_RC],
--[AC_REQUIRE([LT_AC_PROG_RC])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
--])# AC_LIBTOOL_RC
--
--
--# AC_LIBTOOL_LANG_C_CONFIG
--# ------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined. Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
--AC_DEFUN([_LT_AC_LANG_C_CONFIG],
--[lt_save_CC="$CC"
--AC_LANG_PUSH(C)
--
--# Source file extension for C test sources.
--ac_ext=c
--
--# Object file extension for compiled C test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
--
--_LT_AC_SYS_COMPILER
+ case $host_cpu in
+ hppa*64*|ia64*) ;;
+ *)
@@ -7769,9 +8186,15 @@
+ ;;
+ esac
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+-# AC_LIBTOOL_LANG_C_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined. Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+-[lt_save_CC="$CC"
+-AC_LANG_PUSH(C)
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
@@ -7841,15 +8264,8 @@
+ # SGI C++
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF
+-# Source file extension for C test sources.
+-ac_ext=c
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+ # necessary to make sure instantiated templates are included
@@ -7875,9 +8291,9 @@
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
--# Report which library types will actually be built
--AC_MSG_CHECKING([if libtool supports shared libraries])
--AC_MSG_RESULT([$can_build_shared])
+-# Object file extension for compiled C test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
@@ -7893,21 +8309,13 @@
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--AC_MSG_CHECKING([whether to build shared libraries])
--test "$can_build_shared" = "no" && enable_shared=no
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--# On AIX, shared libraries and static libraries use the same namespace, and
--# are all built from PIC.
--case $host_os in
--aix3*)
-- test "$enable_shared" = yes && enable_static=no
-- if test -n "$RANLIB"; then
-- archive_cmds="$archive_cmds~\$RANLIB \$lib"
-- postinstall_cmds='$RANLIB $lib'
-- fi
-- ;;
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
@@ -7942,13 +8350,7 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
--aix4* | aix5*)
-- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-- test "$enable_shared" = yes && enable_static=no
-- fi
-- ;;
--esac
--AC_MSG_RESULT([$enable_shared])
+-_LT_AC_SYS_COMPILER
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
@@ -7958,19 +8360,26 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
--AC_MSG_CHECKING([whether to build static libraries])
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--AC_MSG_RESULT([$enable_static])
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+ runpath_var=LD_RUN_PATH
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--AC_LIBTOOL_CONFIG($1)
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF
-
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_C_CONFIG
+-# Report which library types will actually be built
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
@@ -8062,10 +8471,75 @@
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+- test "$enable_shared" = yes && enable_static=no
+- if test -n "$RANLIB"; then
+- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+- postinstall_cmds='$RANLIB $lib'
+- fi
+- ;;
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+-aix4* | aix5*)
+- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+- test "$enable_shared" = yes && enable_static=no
+- fi
+- ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
++ # Archives containing C++ object files must be created using
++ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
++ ;;
++ RCC*)
++ # Rational C++ 2.4.1
++ # FIXME: insert proper C++ library support
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ cxx*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+-AC_LIBTOOL_CONFIG($1)
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_C_CONFIG
++ # Commands to make compiler produce verbose output that lists
++ # what "hidden" libraries, object files and flags are used when
++ # linking a shared library.
++ #
++ # There doesn't appear to be a way to prevent this compiler from
++ # explicitly linking system object files so we need to strip them
++ # from the output so that they don't get included in the library
++ # dependencies.
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ ;;
++ *)
++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $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'
+
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
@@ -8077,8 +8551,10 @@
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++ # Commands to make compiler produce verbose output that lists
++ # what "hidden" libraries, object files and flags are used when
++ # linking a shared library.
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -8099,9 +8575,17 @@
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+ # Archives containing C++ object files must be created using
-+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++ else
++ # FIXME: insert proper C++ library support
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++ esac
++ ;;
++ osf4* | osf5*)
++ case $cc_basename in
++ KCC*)
++ # Kuck and Associates, Inc. (KAI) C++ Compiler
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
@@ -8109,6 +8593,22 @@
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++ # KCC will only create a shared library if the output file
++ # ends with ".so" (or ".sl" for HP-UX), so rename the library
++ # to its proper name (with version) after linking.
++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+-# Source file extension for C++ test sources.
+-ac_ext=cpp
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++ # Archives containing C++ object files must be created using
++ # the KAI C++ compiler.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ ;;
+ RCC*)
+ # Rational C++ 2.4.1
@@ -8116,17 +8616,20 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ cxx*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
--# Source file extension for C++ test sources.
--ac_ext=cpp
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++ echo "-hidden">> $lib.exp~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
++ $rm $lib.exp'
+
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
@@ -8140,41 +8643,20 @@
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $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'
-
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
-+ else
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+ esac
-+ ;;
-+ osf4* | osf5*)
-+ case $cc_basename in
-+ KCC*)
-+ # Kuck and Associates, Inc. (KAI) C++ Compiler
-
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
-+ # KCC will only create a shared library if the output file
-+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+ # to its proper name (with version) after linking.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
@@ -8198,9 +8680,7 @@
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
+-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
@@ -8208,99 +8688,20 @@
-else
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-+ # Archives containing C++ object files must be created using
-+ # the KAI C++ compiler.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-+ ;;
-+ RCC*)
-+ # Rational C++ 2.4.1
-+ # FIXME: insert proper C++ library support
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-+ cxx*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+ echo "-hidden">> $lib.exp~
-+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-+ $rm $lib.exp'
-
+-
-if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
+-
- AC_PROG_LD
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ #
-+ # There doesn't appear to be a way to prevent this compiler from
-+ # explicitly linking system object files so we need to strip them
-+ # from the output so that they don't get included in the library
-+ # dependencies.
-+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ ;;
-+ *)
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
+-
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
+-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-- # If archive_cmds runs LD, not CC, wlarc should be empty
-- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-- # investigate it a little bit more. (MM)
-- wlarc='${wl}'
--
-- # ancient GNU ld didn't support --whole-archive et. al.
-- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-- grep 'no-whole-archive' > /dev/null; then
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-- else
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-- fi
-- else
-- with_gnu_ld=no
-- wlarc=
--
-- # A generic and very simple default shared library creation
-- # command for GNU C++ for the case where it uses the native
-- # linker, instead of GNU ld. If possible, this setting should
-- # overridden to take advantage of the native linker features on
-- # the platform it is being used on.
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- fi
--
-- # Commands to make compiler produce verbose output that lists
-- # what "hidden" libraries, object files and flags are used when
-- # linking a shared library.
-- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--
--else
-- GXX=no
-- with_gnu_ld=no
-- wlarc=
--fi
--
--# PORTME: fill in a description of your system's C++ link characteristics
--AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
--_LT_AC_TAGVAR(ld_shlibs, $1)=yes
--case $host_os in
-- aix3*)
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -8309,39 +8710,16 @@
+ esac
+ ;;
+ psos*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- aix4* | aix5*)
-- if test "$host_cpu" = ia64; then
-- # On IA64, the linker does run time linking by default, so we don't
-- # have to do anything special.
-- aix_use_runtimelinking=no
-- exp_sym_flag='-Bexport'
-- no_entry_flag=""
-- else
-- aix_use_runtimelinking=no
--
-- # Test if we are trying to use run time linking or normal
-- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-- # need to do runtime linking.
-- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-- for ld_flag in $LDFLAGS; do
-- case $ld_flag in
-- *-brtl*)
-- aix_use_runtimelinking=yes
-- break
-- ;;
-- esac
-- done
++ # FIXME: insert proper C++ library support
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
+ sunos4*)
+ case $cc_basename in
+ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- esac
++ ;;
+ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
@@ -8363,9 +8741,10 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-- exp_sym_flag='-bexport'
-- no_entry_flag='-bnoentry'
-- fi
+- # If archive_cmds runs LD, not CC, wlarc should be empty
+- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+- # investigate it a little bit more. (MM)
+- wlarc='${wl}'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
@@ -8379,17 +8758,25 @@
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- # 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.
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+- grep 'no-whole-archive' > /dev/null; then
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- fi
+- else
+- with_gnu_ld=no
+- wlarc=
+ output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)=''
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- # A generic and very simple default shared library creation
+- # command for GNU C++ for the case where it uses the native
+- # linker, instead of GNU ld. If possible, this setting should
+- # overridden to take advantage of the native linker features on
+- # the platform it is being used on.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- fi
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
@@ -8399,6 +8786,138 @@
+ gcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++ # The C++ compiler must be used to create the archive.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++ ;;
++ *)
++ # GNU C++ compiler with Solaris linker
++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++ if $CC --version | grep -v '^2\.7' > /dev/null; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+-else
+- GXX=no
+- with_gnu_ld=no
+- wlarc=
+-fi
++ # Commands to make compiler produce verbose output that lists
++ # what "hidden" libraries, object files and flags are used when
++ # linking a shared library.
++ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++ else
++ # g++ 2.7 appears to require `-G' NOT `-shared' on this
++ # platform.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+-# PORTME: fill in a description of your system's C++ link characteristics
+-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-case $host_os in
+- aix3*)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- aix4* | aix5*)
+- if test "$host_cpu" = ia64; then
+- # On IA64, the linker does run time linking by default, so we don't
+- # have to do anything special.
+- aix_use_runtimelinking=no
+- exp_sym_flag='-Bexport'
+- no_entry_flag=""
+- else
+- aix_use_runtimelinking=no
++ # Commands to make compiler produce verbose output that lists
++ # what "hidden" libraries, object files and flags are used when
++ # linking a shared library.
++ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++ fi
+
+- # Test if we are trying to use run time linking or normal
+- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+- # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+- for ld_flag in $LDFLAGS; do
+- case $ld_flag in
+- *-brtl*)
+- aix_use_runtimelinking=yes
+- break
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+- done
++ fi
+ ;;
+- esac
+-
+- exp_sym_flag='-bexport'
+- no_entry_flag='-bnoentry'
+- fi
+-
+- # 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.
++ esac
++ ;;
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ runpath_var='LD_RUN_PATH'
+
+- _LT_AC_TAGVAR(archive_cmds, $1)=''
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
++ ;;
++ 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.
++ # For security reasons, it is highly recommended that you always
++ # use absolute paths for naming shared libraries, and exclude the
++ # DT_RUNPATH tag from executables and libraries. But doing so
++ # requires that you compile everything twice, which is a pain.
++ # So that behaviour is only enabled if SCOABSPATH is set to a
++ # non-empty value in the environment. Most likely only useful for
++ # creating official distributions of packages.
++ # This is a hack until libtool officially supports absolute path
++ # names for shared libraries.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++ runpath_var='LD_RUN_PATH'
- if test "$GXX" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
@@ -8420,8 +8939,10 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
- fi
-+ # The C++ compiler must be used to create the archive.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
- esac
- shared_flag='-shared'
@@ -8442,15 +8963,7 @@
- fi
- fi
- fi
-+ *)
-+ # GNU C++ compiler with Solaris linker
-+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+ if $CC --version | grep -v '^2\.7' > /dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
+-
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
@@ -8461,17 +8974,7 @@
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+ else
-+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+ # platform.
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
+-
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$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
- if test "$host_cpu" = ia64; then
@@ -8494,12 +8997,7 @@
- fi
- fi
- ;;
-+ # Commands to make compiler produce verbose output that lists
-+ # what "hidden" libraries, object files and flags are used when
-+ # linking a shared library.
-+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+ fi
-
+-
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -8509,63 +9007,19 @@
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
-+ fi
-+ ;;
-+ esac
- ;;
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ runpath_var='LD_RUN_PATH'
-
+- ;;
+-
- chorus*)
- case $cc_basename in
-+ CC*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
+- case $cc_basename in
*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
-+ 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.
-+ # For security reasons, it is highly recommended that you always
-+ # use absolute paths for naming shared libraries, and exclude the
-+ # DT_RUNPATH tag from executables and libraries. But doing so
-+ # requires that you compile everything twice, which is a pain.
-+ # So that behaviour is only enabled if SCOABSPATH is set to a
-+ # non-empty value in the environment. Most likely only useful for
-+ # creating official distributions of packages.
-+ # This is a hack until libtool officially supports absolute path
-+ # names for shared libraries.
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+ runpath_var='LD_RUN_PATH'
-
+-
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
@@ -8653,30 +9107,20 @@
- ;;
-
- dgux*)
++ tandem*)
case $cc_basename in
- ec++*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ CC*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
+- ;;
- ghcx*)
- # Green Hills C++ Compiler
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ ;;
-+ esac
-+ ;;
-+ tandem*)
-+ case $cc_basename in
+ NCC*)
+ # NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -4713,603 +4504,337 @@
+@@ -4713,603 +4809,337 @@
;;
esac
;;
@@ -9376,12 +9820,7 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-
+-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
@@ -9399,14 +9838,9 @@
- ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-
+-
- output_verbose_link_cmd='echo'
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-
+-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
- # necessary to make sure instantiated templates are included
@@ -9416,12 +9850,11 @@
- gcx*)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${F77-"f77"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
++# Code to be used in simple link tests
++lt_simple_link_test_code="\
++ program t
++ end
++"
- # The C++ compiler must be used to create the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
@@ -9434,7 +9867,9 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
+
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
@@ -9445,13 +9880,22 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- fi
--
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
- fi
- ;;
@@ -9569,7 +10013,7 @@
AC_LIBTOOL_PROG_COMPILER_PIC($1)
AC_LIBTOOL_PROG_CC_C_O($1)
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-@@ -5320,304 +4845,34 @@
+@@ -5320,301 +5150,31 @@
AC_LIBTOOL_CONFIG($1)
AC_LANG_POP
@@ -9656,10 +10100,7 @@
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-
+-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
@@ -9670,9 +10111,7 @@
- else
- prev=
- fi
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}"
-
+-
- if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
@@ -9696,9 +10135,7 @@
- fi
- fi
- ;;
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
+-
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
@@ -9881,21 +10318,21 @@
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
--
--# Code to be used in simple link tests
++lt_simple_compile_test_code="class foo {}"
+
+ # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-
- # save warnings/boilerplate of simple test code
- _LT_COMPILER_BOILERPLATE
-@@ -5667,7 +4922,7 @@
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+@@ -5667,7 +5227,7 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -9904,7 +10341,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -5741,6 +4996,7 @@
+@@ -5741,6 +5301,7 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
@@ -9912,7 +10349,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -5756,6 +5012,7 @@
+@@ -5756,6 +5317,7 @@
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -9920,7 +10357,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -5802,7 +5059,7 @@
+@@ -5802,7 +5364,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -9929,7 +10366,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -6039,6 +5296,10 @@
+@@ -6039,6 +5601,10 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
@@ -9940,7 +10377,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -6123,2032 +5384,3035 @@
+@@ -6123,2034 +5689,3033 @@
# Compile-time system search path for libraries
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
@@ -14762,11 +15199,13 @@
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
- m4_include([m4/d-type.m4])
- m4_include([m4/gnome-doc-utils.m4])
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/applets/clock/e-map/Makefile.in gnome-panel-2.22.0/applets/clock/e-map/Makefile.in
---- gnome-panel-2.22.0.old/applets/clock/e-map/Makefile.in 2008-03-10 22:11:37.000000000 +0100
-+++ gnome-panel-2.22.0/applets/clock/e-map/Makefile.in 2008-03-17 13:41:57.000000000 +0100
+-m4_include([m4/d-type.m4])
+-m4_include([m4/gnome-doc-utils.m4])
+-m4_include([m4/gtk-doc.m4])
+-m4_include([m4/intltool.m4])
+diff -Naur gnome-panel-2.22.1.orig/applets/Makefile.in gnome-panel-2.22.1/applets/Makefile.in
+--- gnome-panel-2.22.1.orig/applets/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/applets/Makefile.in 2008-04-12 20:22:56.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -14778,16 +15217,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -51,7 +51,7 @@
- am_libemap_a_OBJECTS = libemap_a-e-map.$(OBJEXT) \
- libemap_a-e-map-marshal.$(OBJEXT)
- libemap_a_OBJECTS = $(am_libemap_a_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -106,6 +106,7 @@
+@@ -34,10 +34,7 @@
+ subdir = applets
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -96,6 +93,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -14795,7 +15237,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -166,6 +167,8 @@
+@@ -155,6 +153,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -14804,7 +15246,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -176,6 +179,7 @@
+@@ -165,6 +165,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -14812,7 +15254,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -203,6 +207,7 @@
+@@ -192,6 +193,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -14820,7 +15262,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -398,8 +403,8 @@
+@@ -380,8 +382,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -14831,7 +15273,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -411,8 +416,8 @@
+@@ -406,8 +408,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -14842,7 +15284,344 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -422,13 +427,12 @@
+@@ -417,13 +419,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -Naur gnome-panel-2.22.1.orig/applets/clock/Makefile.in gnome-panel-2.22.1/applets/clock/Makefile.in
+--- gnome-panel-2.22.1.orig/applets/clock/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/applets/clock/Makefile.in 2008-04-12 20:22:56.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -42,10 +42,7 @@
+ subdir = applets/clock
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,7 +158,7 @@
+ $(am_gnome_clock_applet_mechanism_OBJECTS)
+ gnome_clock_applet_mechanism_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -238,6 +235,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DLLTOOL = @DLLTOOL@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -297,6 +295,8 @@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -307,6 +307,7 @@
+ MSGMERGE = @MSGMERGE@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -334,6 +335,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -585,8 +587,8 @@
+ @list='$(clock_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(clock_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(clock_appletlibdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(clock_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(clock_appletlibdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(clock_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(clock_appletlibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(clock_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(clock_appletlibdir)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -594,8 +596,8 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(clock_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(clock_appletlibdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(clock_appletlibdir)/$$p"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(clock_appletlibdir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(clock_appletlibdir)/$$p"; \
+ done
+
+ clean-clock_appletlibLTLIBRARIES:
+@@ -617,8 +619,8 @@
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+@@ -1287,8 +1289,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -1313,8 +1315,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -1324,13 +1326,12 @@
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+- here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+diff -Naur gnome-panel-2.22.1.orig/applets/clock/pixmaps/Makefile.in gnome-panel-2.22.1/applets/clock/pixmaps/Makefile.in
+--- gnome-panel-2.22.1.orig/applets/clock/pixmaps/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/applets/clock/pixmaps/Makefile.in 2008-04-12 20:22:56.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,10 +35,7 @@
+ subdir = applets/clock/pixmaps
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -94,6 +91,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DLLTOOL = @DLLTOOL@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -153,6 +151,8 @@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -163,6 +163,7 @@
+ MSGMERGE = @MSGMERGE@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -190,6 +191,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -Naur gnome-panel-2.22.1.orig/applets/fish/Makefile.in gnome-panel-2.22.1/applets/fish/Makefile.in
+--- gnome-panel-2.22.1.orig/applets/fish/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/applets/fish/Makefile.in 2008-04-12 20:22:56.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -38,10 +38,7 @@
+ subdir = applets/fish
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -86,7 +83,7 @@
+ fish_applet_2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(fish_applet_2_CFLAGS) \
+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -149,6 +146,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DLLTOOL = @DLLTOOL@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -208,6 +206,8 @@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -218,6 +218,7 @@
+ MSGMERGE = @MSGMERGE@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -245,6 +246,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -407,8 +409,8 @@
+ @list='$(fish_applet_2lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(fish_applet_2libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fish_applet_2libdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(fish_applet_2libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fish_applet_2libdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fish_applet_2libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fish_applet_2libdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fish_applet_2libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fish_applet_2libdir)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -416,8 +418,8 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(fish_applet_2lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(fish_applet_2libdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(fish_applet_2libdir)/$$p"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(fish_applet_2libdir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(fish_applet_2libdir)/$$p"; \
+ done
+
+ clean-fish_applet_2libLTLIBRARIES:
+@@ -439,8 +441,8 @@
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+@@ -609,8 +611,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -622,8 +624,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) ' { files[$$0] = 1; } \
+- END { for (i in files) print i; }'`; \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -633,13 +635,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -14858,9 +15637,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/applets/clock/Makefile.in gnome-panel-2.22.0/applets/clock/Makefile.in
---- gnome-panel-2.22.0.old/applets/clock/Makefile.in 2008-03-10 22:11:37.000000000 +0100
-+++ gnome-panel-2.22.0/applets/clock/Makefile.in 2008-03-17 13:41:57.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/applets/notification_area/Makefile.in gnome-panel-2.22.1/applets/notification_area/Makefile.in
+--- gnome-panel-2.22.1.orig/applets/notification_area/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/applets/notification_area/Makefile.in 2008-04-12 20:22:56.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -14872,16 +15651,28 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -174,7 +174,7 @@
- $(am_gnome_clock_applet_mechanism_OBJECTS)
- gnome_clock_applet_mechanism_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+@@ -39,10 +39,7 @@
+ subdir = applets/notification_area
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -110,7 +107,7 @@
+ testtray.$(OBJEXT)
+ testtray_OBJECTS = $(am_testtray_OBJECTS)
+ testtray_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -251,6 +251,7 @@
+@@ -171,6 +168,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -14889,7 +15680,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -311,6 +312,8 @@
+@@ -230,6 +228,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -14898,7 +15689,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -321,6 +324,7 @@
+@@ -240,6 +240,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -14906,7 +15697,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -348,6 +352,7 @@
+@@ -267,6 +268,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -14914,29 +15705,29 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -612,8 +617,8 @@
- @list='$(clock_appletlib_LTLIBRARIES)'; for p in $$list; do \
+@@ -451,8 +453,8 @@
+ @list='$(notification_area_appletlib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(clock_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(clock_appletlibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(clock_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(clock_appletlibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(clock_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(clock_appletlibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(clock_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(clock_appletlibdir)/$$f"; \
+- echo " $(LIBTOOL) --mode=install $(notification_area_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(notification_area_appletlibdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(notification_area_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(notification_area_appletlibdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(notification_area_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(notification_area_appletlibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(notification_area_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(notification_area_appletlibdir)/$$f"; \
else :; fi; \
done
-@@ -621,8 +626,8 @@
+@@ -460,8 +462,8 @@
@$(NORMAL_UNINSTALL)
- @list='$(clock_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ @list='$(notification_area_appletlib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(clock_appletlibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(clock_appletlibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(clock_appletlibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(clock_appletlibdir)/$$p"; \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(notification_area_appletlibdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(notification_area_appletlibdir)/$$p"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(notification_area_appletlibdir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(notification_area_appletlibdir)/$$p"; \
done
- clean-clock_appletlibLTLIBRARIES:
-@@ -644,8 +649,8 @@
+ clean-notification_area_appletlibLTLIBRARIES:
+@@ -483,8 +485,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -14947,7 +15738,7 @@
else :; fi; \
done
-@@ -1429,8 +1434,8 @@
+@@ -733,8 +735,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -14958,7 +15749,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -1455,8 +1460,8 @@
+@@ -746,8 +748,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -14969,181 +15760,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -1466,13 +1471,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/applets/clock/pixmaps/Makefile.in gnome-panel-2.22.0/applets/clock/pixmaps/Makefile.in
---- gnome-panel-2.22.0.old/applets/clock/pixmaps/Makefile.in 2008-03-10 22:11:38.000000000 +0100
-+++ gnome-panel-2.22.0/applets/clock/pixmaps/Makefile.in 2008-03-17 13:41:57.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
- DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DLLTOOL = @DLLTOOL@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -154,6 +155,8 @@
- LIBTOOL = @LIBTOOL@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -164,6 +167,7 @@
- MSGMERGE = @MSGMERGE@
- NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
- NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
-@@ -191,6 +195,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/applets/fish/Makefile.in gnome-panel-2.22.0/applets/fish/Makefile.in
---- gnome-panel-2.22.0.old/applets/fish/Makefile.in 2008-03-10 22:11:38.000000000 +0100
-+++ gnome-panel-2.22.0/applets/fish/Makefile.in 2008-03-17 13:41:57.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,7 +86,7 @@
- fish_applet_2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(fish_applet_2_CFLAGS) \
- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -149,6 +149,7 @@
- DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DLLTOOL = @DLLTOOL@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -209,6 +210,8 @@
- LIBTOOL = @LIBTOOL@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -219,6 +222,7 @@
- MSGMERGE = @MSGMERGE@
- NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
- NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
-@@ -246,6 +250,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -408,8 +413,8 @@
- @list='$(fish_applet_2lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(fish_applet_2libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fish_applet_2libdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(fish_applet_2libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fish_applet_2libdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fish_applet_2libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(fish_applet_2libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(fish_applet_2libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(fish_applet_2libdir)/$$f"; \
- else :; fi; \
- done
-
-@@ -417,8 +422,8 @@
- @$(NORMAL_UNINSTALL)
- @list='$(fish_applet_2lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(fish_applet_2libdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(fish_applet_2libdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(fish_applet_2libdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(fish_applet_2libdir)/$$p"; \
- done
-
- clean-fish_applet_2libLTLIBRARIES:
-@@ -440,8 +445,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-@@ -610,8 +615,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -623,8 +628,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -634,13 +639,12 @@
+@@ -757,13 +759,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -15159,9 +15776,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/applets/Makefile.in gnome-panel-2.22.0/applets/Makefile.in
---- gnome-panel-2.22.0.old/applets/Makefile.in 2008-03-10 22:11:37.000000000 +0100
-+++ gnome-panel-2.22.0/applets/Makefile.in 2008-03-17 13:41:55.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/applets/wncklet/Makefile.in gnome-panel-2.22.1/applets/wncklet/Makefile.in
+--- gnome-panel-2.22.1.orig/applets/wncklet/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/applets/wncklet/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -15173,7 +15790,28 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -38,10 +38,7 @@
+ subdir = applets/wncklet
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -98,7 +95,7 @@
+ wnck_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(wnck_applet_CFLAGS) \
+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
++DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -159,6 +156,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -15181,7 +15819,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -156,6 +157,8 @@
+@@ -218,6 +216,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -15190,7 +15828,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -166,6 +169,7 @@
+@@ -228,6 +228,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -15198,7 +15836,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -193,6 +197,7 @@
+@@ -255,6 +256,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -15206,7 +15844,40 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -381,8 +386,8 @@
+@@ -427,8 +429,8 @@
+ @list='$(wnck_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=install $(wnck_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(wnck_appletlibdir)/$$f'"; \
+- $(LIBTOOL) --mode=install $(wnck_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(wnck_appletlibdir)/$$f"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(wnck_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(wnck_appletlibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(wnck_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(wnck_appletlibdir)/$$f"; \
+ else :; fi; \
+ done
+
+@@ -436,8 +438,8 @@
+ @$(NORMAL_UNINSTALL)
+ @list='$(wnck_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(wnck_appletlibdir)/$$p'"; \
+- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(wnck_appletlibdir)/$$p"; \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(wnck_appletlibdir)/$$p'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(wnck_appletlibdir)/$$p"; \
+ done
+
+ clean-wnck_appletlibLTLIBRARIES:
+@@ -459,8 +461,8 @@
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+@@ -704,8 +706,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -15217,7 +15888,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -407,8 +412,8 @@
+@@ -717,8 +719,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -15228,134 +15899,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -418,13 +423,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/applets/notification_area/Makefile.in gnome-panel-2.22.0/applets/notification_area/Makefile.in
---- gnome-panel-2.22.0.old/applets/notification_area/Makefile.in 2008-03-10 22:11:38.000000000 +0100
-+++ gnome-panel-2.22.0/applets/notification_area/Makefile.in 2008-03-17 13:41:58.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -110,7 +110,7 @@
- testtray.$(OBJEXT)
- testtray_OBJECTS = $(am_testtray_OBJECTS)
- testtray_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -171,6 +171,7 @@
- DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DLLTOOL = @DLLTOOL@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -231,6 +232,8 @@
- LIBTOOL = @LIBTOOL@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -241,6 +244,7 @@
- MSGMERGE = @MSGMERGE@
- NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
- NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
-@@ -268,6 +272,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -452,8 +457,8 @@
- @list='$(notification_area_appletlib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(notification_area_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(notification_area_appletlibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(notification_area_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(notification_area_appletlibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(notification_area_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(notification_area_appletlibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(notification_area_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(notification_area_appletlibdir)/$$f"; \
- else :; fi; \
- done
-
-@@ -461,8 +466,8 @@
- @$(NORMAL_UNINSTALL)
- @list='$(notification_area_appletlib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(notification_area_appletlibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(notification_area_appletlibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(notification_area_appletlibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(notification_area_appletlibdir)/$$p"; \
- done
-
- clean-notification_area_appletlibLTLIBRARIES:
-@@ -484,8 +489,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-@@ -734,8 +739,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -747,8 +752,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -758,13 +763,12 @@
+@@ -728,13 +730,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -15371,136 +15915,369 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/applets/wncklet/Makefile.in gnome-panel-2.22.0/applets/wncklet/Makefile.in
---- gnome-panel-2.22.0.old/applets/wncklet/Makefile.in 2008-03-10 22:11:38.000000000 +0100
-+++ gnome-panel-2.22.0/applets/wncklet/Makefile.in 2008-03-17 13:41:58.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -98,7 +98,7 @@
- wnck_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(wnck_applet_CFLAGS) \
- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -159,6 +159,7 @@
- DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DLLTOOL = @DLLTOOL@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -219,6 +220,8 @@
- LIBTOOL = @LIBTOOL@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -229,6 +232,7 @@
- MSGMERGE = @MSGMERGE@
- NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
- NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
-@@ -256,6 +260,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -428,8 +433,8 @@
- @list='$(wnck_appletlib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(wnck_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(wnck_appletlibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(wnck_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(wnck_appletlibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(wnck_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(wnck_appletlibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(wnck_appletlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(wnck_appletlibdir)/$$f"; \
- else :; fi; \
- done
-
-@@ -437,8 +442,8 @@
- @$(NORMAL_UNINSTALL)
- @list='$(wnck_appletlib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(wnck_appletlibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(wnck_appletlibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(wnck_appletlibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(wnck_appletlibdir)/$$p"; \
- done
-
- clean-wnck_appletlibLTLIBRARIES:
-@@ -460,8 +465,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-@@ -705,8 +710,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -718,8 +723,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -729,13 +734,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/configure gnome-panel-2.22.0/configure
---- gnome-panel-2.22.0.old/configure 2008-03-10 22:11:36.000000000 +0100
-+++ gnome-panel-2.22.0/configure 2008-03-17 13:41:54.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/config.guess gnome-panel-2.22.1/config.guess
+--- gnome-panel-2.22.1.orig/config.guess 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/config.guess 2008-02-17 21:10:30.000000000 +0100
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-# Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# Free Software Foundation, Inc.
+
+-timestamp='2006-07-02'
++timestamp='2008-01-23'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -56,8 +56,8 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -161,6 +161,7 @@
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
++ sh5el) machine=sh5le-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+@@ -329,7 +330,7 @@
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+- i86pc:SunOS:5.*:*)
++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+@@ -531,7 +532,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[45])
++ *:AIX:*:[456])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -780,7 +781,7 @@
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
+- i*:MINGW*:*)
++ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+ i*:windows32*:*)
+@@ -790,12 +791,18 @@
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- x86:Interix*:[3456]*)
+- echo i586-pc-interix${UNAME_RELEASE}
+- exit ;;
+- EM64T:Interix*:[3456]*)
+- echo x86_64-unknown-interix${UNAME_RELEASE}
+- exit ;;
++ *:Interix*:[3456]*)
++ case ${UNAME_MACHINE} in
++ x86)
++ echo i586-pc-interix${UNAME_RELEASE}
++ exit ;;
++ EM64T | authenticamd)
++ echo x86_64-unknown-interix${UNAME_RELEASE}
++ exit ;;
++ IA64)
++ echo ia64-unknown-interix${UNAME_RELEASE}
++ exit ;;
++ esac ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
+@@ -829,7 +836,14 @@
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+ arm*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ eval $set_cc_for_build
++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_EABI__
++ then
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ else
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ fi
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -950,6 +964,9 @@
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+ exit ;;
++ xtensa*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+@@ -1208,6 +1225,15 @@
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit ;;
++ SX-7:SUPER-UX:*:*)
++ echo sx7-nec-superux${UNAME_RELEASE}
++ exit ;;
++ SX-8:SUPER-UX:*:*)
++ echo sx8-nec-superux${UNAME_RELEASE}
++ exit ;;
++ SX-8R:SUPER-UX:*:*)
++ echo sx8r-nec-superux${UNAME_RELEASE}
++ exit ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit ;;
+@@ -1458,9 +1484,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+
+- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+diff -Naur gnome-panel-2.22.1.orig/config.h.in gnome-panel-2.22.1/config.h.in
+--- gnome-panel-2.22.1.orig/config.h.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/config.h.in 2008-04-12 20:22:55.000000000 +0200
+@@ -21,10 +21,6 @@
+ /* Define to 1 if you have the `dcgettext' function. */
+ #undef HAVE_DCGETTEXT
+
+-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+- */
+-#undef HAVE_DIRENT_H
+-
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #undef HAVE_DLFCN_H
+
+@@ -56,9 +52,6 @@
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+
+-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+-#undef HAVE_NDIR_H
+-
+ /* Defined if NetworkManager support is enabled */
+ #undef HAVE_NETWORK_MANAGER
+
+@@ -83,18 +76,6 @@
+ /* Define to 1 if you have the <string.h> header file. */
+ #undef HAVE_STRING_H
+
+-/* Define if there is a member named d_type in the struct describing directory
+- headers. */
+-#undef HAVE_STRUCT_DIRENT_D_TYPE
+-
+-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+- */
+-#undef HAVE_SYS_DIR_H
+-
+-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+- */
+-#undef HAVE_SYS_NDIR_H
+-
+ /* Define to 1 if you have the <sys/stat.h> header file. */
+ #undef HAVE_SYS_STAT_H
+
+diff -Naur gnome-panel-2.22.1.orig/config.sub gnome-panel-2.22.1/config.sub
+--- gnome-panel-2.22.1.orig/config.sub 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/config.sub 2008-02-17 21:10:30.000000000 +0100
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-# Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# Free Software Foundation, Inc.
+
+-timestamp='2006-09-20'
++timestamp='2008-01-16'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -72,8 +72,8 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -245,12 +245,12 @@
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+- | fr30 | frv \
++ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+- | maxq | mb | microblaze | mcore \
++ | maxq | mb | microblaze | mcore | mep \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+@@ -324,7 +324,7 @@
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+@@ -369,10 +369,14 @@
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+- | xstormy16-* | xtensa-* \
++ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
++ # Recognize the basic CPU types without company name, with glob match.
++ xtensa*)
++ basic_machine=$basic_machine-unknown
++ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+@@ -443,6 +447,14 @@
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
++ blackfin)
++ basic_machine=bfin-unknown
++ os=-linux
++ ;;
++ blackfin-*)
++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+@@ -475,8 +487,8 @@
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+- cr16c)
+- basic_machine=cr16c-unknown
++ cr16)
++ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+ crds | unos)
+@@ -668,6 +680,14 @@
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
++ m68knommu)
++ basic_machine=m68k-unknown
++ os=-linux
++ ;;
++ m68knommu-*)
++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+@@ -683,6 +703,10 @@
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
++ mingw32ce)
++ basic_machine=arm-unknown
++ os=-mingw32ce
++ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+@@ -809,6 +833,14 @@
+ basic_machine=i860-intel
+ os=-osf
+ ;;
++ parisc)
++ basic_machine=hppa-unknown
++ os=-linux
++ ;;
++ parisc-*)
++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+@@ -925,6 +957,9 @@
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
++ sh5el)
++ basic_machine=sh5le-unknown
++ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+@@ -1014,6 +1049,10 @@
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ tile*)
++ basic_machine=tile-unknown
++ os=-linux-gnu
++ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+ ;;
+@@ -1219,7 +1258,7 @@
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1414,6 +1453,9 @@
+ m68*-cisco)
+ os=-aout
+ ;;
++ mep-*)
++ os=-elf
++ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
+diff -Naur gnome-panel-2.22.1.orig/configure gnome-panel-2.22.1/configure
+--- gnome-panel-2.22.1.orig/configure 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/configure 2008-04-12 20:22:53.000000000 +0200
@@ -888,10 +888,13 @@
host_cpu
host_vendor
@@ -15524,7 +16301,7 @@
LIBPANEL_APPLET_CFLAGS
LIBPANEL_APPLET_LIBS
WNCKLET_CFLAGS
-@@ -1009,6 +1014,8 @@
+@@ -1008,6 +1013,8 @@
PKG_CONFIG
PANEL_CFLAGS
PANEL_LIBS
@@ -15533,7 +16310,7 @@
LIBPANEL_APPLET_CFLAGS
LIBPANEL_APPLET_LIBS
WNCKLET_CFLAGS
-@@ -1675,6 +1682,9 @@
+@@ -1674,6 +1681,9 @@
PANEL_CFLAGS
C compiler flags for PANEL, overriding pkg-config
PANEL_LIBS linker flags for PANEL, overriding pkg-config
@@ -15543,7 +16320,7 @@
LIBPANEL_APPLET_CFLAGS
C compiler flags for LIBPANEL_APPLET, overriding pkg-config
LIBPANEL_APPLET_LIBS
-@@ -5803,12 +5813,13 @@
+@@ -5802,12 +5812,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15558,7 +16335,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -5843,6 +5854,7 @@
+@@ -5842,6 +5853,7 @@
fi
SED=$lt_cv_path_SED
@@ -15566,7 +16343,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -6042,8 +6054,8 @@
+@@ -6041,8 +6053,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -15577,7 +16354,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6062,7 +6074,7 @@
+@@ -6061,7 +6073,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -15586,7 +16363,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6084,16 +6096,22 @@
+@@ -6083,16 +6095,22 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -15613,7 +16390,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -6131,7 +6149,7 @@
+@@ -6130,7 +6148,7 @@
esac
;;
@@ -15622,7 +16399,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-@@ -6147,11 +6165,11 @@
+@@ -6146,11 +6164,11 @@
;;
# This must be Linux ELF.
@@ -15636,7 +16413,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6181,6 +6199,10 @@
+@@ -6180,6 +6198,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -15647,16 +16424,16 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6267,7 +6289,7 @@
+@@ -6266,7 +6288,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6270 "configure"' > conftest.$ac_ext
-+ echo '#line 6292 "configure"' > conftest.$ac_ext
+- echo '#line 6269 "configure"' > conftest.$ac_ext
++ echo '#line 6291 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6302,7 +6324,8 @@
+@@ -6301,7 +6323,8 @@
rm -rf conftest*
;;
@@ -15666,7 +16443,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -6313,6 +6336,9 @@
+@@ -6312,6 +6335,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -15676,7 +16453,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -6329,6 +6355,9 @@
+@@ -6328,6 +6354,9 @@
;;
*64-bit*)
case $host in
@@ -15686,7 +16463,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -6432,7 +6461,11 @@
+@@ -6431,7 +6460,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -15699,7 +16476,7 @@
esac
;;
esac
-@@ -7919,7 +7952,6 @@
+@@ -7918,7 +7951,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -15707,7 +16484,7 @@
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -8006,24 +8038,27 @@
+@@ -8005,24 +8037,27 @@
fi
;;
*)
@@ -15752,7 +16529,7 @@
;;
esac
-@@ -8040,6 +8075,7 @@
+@@ -8039,6 +8074,7 @@
@@ -15760,7 +16537,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -8077,7 +8113,7 @@
+@@ -8076,7 +8112,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -15769,7 +16546,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -8230,7 +8266,7 @@
+@@ -8229,7 +8265,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -15778,7 +16555,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -8628,7 +8664,7 @@
+@@ -8627,7 +8663,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -15787,7 +16564,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -8790,6 +8826,318 @@
+@@ -8789,6 +8825,318 @@
;;
esac
@@ -16106,7 +16883,7 @@
enable_dlopen=no
enable_win32_dll=yes
-@@ -8828,10 +9176,10 @@
+@@ -8827,10 +9175,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -16119,7 +16896,7 @@
# If no C compiler was specified, use CC.
-@@ -8846,16 +9194,16 @@
+@@ -8845,16 +9193,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -16139,7 +16916,7 @@
-@@ -8872,7 +9220,7 @@
+@@ -8871,7 +9219,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -16148,21 +16925,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -8883,11 +9231,11 @@
+@@ -8882,11 +9230,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8886: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9234: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8885: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9233: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8890: \$? = $ac_status" >&5
-+ echo "$as_me:9238: \$? = $ac_status" >&5
+- echo "$as_me:8889: \$? = $ac_status" >&5
++ echo "$as_me:9237: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8938,13 +9286,15 @@
+@@ -8937,13 +9285,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -16180,7 +16957,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -8954,7 +9304,7 @@
+@@ -8953,7 +9303,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -16189,7 +16966,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -9012,7 +9362,7 @@
+@@ -9011,7 +9361,7 @@
esac
;;
@@ -16198,7 +16975,7 @@
# 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).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -9045,7 +9395,7 @@
+@@ -9044,7 +9394,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -16207,7 +16984,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -9064,6 +9414,22 @@
+@@ -9063,6 +9413,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -16230,7 +17007,7 @@
esac
;;
-@@ -9073,6 +9439,10 @@
+@@ -9072,6 +9438,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -16241,7 +17018,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9135,12 +9505,12 @@
+@@ -9134,12 +9504,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
@@ -16257,17 +17034,17 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -9151,27 +9521,27 @@
+@@ -9150,27 +9520,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9154: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9524: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9153: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9523: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9158: \$? = $ac_status" >&5
-+ echo "$as_me:9528: \$? = $ac_status" >&5
+- echo "$as_me:9157: \$? = $ac_status" >&5
++ echo "$as_me:9527: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16291,7 +17068,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -9198,13 +9568,13 @@
+@@ -9197,13 +9567,13 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -16308,7 +17085,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9214,20 +9584,20 @@
+@@ -9213,20 +9583,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -16335,7 +17112,7 @@
:
else
lt_prog_compiler_static=
-@@ -9244,7 +9614,7 @@
+@@ -9243,7 +9613,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -16344,21 +17121,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -9255,11 +9625,11 @@
+@@ -9254,11 +9624,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9258: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9628: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9257: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9627: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9262: \$? = $ac_status" >&5
-+ echo "$as_me:9632: \$? = $ac_status" >&5
+- echo "$as_me:9261: \$? = $ac_status" >&5
++ echo "$as_me:9631: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9339,12 +9709,13 @@
+@@ -9338,12 +9708,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -16373,7 +17150,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -9403,7 +9774,7 @@
+@@ -9402,7 +9773,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -16382,7 +17159,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -9451,7 +9822,7 @@
+@@ -9450,7 +9821,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -16391,7 +17168,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9469,7 +9840,7 @@
+@@ -9468,7 +9839,7 @@
fi
;;
@@ -16400,7 +17177,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -9484,7 +9855,7 @@
+@@ -9483,7 +9854,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -16409,7 +17186,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -9502,20 +9873,30 @@
+@@ -9501,20 +9872,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -16443,7 +17220,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9613,7 +9994,7 @@
+@@ -9612,7 +9993,7 @@
fi
;;
@@ -16452,7 +17229,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -9633,7 +10014,7 @@
+@@ -9632,7 +10013,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -16461,7 +17238,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -9667,7 +10048,7 @@
+@@ -9666,7 +10047,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -16470,7 +17247,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -9741,11 +10122,18 @@
+@@ -9740,11 +10121,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -16493,7 +17270,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9800,11 +10188,18 @@
+@@ -9799,11 +10187,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -16516,7 +17293,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9858,7 +10253,7 @@
+@@ -9857,7 +10252,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -16525,7 +17302,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -9891,19 +10286,18 @@
+@@ -9890,19 +10285,18 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -16551,7 +17328,7 @@
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -9943,7 +10337,7 @@
+@@ -9942,7 +10336,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -16560,7 +17337,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -10045,7 +10439,7 @@
+@@ -10044,7 +10438,7 @@
link_all_deplibs=yes
;;
@@ -16569,7 +17346,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10065,24 +10459,28 @@
+@@ -10064,25 +10458,29 @@
;;
openbsd*)
@@ -16580,6 +17357,18 @@
- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
+- else
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-R$libdir'
+- ;;
+- *)
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- ;;
+- esac
+- fi
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
@@ -16600,22 +17389,13 @@
+ ;;
+ esac
+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec='-R$libdir'
-- ;;
-- *)
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- ;;
-- esac
++ else
+ ld_shlibs=no
- fi
++ fi
;;
-@@ -10141,17 +10539,16 @@
+ os2*)
+@@ -10140,17 +10538,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -16642,7 +17422,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10208,7 +10605,7 @@
+@@ -10207,7 +10604,7 @@
fi
;;
@@ -16651,7 +17431,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -10285,7 +10682,7 @@
+@@ -10284,7 +10681,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -16660,7 +17440,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -10343,17 +10740,55 @@
+@@ -10342,17 +10739,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16720,7 +17500,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10374,7 +10809,7 @@
+@@ -10373,7 +10808,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -16729,7 +17509,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10513,12 +10948,8 @@
+@@ -10512,12 +10947,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16744,7 +17524,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -10535,18 +10966,6 @@
+@@ -10534,18 +10965,6 @@
dynamic_linker=no
;;
@@ -16763,7 +17543,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -10584,7 +11003,7 @@
+@@ -10583,7 +11002,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -16772,7 +17552,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10647,7 +11066,7 @@
+@@ -10646,7 +11065,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -16781,7 +17561,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10702,7 +11121,7 @@
+@@ -10701,7 +11120,7 @@
;;
# This must be Linux ELF.
@@ -16790,7 +17570,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10716,31 +11135,10 @@
+@@ -10715,31 +11134,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -16798,7 +17578,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 10723 "configure"' > conftest.$ac_ext
+- echo '#line 10722 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -16824,7 +17604,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10752,7 +11150,7 @@
+@@ -10751,7 +11149,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16833,7 +17613,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10761,7 +11159,7 @@
+@@ -10760,7 +11158,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -16842,7 +17622,7 @@
;;
netbsd*)
-@@ -10845,6 +11243,10 @@
+@@ -10844,6 +11242,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16853,7 +17633,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -10941,6 +11343,21 @@
+@@ -10940,6 +11342,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -16875,7 +17655,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -10998,6 +11415,7 @@
+@@ -10997,6 +11414,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -16883,7 +17663,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -11259,7 +11677,7 @@
+@@ -11258,7 +11676,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
@@ -16892,7 +17672,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -11535,7 +11953,7 @@
+@@ -11534,7 +11952,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
@@ -16901,25 +17681,25 @@
fi
-@@ -11584,7 +12002,7 @@
+@@ -11583,7 +12001,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11587 "configure"
-+#line 12005 "configure"
+-#line 11586 "configure"
++#line 12004 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11684,7 +12102,7 @@
+@@ -11683,7 +12101,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11687 "configure"
-+#line 12105 "configure"
+-#line 11686 "configure"
++#line 12104 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11811,7 +12229,7 @@
+@@ -11810,7 +12228,7 @@
fi
;;
@@ -16928,7 +17708,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11867,6 +12285,7 @@
+@@ -11866,6 +12284,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -16936,7 +17716,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -11882,6 +12301,7 @@
+@@ -11881,6 +12300,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -16944,7 +17724,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -11926,7 +12346,7 @@
+@@ -11925,7 +12345,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -16953,7 +17733,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -12162,6 +12582,10 @@
+@@ -12161,6 +12581,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -16964,7 +17744,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -12250,7 +12674,7 @@
+@@ -12249,7 +12673,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -16973,7 +17753,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -12410,6 +12834,7 @@
+@@ -12409,6 +12833,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -16981,7 +17761,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -12419,10 +12844,10 @@
+@@ -12418,10 +12843,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -16994,7 +17774,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -12438,16 +12863,16 @@
+@@ -12437,16 +12862,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -17014,7 +17794,7 @@
# Allow CC to be a program name with arguments.
-@@ -12654,7 +13079,7 @@
+@@ -12653,7 +13078,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -17023,7 +17803,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -12667,7 +13092,7 @@
+@@ -12666,7 +13091,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -17032,7 +17812,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -12703,7 +13128,7 @@
+@@ -12702,7 +13127,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -17041,7 +17821,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -12777,11 +13202,18 @@
+@@ -12776,11 +13201,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -17064,7 +17844,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12837,11 +13269,18 @@
+@@ -12836,11 +13268,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -17087,7 +17867,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12911,59 +13350,31 @@
+@@ -12910,59 +13349,31 @@
fi
;;
darwin* | rhapsody*)
@@ -17158,7 +17938,7 @@
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -12997,7 +13408,7 @@
+@@ -12996,7 +13407,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -17167,7 +17947,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13046,9 +13457,7 @@
+@@ -13045,9 +13456,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -17178,7 +17958,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -13116,7 +13525,7 @@
+@@ -13115,7 +13524,7 @@
;;
esac
;;
@@ -17187,7 +17967,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -13156,7 +13565,7 @@
+@@ -13155,7 +13564,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -17196,7 +17976,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -13208,7 +13617,7 @@
+@@ -13207,7 +13616,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -17205,7 +17985,7 @@
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -13236,6 +13645,29 @@
+@@ -13235,6 +13644,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -17235,7 +18015,7 @@
esac
;;
lynxos*)
-@@ -13258,7 +13690,7 @@
+@@ -13257,7 +13689,7 @@
;;
esac
;;
@@ -17244,7 +18024,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13274,16 +13706,20 @@
+@@ -13273,16 +13705,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -17274,7 +18054,7 @@
;;
osf3*)
case $cc_basename in
-@@ -13445,15 +13881,10 @@
+@@ -13444,15 +13880,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -17293,7 +18073,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -13500,6 +13931,12 @@
+@@ -13499,6 +13930,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -17306,7 +18086,7 @@
fi
;;
esac
-@@ -13587,7 +14024,6 @@
+@@ -13586,7 +14023,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -17314,7 +18094,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -13689,9 +14125,14 @@
+@@ -13688,9 +14124,14 @@
$rm -f confest.$objext
@@ -17330,7 +18110,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -13699,19 +14140,51 @@
+@@ -13698,19 +14139,51 @@
postdeps_CXX=
;;
@@ -17384,7 +18164,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13742,12 +14215,14 @@
+@@ -13741,12 +14214,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -17401,7 +18181,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -13759,7 +14234,7 @@
+@@ -13758,7 +14233,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -17410,7 +18190,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -13785,7 +14260,7 @@
+@@ -13784,7 +14259,7 @@
esac
else
case $host_os in
@@ -17419,7 +18199,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -13825,7 +14300,7 @@
+@@ -13824,7 +14299,7 @@
;;
esac
;;
@@ -17428,7 +18208,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13868,7 +14343,7 @@
+@@ -13867,7 +14342,7 @@
;;
esac
;;
@@ -17437,7 +18217,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -13881,7 +14356,7 @@
+@@ -13880,7 +14355,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -17446,7 +18226,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -13895,6 +14370,14 @@
+@@ -13894,6 +14369,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -17461,7 +18241,7 @@
;;
esac
;;
-@@ -13911,7 +14394,7 @@
+@@ -13910,7 +14393,7 @@
;;
esac
;;
@@ -17470,7 +18250,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14004,12 +14487,12 @@
+@@ -14003,12 +14486,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
@@ -17486,17 +18266,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -14020,27 +14503,27 @@
+@@ -14019,27 +14502,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14023: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14506: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14022: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14505: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14027: \$? = $ac_status" >&5
-+ echo "$as_me:14510: \$? = $ac_status" >&5
+- echo "$as_me:14026: \$? = $ac_status" >&5
++ echo "$as_me:14509: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17520,7 +18300,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -14067,13 +14550,13 @@
+@@ -14066,13 +14549,13 @@
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -17537,7 +18317,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -14083,20 +14566,20 @@
+@@ -14082,20 +14565,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -17564,7 +18344,7 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -14113,7 +14596,7 @@
+@@ -14112,7 +14595,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -17573,21 +18353,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14124,11 +14607,11 @@
+@@ -14123,11 +14606,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14127: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14610: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14126: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14609: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14131: \$? = $ac_status" >&5
-+ echo "$as_me:14614: \$? = $ac_status" >&5
+- echo "$as_me:14130: \$? = $ac_status" >&5
++ echo "$as_me:14613: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -14181,7 +14664,7 @@
+@@ -14180,7 +14663,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -17596,7 +18376,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -14194,12 +14677,16 @@
+@@ -14193,12 +14676,16 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -17614,7 +18394,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -14225,7 +14712,7 @@
+@@ -14224,7 +14711,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -17623,7 +18403,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -14283,20 +14770,7 @@
+@@ -14282,20 +14769,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -17645,7 +18425,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14314,7 +14788,7 @@
+@@ -14313,7 +14787,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -17654,7 +18434,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14453,12 +14927,7 @@
+@@ -14452,12 +14926,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -17668,7 +18448,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -14475,18 +14944,6 @@
+@@ -14474,18 +14943,6 @@
dynamic_linker=no
;;
@@ -17687,7 +18467,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -14524,7 +14981,7 @@
+@@ -14523,7 +14980,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -17696,7 +18476,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14587,7 +15044,7 @@
+@@ -14586,7 +15043,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -17705,7 +18485,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14642,7 +15099,7 @@
+@@ -14641,7 +15098,7 @@
;;
# This must be Linux ELF.
@@ -17714,7 +18494,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14656,31 +15113,10 @@
+@@ -14655,31 +15112,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -17722,7 +18502,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 14663 "configure"' > conftest.$ac_ext
+- echo '#line 14662 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -17748,7 +18528,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14692,7 +15128,7 @@
+@@ -14691,7 +15127,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -17757,7 +18537,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14701,7 +15137,7 @@
+@@ -14700,7 +15136,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -17766,7 +18546,7 @@
;;
netbsd*)
-@@ -14785,6 +15221,10 @@
+@@ -14784,6 +15220,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -17777,7 +18557,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14881,6 +15321,21 @@
+@@ -14880,6 +15320,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -17799,7 +18579,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -14964,6 +15419,7 @@
+@@ -14963,6 +15418,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -17807,7 +18587,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -14979,6 +15435,7 @@
+@@ -14978,6 +15434,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -17815,7 +18595,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -15211,6 +15668,10 @@
+@@ -15210,6 +15667,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -17826,7 +18606,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -15299,7 +15760,7 @@
+@@ -15298,7 +15759,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -17835,7 +18615,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -15390,10 +15851,17 @@
+@@ -15389,10 +15850,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -17855,7 +18635,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -15409,16 +15877,16 @@
+@@ -15408,16 +15876,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -17875,7 +18655,7 @@
# Allow CC to be a program name with arguments.
-@@ -15456,7 +15924,7 @@
+@@ -15455,7 +15923,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -17884,7 +18664,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -15502,13 +15970,15 @@
+@@ -15501,13 +15969,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -17902,7 +18682,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -15518,7 +15988,7 @@
+@@ -15517,7 +15987,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -17911,7 +18691,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -15576,7 +16046,7 @@
+@@ -15575,7 +16045,7 @@
esac
;;
@@ -17920,7 +18700,7 @@
# 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).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -15609,7 +16079,7 @@
+@@ -15608,7 +16078,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -17929,7 +18709,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -15628,6 +16098,22 @@
+@@ -15627,6 +16097,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -17952,7 +18732,7 @@
esac
;;
-@@ -15637,6 +16123,10 @@
+@@ -15636,6 +16122,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -17963,7 +18743,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -15699,12 +16189,12 @@
+@@ -15698,12 +16188,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
@@ -17979,17 +18759,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -15715,27 +16205,27 @@
+@@ -15714,27 +16204,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15718: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16208: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15717: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16207: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15722: \$? = $ac_status" >&5
-+ echo "$as_me:16212: \$? = $ac_status" >&5
+- echo "$as_me:15721: \$? = $ac_status" >&5
++ echo "$as_me:16211: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18013,7 +18793,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -15762,13 +16252,13 @@
+@@ -15761,13 +16251,13 @@
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -18030,7 +18810,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -15778,20 +16268,20 @@
+@@ -15777,20 +16267,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -18057,7 +18837,7 @@
:
else
lt_prog_compiler_static_F77=
-@@ -15808,7 +16298,7 @@
+@@ -15807,7 +16297,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -18066,21 +18846,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -15819,11 +16309,11 @@
+@@ -15818,11 +16308,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15822: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16312: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15821: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16311: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15826: \$? = $ac_status" >&5
-+ echo "$as_me:16316: \$? = $ac_status" >&5
+- echo "$as_me:15825: \$? = $ac_status" >&5
++ echo "$as_me:16315: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -15903,12 +16393,13 @@
+@@ -15902,12 +16392,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -18095,7 +18875,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -15967,7 +16458,7 @@
+@@ -15966,7 +16457,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -18104,7 +18884,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -16015,7 +16506,7 @@
+@@ -16014,7 +16505,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -18113,7 +18893,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -16033,7 +16524,7 @@
+@@ -16032,7 +16523,7 @@
fi
;;
@@ -18122,7 +18902,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -16048,7 +16539,7 @@
+@@ -16047,7 +16538,7 @@
archive_expsym_cmds_F77='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'
;;
@@ -18131,7 +18911,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -16066,20 +16557,30 @@
+@@ -16065,20 +16556,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -18165,7 +18945,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16177,7 +16678,7 @@
+@@ -16176,7 +16677,7 @@
fi
;;
@@ -18174,7 +18954,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -16197,7 +16698,7 @@
+@@ -16196,7 +16697,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -18183,7 +18963,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -16231,7 +16732,7 @@
+@@ -16230,7 +16731,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -18192,7 +18972,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -16295,11 +16796,18 @@
+@@ -16294,11 +16795,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -18215,7 +18995,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16344,11 +16852,18 @@
+@@ -16343,11 +16851,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -18238,7 +19018,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16402,7 +16917,7 @@
+@@ -16401,7 +16916,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -18247,7 +19027,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -16435,19 +16950,18 @@
+@@ -16434,19 +16949,18 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -18273,7 +19053,7 @@
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -16487,7 +17001,7 @@
+@@ -16486,7 +17000,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -18282,7 +19062,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -16589,7 +17103,7 @@
+@@ -16588,7 +17102,7 @@
link_all_deplibs_F77=yes
;;
@@ -18291,7 +19071,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16609,24 +17123,28 @@
+@@ -16608,24 +17122,28 @@
;;
openbsd*)
@@ -18337,7 +19117,7 @@
fi
;;
-@@ -16685,17 +17203,16 @@
+@@ -16684,17 +17202,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -18364,7 +19144,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16752,7 +17269,7 @@
+@@ -16751,7 +17268,7 @@
fi
;;
@@ -18373,7 +19153,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -16829,7 +17346,7 @@
+@@ -16828,7 +17345,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -18382,7 +19162,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -16887,20 +17404,7 @@
+@@ -16886,20 +17403,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18404,7 +19184,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -16918,7 +17422,7 @@
+@@ -16917,7 +17421,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -18413,7 +19193,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17057,12 +17561,7 @@
+@@ -17056,12 +17560,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -18427,7 +19207,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -17079,18 +17578,6 @@
+@@ -17078,18 +17577,6 @@
dynamic_linker=no
;;
@@ -18446,7 +19226,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -17128,7 +17615,7 @@
+@@ -17127,7 +17614,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -18455,7 +19235,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17191,7 +17678,7 @@
+@@ -17190,7 +17677,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -18464,7 +19244,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17246,7 +17733,7 @@
+@@ -17245,7 +17732,7 @@
;;
# This must be Linux ELF.
@@ -18473,7 +19253,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17260,31 +17747,10 @@
+@@ -17259,31 +17746,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -18481,7 +19261,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 17267 "configure"' > conftest.$ac_ext
+- echo '#line 17266 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -18507,7 +19287,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17296,7 +17762,7 @@
+@@ -17295,7 +17761,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18516,7 +19296,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17305,7 +17771,7 @@
+@@ -17304,7 +17770,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -18525,7 +19305,7 @@
;;
netbsd*)
-@@ -17389,6 +17855,10 @@
+@@ -17388,6 +17854,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -18536,16 +19316,21 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17485,6 +17955,21 @@
+@@ -17484,13 +17954,28 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
+ fi
+
+-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18555,10 +19340,17 @@
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -17568,6 +18053,7 @@
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ hardcode_action_F77=
+ if test -n "$hardcode_libdir_flag_spec_F77" || \
+ test -n "$runpath_var_F77" || \
+@@ -17567,6 +18052,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -18566,7 +19358,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -17583,6 +18069,7 @@
+@@ -17582,6 +18068,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -18574,7 +19366,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -17815,6 +18302,10 @@
+@@ -17814,6 +18301,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -18585,7 +19377,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -17903,7 +18394,7 @@
+@@ -17902,7 +18393,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -18594,7 +19386,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -17961,10 +18452,10 @@
+@@ -17960,10 +18451,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -18607,7 +19399,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -17980,16 +18471,16 @@
+@@ -17979,16 +18470,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -18627,7 +19419,7 @@
# Allow CC to be a program name with arguments.
-@@ -18027,7 +18518,7 @@
+@@ -18026,7 +18517,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -18636,21 +19428,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18038,11 +18529,11 @@
+@@ -18037,11 +18528,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18041: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18532: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18040: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18531: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18045: \$? = $ac_status" >&5
-+ echo "$as_me:18536: \$? = $ac_status" >&5
+- echo "$as_me:18044: \$? = $ac_status" >&5
++ echo "$as_me:18535: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -18093,14 +18584,16 @@
+@@ -18092,14 +18583,16 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -18670,7 +19462,7 @@
;;
darwin* | rhapsody*)
-@@ -18109,7 +18602,7 @@
+@@ -18108,7 +18601,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -18679,7 +19471,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -18167,10 +18660,10 @@
+@@ -18166,10 +18659,10 @@
esac
;;
@@ -18692,7 +19484,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -18200,7 +18693,7 @@
+@@ -18199,7 +18692,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -18701,7 +19493,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18219,6 +18712,22 @@
+@@ -18218,6 +18711,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -18724,7 +19516,7 @@
esac
;;
-@@ -18228,6 +18737,10 @@
+@@ -18227,6 +18736,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -18735,7 +19527,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18290,12 +18803,12 @@
+@@ -18289,12 +18802,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
@@ -18751,17 +19543,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18306,27 +18819,27 @@
+@@ -18305,27 +18818,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18309: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18822: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18308: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18821: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18313: \$? = $ac_status" >&5
-+ echo "$as_me:18826: \$? = $ac_status" >&5
+- echo "$as_me:18312: \$? = $ac_status" >&5
++ echo "$as_me:18825: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18785,7 +19577,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -18353,13 +18866,13 @@
+@@ -18352,13 +18865,13 @@
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -18802,7 +19594,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18369,20 +18882,20 @@
+@@ -18368,20 +18881,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -18829,7 +19621,7 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -18399,7 +18912,7 @@
+@@ -18398,7 +18911,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -18838,21 +19630,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -18410,11 +18923,11 @@
+@@ -18409,11 +18922,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18413: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18926: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18412: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18925: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18417: \$? = $ac_status" >&5
-+ echo "$as_me:18930: \$? = $ac_status" >&5
+- echo "$as_me:18416: \$? = $ac_status" >&5
++ echo "$as_me:18929: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18494,12 +19007,13 @@
+@@ -18493,12 +19006,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -18867,7 +19659,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -18558,7 +19072,7 @@
+@@ -18557,7 +19071,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -18876,7 +19668,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -18606,7 +19120,7 @@
+@@ -18605,7 +19119,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -18885,7 +19677,7 @@
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'
-@@ -18624,7 +19138,7 @@
+@@ -18623,7 +19137,7 @@
fi
;;
@@ -18894,7 +19686,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -18639,7 +19153,7 @@
+@@ -18638,7 +19152,7 @@
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'
;;
@@ -18903,7 +19695,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -18657,20 +19171,30 @@
+@@ -18656,20 +19170,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -18937,7 +19729,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18768,7 +19292,7 @@
+@@ -18767,7 +19291,7 @@
fi
;;
@@ -18946,7 +19738,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -18788,7 +19312,7 @@
+@@ -18787,7 +19311,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -18955,7 +19747,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -18822,7 +19346,7 @@
+@@ -18821,7 +19345,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -18964,7 +19756,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -18896,11 +19420,18 @@
+@@ -18895,11 +19419,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -18987,7 +19779,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18955,11 +19486,18 @@
+@@ -18954,11 +19485,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -19010,7 +19802,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19013,7 +19551,7 @@
+@@ -19012,7 +19550,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -19019,7 +19811,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -19046,19 +19584,18 @@
+@@ -19045,19 +19583,18 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -19045,7 +19837,7 @@
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -19098,7 +19635,7 @@
+@@ -19097,7 +19634,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -19054,7 +19846,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -19200,7 +19737,7 @@
+@@ -19199,7 +19736,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -19063,7 +19855,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19220,24 +19757,28 @@
+@@ -19219,24 +19756,28 @@
;;
openbsd*)
@@ -19109,7 +19901,7 @@
fi
;;
-@@ -19296,17 +19837,16 @@
+@@ -19295,17 +19836,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -19136,7 +19928,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19363,7 +19903,7 @@
+@@ -19362,7 +19902,7 @@
fi
;;
@@ -19145,7 +19937,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -19440,7 +19980,7 @@
+@@ -19439,7 +19979,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -19154,7 +19946,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -19498,20 +20038,7 @@
+@@ -19497,20 +20037,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19176,7 +19968,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19529,7 +20056,7 @@
+@@ -19528,7 +20055,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -19185,7 +19977,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19668,12 +20195,7 @@
+@@ -19667,12 +20194,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -19199,7 +19991,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -19690,18 +20212,6 @@
+@@ -19689,18 +20211,6 @@
dynamic_linker=no
;;
@@ -19218,7 +20010,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -19739,7 +20249,7 @@
+@@ -19738,7 +20248,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -19227,7 +20019,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19802,7 +20312,7 @@
+@@ -19801,7 +20311,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -19236,7 +20028,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19857,7 +20367,7 @@
+@@ -19856,7 +20366,7 @@
;;
# This must be Linux ELF.
@@ -19245,7 +20037,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19871,31 +20381,10 @@
+@@ -19870,31 +20380,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -19253,7 +20045,7 @@
- libsuff=
- case "$host_cpu" in
- x86_64*|s390x*|powerpc64*)
-- echo '#line 19878 "configure"' > conftest.$ac_ext
+- echo '#line 19877 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
@@ -19279,7 +20071,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -19907,7 +20396,7 @@
+@@ -19906,7 +20395,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19288,7 +20080,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19916,7 +20405,7 @@
+@@ -19915,7 +20404,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -19297,7 +20089,7 @@
;;
netbsd*)
-@@ -20000,6 +20489,10 @@
+@@ -19999,6 +20488,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -19308,7 +20100,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -20096,6 +20589,21 @@
+@@ -20095,6 +20588,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -19330,7 +20122,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -20179,6 +20687,7 @@
+@@ -20178,6 +20686,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -19338,7 +20130,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -20194,6 +20703,7 @@
+@@ -20193,6 +20702,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -19346,7 +20138,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -20426,6 +20936,10 @@
+@@ -20425,6 +20935,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -19357,7 +20149,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -20514,7 +21028,7 @@
+@@ -20513,7 +21027,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -19366,7 +20158,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -20571,7 +21085,7 @@
+@@ -20570,7 +21084,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -19375,7 +20167,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -20590,16 +21104,16 @@
+@@ -20589,16 +21103,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -19395,7 +20187,7 @@
# Allow CC to be a program name with arguments.
-@@ -20659,6 +21173,7 @@
+@@ -20658,6 +21172,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -19403,7 +20195,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -20674,6 +21189,7 @@
+@@ -20673,6 +21188,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -19411,7 +20203,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -20906,6 +21422,10 @@
+@@ -20905,6 +21421,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -19422,7 +20214,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -20994,7 +21514,7 @@
+@@ -20993,7 +21513,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -19624,7 +20416,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22660,7 +23294,7 @@
+@@ -22657,7 +23291,7 @@
and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -19633,7 +20425,7 @@
See \`config.log' for more details." >&5
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
-@@ -22670,7 +23304,7 @@
+@@ -22667,7 +23301,7 @@
and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -19642,7 +20434,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22880,7 +23514,7 @@
+@@ -22877,7 +23511,7 @@
and POLKIT_DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -19651,7 +20443,7 @@
See \`config.log' for more details." >&5
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
-@@ -22890,7 +23524,7 @@
+@@ -22887,7 +23521,7 @@
and POLKIT_DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -19660,25 +20452,629 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23133,7 +23767,7 @@
- and FISH_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
+@@ -23103,488 +23737,170 @@
+ $FISH_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables FISH_CFLAGS
+-and FISH_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
+-
+-$FISH_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables FISH_CFLAGS
+-and FISH_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
+- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables FISH_CFLAGS
+-and FISH_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+-See \`config.log' for more details." >&5
+-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 FISH_CFLAGS
+-and FISH_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- FISH_CFLAGS=$pkg_cv_FISH_CFLAGS
+- FISH_LIBS=$pkg_cv_FISH_LIBS
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+- :
+-fi
+-
+-
+-
+-# Let distributor specify which utility to use when changing the time
+-
+-# Check whether --with-clock-time-utility was given.
+-if test "${with_clock_time_utility+set}" = set; then
+- withval=$with_clock_time_utility;
+-else
+- with_clock_time_utility=""
+-fi
+-
+-
+-CLOCK_TIME_UTILITY=$with_clock_time_utility
+-
+-
+-
+-# Make it possible to compile the applets in-process
+-PANEL_INPROCESS_NONE=
+-PANEL_INPROCESS_ALL=
+-PANEL_INPROCESS_APPLETS=
+-
+-# Check whether --with-in-process-applets was given.
+-if test "${with_in_process_applets+set}" = set; then
+- withval=$with_in_process_applets; for i in `echo $withval | tr , ' '`; do
+- if test $i = "none"; then
+- PANEL_INPROCESS_NONE=1
+- else if test $i = "all"; then
+- PANEL_INPROCESS_ALL=1
+- else if test $i = "clock"; then
+- PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
+- else if test $i = "fish"; then
+- PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
+- else if test $i = "notification-area"; then
+- PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
+- else if test $i = "wncklet"; then
+- PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
+- else
+- echo "applet $i not recognized, ignoring..."
+- fi; fi; fi; fi; fi; fi
+- done
+-fi
+-
+-
+-if test -n "$PANEL_INPROCESS_ALL"; then
+- PANEL_INPROCESS_APPLETS="clock fish notification-area wncklet"
+-fi
+-if test -n "$PANEL_INPROCESS_NONE"; then
+- PANEL_INPROCESS_APPLETS=""
+-fi
+-for i in $PANEL_INPROCESS_APPLETS; do
+- if test $i = "clock"; then
+- CLOCK_COMPILE_INPROCESS=1
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define CLOCK_INPROCESS 1
+-_ACEOF
+-
+- else if test $i = "fish"; then
+- FISH_COMPILE_INPROCESS=1
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define FISH_INPROCESS 1
+-_ACEOF
+-
+- else if test $i = "notification-area"; then
+- NOTIFICATION_AREA_COMPILE_INPROCESS=1
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define NOTIFICATION_AREA_INPROCESS 1
+-_ACEOF
+-
+- else if test $i = "wncklet"; then
+- WNCKLET_COMPILE_INPROCESS=1
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define WNCKLET_INPROCESS 1
+-_ACEOF
+-
+- fi; fi; fi; fi
+-done
+-
+- if test -n "$CLOCK_COMPILE_INPROCESS"; then
+- CLOCK_INPROCESS_TRUE=
+- CLOCK_INPROCESS_FALSE='#'
+-else
+- CLOCK_INPROCESS_TRUE='#'
+- CLOCK_INPROCESS_FALSE=
+-fi
+-
+- if test -n "$FISH_COMPILE_INPROCESS"; then
+- FISH_INPROCESS_TRUE=
+- FISH_INPROCESS_FALSE='#'
+-else
+- FISH_INPROCESS_TRUE='#'
+- FISH_INPROCESS_FALSE=
+-fi
+-
+- if test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS"; then
+- NOTIFICATION_AREA_INPROCESS_TRUE=
+- NOTIFICATION_AREA_INPROCESS_FALSE='#'
+-else
+- NOTIFICATION_AREA_INPROCESS_TRUE='#'
+- NOTIFICATION_AREA_INPROCESS_FALSE=
+-fi
+-
+- if test -n "$WNCKLET_COMPILE_INPROCESS"; then
+- WNCKLET_INPROCESS_TRUE=
+- WNCKLET_INPROCESS_FALSE='#'
+-else
+- WNCKLET_INPROCESS_TRUE='#'
+- WNCKLET_INPROCESS_FALSE=
+-fi
+-
+-
+-# For the run dialog
+-
+-
+-
+-
+-
+-ac_header_dirent=no
+-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
+-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <sys/types.h>
+-#include <$ac_hdr>
+-
+-int
+-main ()
+-{
+-if ((DIR *) 0)
+-return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- eval "$as_ac_Header=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval echo '${'$as_ac_Header'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+-_ACEOF
+-
+-ac_header_dirent=$ac_hdr; break
+-fi
+-
+-done
+-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+-if test $ac_header_dirent = dirent.h; then
+- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+-if test "${ac_cv_search_opendir+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char opendir ();
+-int
+-main ()
+-{
+-return opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-for ac_lib in '' dir; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext &&
+- $as_test_x conftest$ac_exeext; then
+- ac_cv_search_opendir=$ac_res
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++installed software in a non-standard prefix.
+
++Alternatively, you may set the environment variables FISH_CFLAGS
++and FISH_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED) were not met:
+
+-fi
++$FISH_PKG_ERRORS
+
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext
+- if test "${ac_cv_search_opendir+set}" = set; then
+- break
+-fi
+-done
+-if test "${ac_cv_search_opendir+set}" = set; then
+- :
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables FISH_CFLAGS
++and FISH_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
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables FISH_CFLAGS
++and FISH_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
- 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
-@@ -23143,7 +23777,7 @@
- and FISH_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++See \`config.log' for more details." >&5
++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 FISH_CFLAGS
++and FISH_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; }; }
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
else
-@@ -29305,10 +29939,13 @@
+- ac_cv_search_opendir=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
++ FISH_CFLAGS=$pkg_cv_FISH_CFLAGS
++ FISH_LIBS=$pkg_cv_FISH_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+-ac_res=$ac_cv_search_opendir
+-if test "$ac_res" != no; then
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+-fi
+
+-else
+- { echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
+-if test "${ac_cv_search_opendir+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char opendir ();
+-int
+-main ()
+-{
+-return opendir ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-for ac_lib in '' x; do
+- if test -z "$ac_lib"; then
+- ac_res="none required"
+- else
+- ac_res=-l$ac_lib
+- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+- fi
+- rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext &&
+- $as_test_x conftest$ac_exeext; then
+- ac_cv_search_opendir=$ac_res
++# Let distributor specify which utility to use when changing the time
++
++# Check whether --with-clock-time-utility was given.
++if test "${with_clock_time_utility+set}" = set; then
++ withval=$with_clock_time_utility;
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ with_clock_time_utility=""
++fi
+
+
+-fi
++CLOCK_TIME_UTILITY=$with_clock_time_utility
+
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext
+- if test "${ac_cv_search_opendir+set}" = set; then
+- break
++
++
++# Make it possible to compile the applets in-process
++PANEL_INPROCESS_NONE=
++PANEL_INPROCESS_ALL=
++PANEL_INPROCESS_APPLETS=
++
++# Check whether --with-in-process-applets was given.
++if test "${with_in_process_applets+set}" = set; then
++ withval=$with_in_process_applets; for i in `echo $withval | tr , ' '`; do
++ if test $i = "none"; then
++ PANEL_INPROCESS_NONE=1
++ else if test $i = "all"; then
++ PANEL_INPROCESS_ALL=1
++ else if test $i = "clock"; then
++ PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
++ else if test $i = "fish"; then
++ PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
++ else if test $i = "notification-area"; then
++ PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
++ else if test $i = "wncklet"; then
++ PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
++ else
++ echo "applet $i not recognized, ignoring..."
++ fi; fi; fi; fi; fi; fi
++ done
+ fi
+-done
+-if test "${ac_cv_search_opendir+set}" = set; then
+- :
+-else
+- ac_cv_search_opendir=no
++
++
++if test -n "$PANEL_INPROCESS_ALL"; then
++ PANEL_INPROCESS_APPLETS="clock fish notification-area wncklet"
+ fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
++if test -n "$PANEL_INPROCESS_NONE"; then
++ PANEL_INPROCESS_APPLETS=""
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
+-ac_res=$ac_cv_search_opendir
+-if test "$ac_res" != no; then
+- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++for i in $PANEL_INPROCESS_APPLETS; do
++ if test $i = "clock"; then
++ CLOCK_COMPILE_INPROCESS=1
+
+-fi
++cat >>confdefs.h <<\_ACEOF
++#define CLOCK_INPROCESS 1
++_ACEOF
+
+-fi
++ else if test $i = "fish"; then
++ FISH_COMPILE_INPROCESS=1
+
+- { echo "$as_me:$LINENO: checking for d_type member in directory struct" >&5
+-echo $ECHO_N "checking for d_type member in directory struct... $ECHO_C" >&6; }
+-if test "${jm_cv_struct_dirent_d_type+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
++cat >>confdefs.h <<\_ACEOF
++#define FISH_INPROCESS 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+
+-#include <sys/types.h>
+-#ifdef HAVE_DIRENT_H
+-# include <dirent.h>
+-#else /* not HAVE_DIRENT_H */
+-# define dirent direct
+-# ifdef HAVE_SYS_NDIR_H
+-# include <sys/ndir.h>
+-# endif /* HAVE_SYS_NDIR_H */
+-# ifdef HAVE_SYS_DIR_H
+-# include <sys/dir.h>
+-# endif /* HAVE_SYS_DIR_H */
+-# ifdef HAVE_NDIR_H
+-# include <ndir.h>
+-# endif /* HAVE_NDIR_H */
+-#endif /* HAVE_DIRENT_H */
++ else if test $i = "notification-area"; then
++ NOTIFICATION_AREA_COMPILE_INPROCESS=1
+
+-int
+-main ()
+-{
+-struct dirent dp; dp.d_type = 0;
+- ;
+- return 0;
+-}
++cat >>confdefs.h <<\_ACEOF
++#define NOTIFICATION_AREA_INPROCESS 1
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext &&
+- $as_test_x conftest$ac_exeext; then
+- jm_cv_struct_dirent_d_type=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+
+- jm_cv_struct_dirent_d_type=no
+-fi
++ else if test $i = "wncklet"; then
++ WNCKLET_COMPILE_INPROCESS=1
+
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++cat >>confdefs.h <<\_ACEOF
++#define WNCKLET_INPROCESS 1
++_ACEOF
+
++ fi; fi; fi; fi
++done
+
++ if test -n "$CLOCK_COMPILE_INPROCESS"; then
++ CLOCK_INPROCESS_TRUE=
++ CLOCK_INPROCESS_FALSE='#'
++else
++ CLOCK_INPROCESS_TRUE='#'
++ CLOCK_INPROCESS_FALSE=
+ fi
+-{ echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_type" >&5
+-echo "${ECHO_T}$jm_cv_struct_dirent_d_type" >&6; }
+- if test $jm_cv_struct_dirent_d_type = yes; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRUCT_DIRENT_D_TYPE 1
+-_ACEOF
++ if test -n "$FISH_COMPILE_INPROCESS"; then
++ FISH_INPROCESS_TRUE=
++ FISH_INPROCESS_FALSE='#'
++else
++ FISH_INPROCESS_TRUE='#'
++ FISH_INPROCESS_FALSE=
++fi
+
+- fi
++ if test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS"; then
++ NOTIFICATION_AREA_INPROCESS_TRUE=
++ NOTIFICATION_AREA_INPROCESS_FALSE='#'
++else
++ NOTIFICATION_AREA_INPROCESS_TRUE='#'
++ NOTIFICATION_AREA_INPROCESS_FALSE=
++fi
++
++ if test -n "$WNCKLET_COMPILE_INPROCESS"; then
++ WNCKLET_INPROCESS_TRUE=
++ WNCKLET_INPROCESS_FALSE='#'
++else
++ WNCKLET_INPROCESS_TRUE='#'
++ WNCKLET_INPROCESS_FALSE=
++fi
+
+
++# For the run dialog
++gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE
+
+
+ { echo "$as_me:$LINENO: checking for X" >&5
+@@ -29301,10 +29617,13 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -19692,7 +21088,7 @@
DLLTOOL!$DLLTOOL$ac_delim
AS!$AS$ac_delim
OBJDUMP!$OBJDUMP$ac_delim
-@@ -29330,6 +29967,8 @@
+@@ -29326,6 +29645,8 @@
PKG_CONFIG!$PKG_CONFIG$ac_delim
PANEL_CFLAGS!$PANEL_CFLAGS$ac_delim
PANEL_LIBS!$PANEL_LIBS$ac_delim
@@ -19701,40 +21097,40 @@
LIBPANEL_APPLET_CFLAGS!$LIBPANEL_APPLET_CFLAGS$ac_delim
LIBPANEL_APPLET_LIBS!$LIBPANEL_APPLET_LIBS$ac_delim
WNCKLET_CFLAGS!$WNCKLET_CFLAGS$ac_delim
-@@ -29374,11 +30013,6 @@
- USE_NLS!$USE_NLS$ac_delim
+@@ -29370,11 +29691,6 @@
MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
--CATALOGS!$CATALOGS$ac_delim
+ CATALOGS!$CATALOGS$ac_delim
-CATOBJEXT!$CATOBJEXT$ac_delim
-GMOFILES!$GMOFILES$ac_delim
-INSTOBJEXT!$INSTOBJEXT$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
+-PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -29420,6 +30054,11 @@
+@@ -29416,6 +29732,11 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+CATALOGS!$CATALOGS$ac_delim
+CATOBJEXT!$CATOBJEXT$ac_delim
+GMOFILES!$GMOFILES$ac_delim
+INSTOBJEXT!$INSTOBJEXT$ac_delim
+INTLLIBS!$INTLLIBS$ac_delim
- PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
++PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
POFILES!$POFILES$ac_delim
-@@ -29450,7 +30089,7 @@
+ POSUB!$POSUB$ac_delim
+@@ -29445,7 +29766,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -29851,21 +30490,22 @@
+@@ -29846,21 +30167,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -19764,7 +21160,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -29902,7 +30542,7 @@
+@@ -29897,7 +30219,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
@@ -19773,9 +21169,9 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/depcomp gnome-panel-2.22.0/depcomp
---- gnome-panel-2.22.0.old/depcomp 2008-03-10 22:11:42.000000000 +0100
-+++ gnome-panel-2.22.0/depcomp 2008-03-17 13:42:02.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/depcomp gnome-panel-2.22.1/depcomp
+--- gnome-panel-2.22.1.orig/depcomp 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/depcomp 2008-04-12 20:22:59.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
@@ -19840,9 +21236,9 @@
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/doc/Makefile.in gnome-panel-2.22.0/doc/Makefile.in
---- gnome-panel-2.22.0.old/doc/Makefile.in 2008-03-10 22:11:38.000000000 +0100
-+++ gnome-panel-2.22.0/doc/Makefile.in 2008-03-17 13:41:58.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/doc/Makefile.in gnome-panel-2.22.1/doc/Makefile.in
+--- gnome-panel-2.22.1.orig/doc/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/doc/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19854,7 +21250,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -34,10 +34,7 @@
+ subdir = doc
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -96,6 +93,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -19862,7 +21270,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -156,6 +157,8 @@
+@@ -155,6 +153,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -19871,7 +21279,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -166,6 +169,7 @@
+@@ -165,6 +165,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -19879,7 +21287,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -193,6 +197,7 @@
+@@ -192,6 +193,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -19887,7 +21295,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -377,8 +382,8 @@
+@@ -376,8 +378,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19898,7 +21306,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -403,8 +408,8 @@
+@@ -402,8 +404,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19909,7 +21317,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -414,13 +419,12 @@
+@@ -413,13 +415,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -19925,9 +21333,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/doc/reference/Makefile.in gnome-panel-2.22.0/doc/reference/Makefile.in
---- gnome-panel-2.22.0.old/doc/reference/Makefile.in 2008-03-10 22:11:38.000000000 +0100
-+++ gnome-panel-2.22.0/doc/reference/Makefile.in 2008-03-17 13:41:58.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/doc/reference/Makefile.in gnome-panel-2.22.1/doc/reference/Makefile.in
+--- gnome-panel-2.22.1.orig/doc/reference/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/doc/reference/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19939,7 +21347,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -34,10 +34,7 @@
+ subdir = doc/reference
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -96,6 +93,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -19947,7 +21367,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -156,6 +157,8 @@
+@@ -155,6 +153,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -19956,7 +21376,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -166,6 +169,7 @@
+@@ -165,6 +165,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -19964,7 +21384,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -193,6 +197,7 @@
+@@ -192,6 +193,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -19972,7 +21392,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -373,8 +378,8 @@
+@@ -372,8 +374,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19983,7 +21403,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -399,8 +404,8 @@
+@@ -398,8 +400,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19994,7 +21414,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +415,12 @@
+@@ -409,13 +411,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -20010,9 +21430,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/doc/reference/panel-applet/Makefile.in gnome-panel-2.22.0/doc/reference/panel-applet/Makefile.in
---- gnome-panel-2.22.0.old/doc/reference/panel-applet/Makefile.in 2008-03-10 22:11:39.000000000 +0100
-+++ gnome-panel-2.22.0/doc/reference/panel-applet/Makefile.in 2008-03-17 13:41:58.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/doc/reference/panel-applet/Makefile.in gnome-panel-2.22.1/doc/reference/panel-applet/Makefile.in
+--- gnome-panel-2.22.1.orig/doc/reference/panel-applet/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/doc/reference/panel-applet/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20024,7 +21444,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -91,6 +91,7 @@
+@@ -41,10 +41,7 @@
+ $(top_srcdir)/gtk-doc.make ChangeLog
+ subdir = doc/reference/panel-applet
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -91,6 +88,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -20032,7 +21464,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -151,6 +152,8 @@
+@@ -150,6 +148,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -20041,7 +21473,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -161,6 +164,7 @@
+@@ -160,6 +160,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -20049,7 +21481,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -188,6 +192,7 @@
+@@ -187,6 +188,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -20057,56 +21489,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -311,10 +316,10 @@
- $(PANEL_LIBS) \
- ../../../libpanel-applet/libpanel-applet-2.la
-
-- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-+ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-
- # We set GPATH here; this gives us semantics for GNU make
- # which are more like other make's VPATH, when it comes to
-@@ -600,7 +605,7 @@
- cd $(srcdir) && rm -rf xml html
-
- install-data-local:
-- -installfiles=`echo $(srcdir)/html/*`; \
-+ installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
- else \
-@@ -611,8 +616,9 @@
- done; \
- echo '-- Installing $(srcdir)/html/index.sgml' ; \
- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-- which gtkdoc-rebase >/dev/null && \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ if test `which gtkdoc-rebase` != ""; then \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ fi \
- fi
-
- uninstall-local:
-@@ -633,8 +639,8 @@
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- -cp $(srcdir)/xml/*.xml $(distdir)/xml
- cp $(srcdir)/html/* $(distdir)/html
-- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-+ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-+ cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/gnome-panel/Makefile.in gnome-panel-2.22.0/gnome-panel/Makefile.in
---- gnome-panel-2.22.0.old/gnome-panel/Makefile.in 2008-03-10 22:11:39.000000000 +0100
-+++ gnome-panel-2.22.0/gnome-panel/Makefile.in 2008-03-17 13:41:59.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/gnome-panel/Makefile.in gnome-panel-2.22.1/gnome-panel/Makefile.in
+--- gnome-panel-2.22.1.orig/gnome-panel/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/gnome-panel/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20118,7 +21503,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -33,7 +33,8 @@
+@@ -33,15 +33,13 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@@ -20128,7 +21513,16 @@
subdir = gnome-panel
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/gnome-panel.desktop.in.in ChangeLog
-@@ -99,7 +100,21 @@
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -99,7 +97,21 @@
gnome_panel_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(gnome_panel_LDFLAGS) $(LDFLAGS) -o $@
@@ -20151,7 +21545,7 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -111,9 +126,10 @@
+@@ -111,9 +123,10 @@
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -20164,7 +21558,7 @@
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -170,6 +186,7 @@
+@@ -170,6 +183,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -20172,7 +21566,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -230,6 +247,8 @@
+@@ -229,6 +243,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -20181,7 +21575,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -240,6 +259,7 @@
+@@ -239,6 +255,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -20189,7 +21583,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -267,6 +287,7 @@
+@@ -266,6 +283,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -20197,7 +21591,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -487,6 +508,20 @@
+@@ -486,6 +504,20 @@
$(X_LIBS)
gnome_panel_LDFLAGS = -export-dynamic
@@ -20218,7 +21612,7 @@
gnome_desktop_item_edit_SOURCES = \
gnome-desktop-item-edit.c \
panel-ditem-editor.c \
-@@ -595,8 +630,8 @@
+@@ -594,8 +626,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -20229,7 +21623,7 @@
else :; fi; \
done
-@@ -620,6 +655,9 @@
+@@ -619,6 +651,9 @@
gnome-panel$(EXEEXT): $(gnome_panel_OBJECTS) $(gnome_panel_DEPENDENCIES)
@rm -f gnome-panel$(EXEEXT)
$(gnome_panel_LINK) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS)
@@ -20239,7 +21633,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -634,6 +672,12 @@
+@@ -633,6 +668,12 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/button-widget.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/drawer.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gnome-desktop-item-edit.Po at am__quote@
@@ -20252,7 +21646,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/launcher.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/menu.Po at am__quote@
-@@ -700,6 +744,90 @@
+@@ -699,6 +740,90 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -20343,7 +21737,7 @@
mostlyclean-libtool:
-rm -f *.lo
-@@ -830,8 +958,8 @@
+@@ -829,8 +954,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20354,7 +21748,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -843,8 +971,8 @@
+@@ -842,8 +967,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20365,7 +21759,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -854,13 +982,12 @@
+@@ -853,13 +978,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -20381,60 +21775,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/gtk-doc.make gnome-panel-2.22.0/gtk-doc.make
---- gnome-panel-2.22.0.old/gtk-doc.make 2008-03-10 22:11:27.000000000 +0100
-+++ gnome-panel-2.22.0/gtk-doc.make 2008-03-17 13:41:43.000000000 +0100
-@@ -5,11 +5,11 @@
- ####################################
-
- if GTK_DOC_USE_LIBTOOL
--GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
- else
--GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
- endif
-
- # We set GPATH here; this gives us semantics for GNU make
-@@ -128,7 +128,7 @@
- cd $(srcdir) && rm -rf xml html
-
- install-data-local:
-- -installfiles=`echo $(srcdir)/html/*`; \
-+ installfiles=`echo $(srcdir)/html/*`; \
- if test "$$installfiles" = '$(srcdir)/html/*'; \
- then echo '-- Nothing to install' ; \
- else \
-@@ -139,8 +139,9 @@
- done; \
- echo '-- Installing $(srcdir)/html/index.sgml' ; \
- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-- which gtkdoc-rebase >/dev/null && \
-- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ if test `which gtkdoc-rebase` != ""; then \
-+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ fi \
- fi
-
-
-@@ -165,8 +166,8 @@
- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- -cp $(srcdir)/xml/*.xml $(distdir)/xml
- cp $(srcdir)/html/* $(distdir)/html
-- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-+ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-+ cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
- cd $(distdir) && rm -f $(DISTCLEANFILES)
- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/clock/Makefile.in gnome-panel-2.22.0/help/clock/Makefile.in
---- gnome-panel-2.22.0.old/help/clock/Makefile.in 2008-03-10 22:11:39.000000000 +0100
-+++ gnome-panel-2.22.0/help/clock/Makefile.in 2008-03-17 13:41:59.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/Makefile.in gnome-panel-2.22.1/help/Makefile.in
+--- gnome-panel-2.22.1.orig/help/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20446,7 +21789,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -109,6 +109,7 @@
+@@ -34,10 +34,7 @@
+ subdir = help
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -96,6 +93,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -20454,7 +21809,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -169,6 +170,8 @@
+@@ -155,6 +153,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -20463,7 +21818,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -179,6 +182,7 @@
+@@ -165,6 +165,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -20471,7 +21826,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -206,6 +210,7 @@
+@@ -192,6 +193,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -20479,101 +21834,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/de/fish/Makefile.in gnome-panel-2.22.0/help/de/fish/Makefile.in
---- gnome-panel-2.22.0.old/help/de/fish/Makefile.in 2008-03-10 22:11:39.000000000 +0100
-+++ gnome-panel-2.22.0/help/de/fish/Makefile.in 2008-03-17 13:41:59.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
- DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DLLTOOL = @DLLTOOL@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
- LIBTOOL = @LIBTOOL@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
- MSGMERGE = @MSGMERGE@
- NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
- NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/de/Makefile.in gnome-panel-2.22.0/help/de/Makefile.in
---- gnome-panel-2.22.0.old/help/de/Makefile.in 2008-03-10 22:11:39.000000000 +0100
-+++ gnome-panel-2.22.0/help/de/Makefile.in 2008-03-17 13:41:59.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
- DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DLLTOOL = @DLLTOOL@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -156,6 +157,8 @@
- LIBTOOL = @LIBTOOL@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -166,6 +169,7 @@
- MSGMERGE = @MSGMERGE@
- NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
- NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
-@@ -193,6 +197,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -373,8 +378,8 @@
+@@ -372,8 +374,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20584,7 +21845,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -399,8 +404,8 @@
+@@ -398,8 +400,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20595,7 +21856,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +415,12 @@
+@@ -409,13 +411,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -20611,9 +21872,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/de/window-list/Makefile.in gnome-panel-2.22.0/help/de/window-list/Makefile.in
---- gnome-panel-2.22.0.old/help/de/window-list/Makefile.in 2008-03-10 22:11:39.000000000 +0100
-+++ gnome-panel-2.22.0/help/de/window-list/Makefile.in 2008-03-17 13:41:59.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/clock/Makefile.in gnome-panel-2.22.1/help/clock/Makefile.in
+--- gnome-panel-2.22.1.orig/help/clock/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/clock/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20625,7 +21886,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
+@@ -59,10 +59,7 @@
+ $(top_srcdir)/gnome-doc-utils.make
+ subdir = help/clock
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -109,6 +106,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -20633,7 +21906,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
+@@ -168,6 +166,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -20642,7 +21915,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
+@@ -178,6 +178,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -20650,7 +21923,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
+@@ -205,6 +206,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -20658,9 +21931,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/de/workspace-switcher/Makefile.in gnome-panel-2.22.0/help/de/workspace-switcher/Makefile.in
---- gnome-panel-2.22.0.old/help/de/workspace-switcher/Makefile.in 2008-03-10 22:11:39.000000000 +0100
-+++ gnome-panel-2.22.0/help/de/workspace-switcher/Makefile.in 2008-03-17 13:41:59.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/de/Makefile.in gnome-panel-2.22.1/help/de/Makefile.in
+--- gnome-panel-2.22.1.orig/help/de/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/de/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20672,7 +21945,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
+@@ -34,10 +34,7 @@
+ subdir = help/de
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -96,6 +93,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -20680,7 +21965,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
+@@ -155,6 +153,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -20689,7 +21974,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
+@@ -165,6 +165,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -20697,7 +21982,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
+@@ -192,6 +193,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -20705,148 +21990,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/fish/Makefile.in gnome-panel-2.22.0/help/fish/Makefile.in
---- gnome-panel-2.22.0.old/help/fish/Makefile.in 2008-03-10 22:11:39.000000000 +0100
-+++ gnome-panel-2.22.0/help/fish/Makefile.in 2008-03-17 13:41:59.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -109,6 +109,7 @@
- DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DLLTOOL = @DLLTOOL@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -169,6 +170,8 @@
- LIBTOOL = @LIBTOOL@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -179,6 +182,7 @@
- MSGMERGE = @MSGMERGE@
- NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
- NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
-@@ -206,6 +210,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/ja/fish/Makefile.in gnome-panel-2.22.0/help/ja/fish/Makefile.in
---- gnome-panel-2.22.0.old/help/ja/fish/Makefile.in 2008-03-10 22:11:40.000000000 +0100
-+++ gnome-panel-2.22.0/help/ja/fish/Makefile.in 2008-03-17 13:42:00.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
- DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DLLTOOL = @DLLTOOL@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
- LIBTOOL = @LIBTOOL@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
- MSGMERGE = @MSGMERGE@
- NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
- NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/ja/Makefile.in gnome-panel-2.22.0/help/ja/Makefile.in
---- gnome-panel-2.22.0.old/help/ja/Makefile.in 2008-03-10 22:11:40.000000000 +0100
-+++ gnome-panel-2.22.0/help/ja/Makefile.in 2008-03-17 13:42:00.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
- DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DLLTOOL = @DLLTOOL@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -156,6 +157,8 @@
- LIBTOOL = @LIBTOOL@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -166,6 +169,7 @@
- MSGMERGE = @MSGMERGE@
- NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
- NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
-@@ -193,6 +197,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-@@ -373,8 +378,8 @@
+@@ -372,8 +374,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20857,7 +22001,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -399,8 +404,8 @@
+@@ -398,8 +400,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20868,7 +22012,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +415,12 @@
+@@ -409,13 +411,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -20884,9 +22028,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/ja/window-list/Makefile.in gnome-panel-2.22.0/help/ja/window-list/Makefile.in
---- gnome-panel-2.22.0.old/help/ja/window-list/Makefile.in 2008-03-10 22:11:40.000000000 +0100
-+++ gnome-panel-2.22.0/help/ja/window-list/Makefile.in 2008-03-17 13:42:00.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/de/fish/Makefile.in gnome-panel-2.22.1/help/de/fish/Makefile.in
+--- gnome-panel-2.22.1.orig/help/de/fish/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/de/fish/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20898,7 +22042,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/de/fish
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -20906,7 +22062,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -20915,7 +22071,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -20923,7 +22079,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -20931,9 +22087,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/ja/workspace-switcher/Makefile.in gnome-panel-2.22.0/help/ja/workspace-switcher/Makefile.in
---- gnome-panel-2.22.0.old/help/ja/workspace-switcher/Makefile.in 2008-03-10 22:11:40.000000000 +0100
-+++ gnome-panel-2.22.0/help/ja/workspace-switcher/Makefile.in 2008-03-17 13:42:00.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/de/window-list/Makefile.in gnome-panel-2.22.1/help/de/window-list/Makefile.in
+--- gnome-panel-2.22.1.orig/help/de/window-list/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/de/window-list/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20945,7 +22101,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/de/window-list
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -20953,7 +22121,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -20962,7 +22130,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -20970,7 +22138,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -20978,9 +22146,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/Makefile.in gnome-panel-2.22.0/help/Makefile.in
---- gnome-panel-2.22.0.old/help/Makefile.in 2008-03-10 22:11:39.000000000 +0100
-+++ gnome-panel-2.22.0/help/Makefile.in 2008-03-17 13:41:59.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/de/workspace-switcher/Makefile.in gnome-panel-2.22.1/help/de/workspace-switcher/Makefile.in
+--- gnome-panel-2.22.1.orig/help/de/workspace-switcher/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/de/workspace-switcher/Makefile.in 2008-04-12 20:22:57.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20992,7 +22160,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/de/workspace-switcher
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21000,7 +22180,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -156,6 +157,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21009,7 +22189,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -166,6 +169,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21017,7 +22197,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -193,6 +197,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21025,7 +22205,125 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -373,8 +378,8 @@
+diff -Naur gnome-panel-2.22.1.orig/help/fish/Makefile.in gnome-panel-2.22.1/help/fish/Makefile.in
+--- gnome-panel-2.22.1.orig/help/fish/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/fish/Makefile.in 2008-04-12 20:22:57.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -59,10 +59,7 @@
+ $(top_srcdir)/gnome-doc-utils.make
+ subdir = help/fish
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -109,6 +106,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DLLTOOL = @DLLTOOL@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -168,6 +166,8 @@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -178,6 +178,7 @@
+ MSGMERGE = @MSGMERGE@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -205,6 +206,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -Naur gnome-panel-2.22.1.orig/help/ja/Makefile.in gnome-panel-2.22.1/help/ja/Makefile.in
+--- gnome-panel-2.22.1.orig/help/ja/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/ja/Makefile.in 2008-04-12 20:22:58.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,10 +34,7 @@
+ subdir = help/ja
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -96,6 +93,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DLLTOOL = @DLLTOOL@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -155,6 +153,8 @@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -165,6 +165,7 @@
+ MSGMERGE = @MSGMERGE@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -192,6 +193,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -372,8 +374,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21036,7 +22334,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -399,8 +404,8 @@
+@@ -398,8 +400,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21047,7 +22345,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +415,12 @@
+@@ -409,13 +411,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -21063,9 +22361,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/window-list/Makefile.in gnome-panel-2.22.0/help/window-list/Makefile.in
---- gnome-panel-2.22.0.old/help/window-list/Makefile.in 2008-03-10 22:11:40.000000000 +0100
-+++ gnome-panel-2.22.0/help/window-list/Makefile.in 2008-03-17 13:42:00.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/ja/fish/Makefile.in gnome-panel-2.22.1/help/ja/fish/Makefile.in
+--- gnome-panel-2.22.1.orig/help/ja/fish/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/ja/fish/Makefile.in 2008-04-12 20:22:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21077,7 +22375,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -109,6 +109,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/ja/fish
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21085,7 +22395,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -169,6 +170,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21094,7 +22404,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -179,6 +182,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21102,7 +22412,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -206,6 +210,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21110,9 +22420,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/workspace-switcher/Makefile.in gnome-panel-2.22.0/help/workspace-switcher/Makefile.in
---- gnome-panel-2.22.0.old/help/workspace-switcher/Makefile.in 2008-03-10 22:11:40.000000000 +0100
-+++ gnome-panel-2.22.0/help/workspace-switcher/Makefile.in 2008-03-17 13:42:00.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/ja/window-list/Makefile.in gnome-panel-2.22.1/help/ja/window-list/Makefile.in
+--- gnome-panel-2.22.1.orig/help/ja/window-list/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/ja/window-list/Makefile.in 2008-04-12 20:22:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21124,7 +22434,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -109,6 +109,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/ja/window-list
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21132,7 +22454,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -169,6 +170,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21141,7 +22463,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -179,6 +182,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21149,7 +22471,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -206,6 +210,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21157,9 +22479,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/zh_CN/fish/Makefile.in gnome-panel-2.22.0/help/zh_CN/fish/Makefile.in
---- gnome-panel-2.22.0.old/help/zh_CN/fish/Makefile.in 2008-03-10 22:11:40.000000000 +0100
-+++ gnome-panel-2.22.0/help/zh_CN/fish/Makefile.in 2008-03-17 13:42:01.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/ja/workspace-switcher/Makefile.in gnome-panel-2.22.1/help/ja/workspace-switcher/Makefile.in
+--- gnome-panel-2.22.1.orig/help/ja/workspace-switcher/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/ja/workspace-switcher/Makefile.in 2008-04-12 20:22:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21171,7 +22493,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/ja/workspace-switcher
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21179,7 +22513,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21188,7 +22522,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21196,7 +22530,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21204,9 +22538,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/zh_CN/Makefile.in gnome-panel-2.22.0/help/zh_CN/Makefile.in
---- gnome-panel-2.22.0.old/help/zh_CN/Makefile.in 2008-03-10 22:11:40.000000000 +0100
-+++ gnome-panel-2.22.0/help/zh_CN/Makefile.in 2008-03-17 13:42:01.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/window-list/Makefile.in gnome-panel-2.22.1/help/window-list/Makefile.in
+--- gnome-panel-2.22.1.orig/help/window-list/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/window-list/Makefile.in 2008-04-12 20:22:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21218,7 +22552,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -59,10 +59,7 @@
+ $(top_srcdir)/gnome-doc-utils.make
+ subdir = help/window-list
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -109,6 +106,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21226,7 +22572,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -156,6 +157,8 @@
+@@ -168,6 +166,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21235,7 +22581,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -166,6 +169,7 @@
+@@ -178,6 +178,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21243,7 +22589,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -193,6 +197,7 @@
+@@ -205,6 +206,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21251,7 +22597,125 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -373,8 +378,8 @@
+diff -Naur gnome-panel-2.22.1.orig/help/workspace-switcher/Makefile.in gnome-panel-2.22.1/help/workspace-switcher/Makefile.in
+--- gnome-panel-2.22.1.orig/help/workspace-switcher/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/workspace-switcher/Makefile.in 2008-04-12 20:22:58.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -59,10 +59,7 @@
+ $(top_srcdir)/gnome-doc-utils.make
+ subdir = help/workspace-switcher
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -109,6 +106,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DLLTOOL = @DLLTOOL@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -168,6 +166,8 @@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -178,6 +178,7 @@
+ MSGMERGE = @MSGMERGE@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -205,6 +206,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -Naur gnome-panel-2.22.1.orig/help/zh_CN/Makefile.in gnome-panel-2.22.1/help/zh_CN/Makefile.in
+--- gnome-panel-2.22.1.orig/help/zh_CN/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/zh_CN/Makefile.in 2008-04-12 20:22:58.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,10 +34,7 @@
+ subdir = help/zh_CN
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -96,6 +93,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DLLTOOL = @DLLTOOL@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -155,6 +153,8 @@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -165,6 +165,7 @@
+ MSGMERGE = @MSGMERGE@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -192,6 +193,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -372,8 +374,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21262,7 +22726,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -399,8 +404,8 @@
+@@ -398,8 +400,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21273,7 +22737,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +415,12 @@
+@@ -409,13 +411,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -21289,9 +22753,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/zh_CN/workspace-switcher/Makefile.in gnome-panel-2.22.0/help/zh_CN/workspace-switcher/Makefile.in
---- gnome-panel-2.22.0.old/help/zh_CN/workspace-switcher/Makefile.in 2008-03-10 22:11:41.000000000 +0100
-+++ gnome-panel-2.22.0/help/zh_CN/workspace-switcher/Makefile.in 2008-03-17 13:42:01.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/zh_CN/fish/Makefile.in gnome-panel-2.22.1/help/zh_CN/fish/Makefile.in
+--- gnome-panel-2.22.1.orig/help/zh_CN/fish/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/zh_CN/fish/Makefile.in 2008-04-12 20:22:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21303,7 +22767,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/zh_CN/fish
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21311,7 +22787,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21320,7 +22796,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21328,7 +22804,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21336,9 +22812,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/zh_TW/fish/Makefile.in gnome-panel-2.22.0/help/zh_TW/fish/Makefile.in
---- gnome-panel-2.22.0.old/help/zh_TW/fish/Makefile.in 2008-03-10 22:11:41.000000000 +0100
-+++ gnome-panel-2.22.0/help/zh_TW/fish/Makefile.in 2008-03-17 13:42:01.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/zh_CN/workspace-switcher/Makefile.in gnome-panel-2.22.1/help/zh_CN/workspace-switcher/Makefile.in
+--- gnome-panel-2.22.1.orig/help/zh_CN/workspace-switcher/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/zh_CN/workspace-switcher/Makefile.in 2008-04-12 20:22:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21350,7 +22826,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/zh_CN/workspace-switcher
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21358,7 +22846,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21367,7 +22855,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21375,7 +22863,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21383,9 +22871,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/zh_TW/Makefile.in gnome-panel-2.22.0/help/zh_TW/Makefile.in
---- gnome-panel-2.22.0.old/help/zh_TW/Makefile.in 2008-03-10 22:11:41.000000000 +0100
-+++ gnome-panel-2.22.0/help/zh_TW/Makefile.in 2008-03-17 13:42:01.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/zh_TW/Makefile.in gnome-panel-2.22.1/help/zh_TW/Makefile.in
+--- gnome-panel-2.22.1.orig/help/zh_TW/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/zh_TW/Makefile.in 2008-04-12 20:22:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21397,7 +22885,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -96,6 +96,7 @@
+@@ -34,10 +34,7 @@
+ subdir = help/zh_TW
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -96,6 +93,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21405,7 +22905,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -156,6 +157,8 @@
+@@ -155,6 +153,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21414,7 +22914,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -166,6 +169,7 @@
+@@ -165,6 +165,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21422,7 +22922,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -193,6 +197,7 @@
+@@ -192,6 +193,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21430,7 +22930,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -373,8 +378,8 @@
+@@ -372,8 +374,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21441,7 +22941,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -399,8 +404,8 @@
+@@ -398,8 +400,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21452,7 +22952,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -410,13 +415,12 @@
+@@ -409,13 +411,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -21468,9 +22968,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/zh_TW/window-list/Makefile.in gnome-panel-2.22.0/help/zh_TW/window-list/Makefile.in
---- gnome-panel-2.22.0.old/help/zh_TW/window-list/Makefile.in 2008-03-10 22:11:41.000000000 +0100
-+++ gnome-panel-2.22.0/help/zh_TW/window-list/Makefile.in 2008-03-17 13:42:01.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/zh_TW/fish/Makefile.in gnome-panel-2.22.1/help/zh_TW/fish/Makefile.in
+--- gnome-panel-2.22.1.orig/help/zh_TW/fish/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/zh_TW/fish/Makefile.in 2008-04-12 20:22:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21482,7 +22982,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/zh_TW/fish
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21490,7 +23002,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21499,7 +23011,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21507,7 +23019,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21515,9 +23027,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/help/zh_TW/workspace-switcher/Makefile.in gnome-panel-2.22.0/help/zh_TW/workspace-switcher/Makefile.in
---- gnome-panel-2.22.0.old/help/zh_TW/workspace-switcher/Makefile.in 2008-03-10 22:11:41.000000000 +0100
-+++ gnome-panel-2.22.0/help/zh_TW/workspace-switcher/Makefile.in 2008-03-17 13:42:01.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/zh_TW/window-list/Makefile.in gnome-panel-2.22.1/help/zh_TW/window-list/Makefile.in
+--- gnome-panel-2.22.1.orig/help/zh_TW/window-list/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/zh_TW/window-list/Makefile.in 2008-04-12 20:22:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21529,7 +23041,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -147,6 +147,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/zh_TW/window-list
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21537,7 +23061,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -207,6 +208,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21546,7 +23070,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -217,6 +220,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21554,7 +23078,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -244,6 +248,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21562,9 +23086,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/icons/16x16/Makefile.in gnome-panel-2.22.0/icons/16x16/Makefile.in
---- gnome-panel-2.22.0.old/icons/16x16/Makefile.in 2008-03-10 22:11:41.000000000 +0100
-+++ gnome-panel-2.22.0/icons/16x16/Makefile.in 2008-03-17 13:42:01.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/help/zh_TW/workspace-switcher/Makefile.in gnome-panel-2.22.1/help/zh_TW/workspace-switcher/Makefile.in
+--- gnome-panel-2.22.1.orig/help/zh_TW/workspace-switcher/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/help/zh_TW/workspace-switcher/Makefile.in 2008-04-12 20:22:58.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21576,7 +23100,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
+@@ -97,10 +97,7 @@
+ $(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
+ subdir = help/zh_TW/workspace-switcher
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -147,6 +144,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21584,7 +23120,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -154,6 +155,8 @@
+@@ -206,6 +204,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21593,7 +23129,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -164,6 +167,7 @@
+@@ -216,6 +216,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21601,7 +23137,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -191,6 +195,7 @@
+@@ -243,6 +244,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21609,9 +23145,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/icons/22x22/Makefile.in gnome-panel-2.22.0/icons/22x22/Makefile.in
---- gnome-panel-2.22.0.old/icons/22x22/Makefile.in 2008-03-10 22:11:41.000000000 +0100
-+++ gnome-panel-2.22.0/icons/22x22/Makefile.in 2008-03-17 13:42:02.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/icons/16x16/Makefile.in gnome-panel-2.22.1/icons/16x16/Makefile.in
+--- gnome-panel-2.22.1.orig/icons/16x16/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/icons/16x16/Makefile.in 2008-04-12 20:22:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21623,7 +23159,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
+@@ -35,10 +35,7 @@
+ subdir = icons/16x16
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -94,6 +91,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21631,7 +23179,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -154,6 +155,8 @@
+@@ -153,6 +151,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21640,7 +23188,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -164,6 +167,7 @@
+@@ -163,6 +163,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21648,7 +23196,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -191,6 +195,7 @@
+@@ -190,6 +191,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21656,9 +23204,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/icons/24x24/Makefile.in gnome-panel-2.22.0/icons/24x24/Makefile.in
---- gnome-panel-2.22.0.old/icons/24x24/Makefile.in 2008-03-10 22:11:41.000000000 +0100
-+++ gnome-panel-2.22.0/icons/24x24/Makefile.in 2008-03-17 13:42:02.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/icons/22x22/Makefile.in gnome-panel-2.22.1/icons/22x22/Makefile.in
+--- gnome-panel-2.22.1.orig/icons/22x22/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/icons/22x22/Makefile.in 2008-04-12 20:22:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21670,7 +23218,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
+@@ -35,10 +35,7 @@
+ subdir = icons/22x22
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -94,6 +91,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21678,7 +23238,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -154,6 +155,8 @@
+@@ -153,6 +151,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21687,7 +23247,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -164,6 +167,7 @@
+@@ -163,6 +163,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21695,7 +23255,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -191,6 +195,7 @@
+@@ -190,6 +191,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21703,9 +23263,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/icons/32x32/Makefile.in gnome-panel-2.22.0/icons/32x32/Makefile.in
---- gnome-panel-2.22.0.old/icons/32x32/Makefile.in 2008-03-10 22:11:41.000000000 +0100
-+++ gnome-panel-2.22.0/icons/32x32/Makefile.in 2008-03-17 13:42:02.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/icons/24x24/Makefile.in gnome-panel-2.22.1/icons/24x24/Makefile.in
+--- gnome-panel-2.22.1.orig/icons/24x24/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/icons/24x24/Makefile.in 2008-04-12 20:22:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21717,7 +23277,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
+@@ -35,10 +35,7 @@
+ subdir = icons/24x24
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -94,6 +91,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21725,7 +23297,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -154,6 +155,8 @@
+@@ -153,6 +151,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21734,7 +23306,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -164,6 +167,7 @@
+@@ -163,6 +163,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21742,7 +23314,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -191,6 +195,7 @@
+@@ -190,6 +191,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21750,9 +23322,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/icons/48x48/Makefile.in gnome-panel-2.22.0/icons/48x48/Makefile.in
---- gnome-panel-2.22.0.old/icons/48x48/Makefile.in 2008-03-10 22:11:41.000000000 +0100
-+++ gnome-panel-2.22.0/icons/48x48/Makefile.in 2008-03-17 13:42:02.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/icons/32x32/Makefile.in gnome-panel-2.22.1/icons/32x32/Makefile.in
+--- gnome-panel-2.22.1.orig/icons/32x32/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/icons/32x32/Makefile.in 2008-04-12 20:22:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21764,7 +23336,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
+@@ -35,10 +35,7 @@
+ subdir = icons/32x32
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -94,6 +91,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21772,7 +23356,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -154,6 +155,8 @@
+@@ -153,6 +151,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21781,7 +23365,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -164,6 +167,7 @@
+@@ -163,6 +163,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21789,7 +23373,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -191,6 +195,7 @@
+@@ -190,6 +191,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21797,9 +23381,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/icons/Makefile.in gnome-panel-2.22.0/icons/Makefile.in
---- gnome-panel-2.22.0.old/icons/Makefile.in 2008-03-10 22:11:42.000000000 +0100
-+++ gnome-panel-2.22.0/icons/Makefile.in 2008-03-17 13:42:02.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/icons/48x48/Makefile.in gnome-panel-2.22.1/icons/48x48/Makefile.in
+--- gnome-panel-2.22.1.orig/icons/48x48/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/icons/48x48/Makefile.in 2008-04-12 20:22:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21811,7 +23395,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -106,6 +106,7 @@
+@@ -35,10 +35,7 @@
+ subdir = icons/48x48
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -94,6 +91,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21819,7 +23415,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -166,6 +167,8 @@
+@@ -153,6 +151,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21828,7 +23424,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -176,6 +179,7 @@
+@@ -163,6 +163,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21836,7 +23432,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -203,6 +207,7 @@
+@@ -190,6 +191,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21844,7 +23440,66 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -409,8 +414,8 @@
+diff -Naur gnome-panel-2.22.1.orig/icons/Makefile.in gnome-panel-2.22.1/icons/Makefile.in
+--- gnome-panel-2.22.1.orig/icons/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/icons/Makefile.in 2008-04-12 20:22:59.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,10 +35,7 @@
+ subdir = icons
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -106,6 +103,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DLLTOOL = @DLLTOOL@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -165,6 +163,8 @@
+ LIBTOOL = @LIBTOOL@
+ LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
+ LN_S = @LN_S@
++LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
++LOGOUT_LIBS = @LOGOUT_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+@@ -175,6 +175,7 @@
+ MSGMERGE = @MSGMERGE@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
++NMEDIT = @NMEDIT@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -202,6 +203,7 @@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -408,8 +410,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21855,7 +23510,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -435,8 +440,8 @@
+@@ -434,8 +436,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21866,7 +23521,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -446,13 +451,12 @@
+@@ -445,13 +447,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -21882,9 +23537,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/icons/scalable/Makefile.in gnome-panel-2.22.0/icons/scalable/Makefile.in
---- gnome-panel-2.22.0.old/icons/scalable/Makefile.in 2008-03-10 22:11:42.000000000 +0100
-+++ gnome-panel-2.22.0/icons/scalable/Makefile.in 2008-03-17 13:42:02.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/icons/scalable/Makefile.in gnome-panel-2.22.1/icons/scalable/Makefile.in
+--- gnome-panel-2.22.1.orig/icons/scalable/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/icons/scalable/Makefile.in 2008-04-12 20:22:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21896,7 +23551,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
+@@ -35,10 +35,7 @@
+ subdir = icons/scalable
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -94,6 +91,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21904,7 +23571,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -154,6 +155,8 @@
+@@ -153,6 +151,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21913,7 +23580,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -164,6 +167,7 @@
+@@ -163,6 +163,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21921,7 +23588,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -191,6 +195,7 @@
+@@ -190,6 +191,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21929,9 +23596,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/idl/Makefile.in gnome-panel-2.22.0/idl/Makefile.in
---- gnome-panel-2.22.0.old/idl/Makefile.in 2008-03-10 22:11:42.000000000 +0100
-+++ gnome-panel-2.22.0/idl/Makefile.in 2008-03-17 13:42:02.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/idl/Makefile.in gnome-panel-2.22.1/idl/Makefile.in
+--- gnome-panel-2.22.1.orig/idl/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/idl/Makefile.in 2008-04-12 20:22:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21943,7 +23610,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -94,6 +94,7 @@
+@@ -35,10 +35,7 @@
+ subdir = idl
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -94,6 +91,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -21951,7 +23630,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -154,6 +155,8 @@
+@@ -153,6 +151,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -21960,7 +23639,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -164,6 +167,7 @@
+@@ -163,6 +163,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -21968,7 +23647,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -191,6 +195,7 @@
+@@ -190,6 +191,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -21976,9 +23655,9 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/install-sh gnome-panel-2.22.0/install-sh
---- gnome-panel-2.22.0.old/install-sh 2008-03-10 22:11:37.000000000 +0100
-+++ gnome-panel-2.22.0/install-sh 2008-03-17 13:41:55.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/install-sh gnome-panel-2.22.1/install-sh
+--- gnome-panel-2.22.1.orig/install-sh 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/install-sh 2008-04-12 20:22:56.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -22341,66 +24020,9 @@
trap '' 0
fi
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/intltool-extract.in gnome-panel-2.22.0/intltool-extract.in
---- gnome-panel-2.22.0.old/intltool-extract.in 2008-03-10 22:11:27.000000000 +0100
-+++ gnome-panel-2.22.0/intltool-extract.in 2008-03-17 13:41:43.000000000 +0100
-@@ -32,7 +32,7 @@
- ## Release information
- my $PROGRAM = "intltool-extract";
- my $PACKAGE = "intltool";
--my $VERSION = "0.37.0";
-+my $VERSION = "0.37.1";
-
- ## Loaded modules
- use strict;
-@@ -764,7 +764,7 @@
- }
-
- ## handle new glade files
-- while ($input =~ /<(property|atkproperty|col)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
-+ while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
- $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/;
- if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) {
- $comments{entity_decode($3)} = entity_decode($2) ;
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/intltool-merge.in gnome-panel-2.22.0/intltool-merge.in
---- gnome-panel-2.22.0.old/intltool-merge.in 2008-03-10 22:11:27.000000000 +0100
-+++ gnome-panel-2.22.0/intltool-merge.in 2008-03-17 13:41:43.000000000 +0100
-@@ -35,7 +35,7 @@
- ## Release information
- my $PROGRAM = "intltool-merge";
- my $PACKAGE = "intltool";
--my $VERSION = "0.37.0";
-+my $VERSION = "0.37.1";
-
- ## Loaded modules
- use strict;
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/intltool-update.in gnome-panel-2.22.0/intltool-update.in
---- gnome-panel-2.22.0.old/intltool-update.in 2008-03-10 22:11:27.000000000 +0100
-+++ gnome-panel-2.22.0/intltool-update.in 2008-03-17 13:41:43.000000000 +0100
-@@ -30,7 +30,7 @@
-
- ## Release information
- my $PROGRAM = "intltool-update";
--my $VERSION = "0.37.0";
-+my $VERSION = "0.37.1";
- my $PACKAGE = "intltool";
-
- ## Loaded modules
-@@ -124,7 +124,10 @@
-
- &Console_Write_IntltoolHelp if $arg_count > 1;
-
--my $MODULE = $GETTEXT_PACKAGE || FindPackageName() || "unknown";
-+my $PKGNAME = FindPackageName ();
-+
-+# --version and --help don't require a module name
-+my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
-
- if ($POT_ARG)
- {
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/libpanel-applet/Makefile.in gnome-panel-2.22.0/libpanel-applet/Makefile.in
---- gnome-panel-2.22.0.old/libpanel-applet/Makefile.in 2008-03-10 22:11:42.000000000 +0100
-+++ gnome-panel-2.22.0/libpanel-applet/Makefile.in 2008-03-17 13:42:03.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/libpanel-applet/Makefile.in gnome-panel-2.22.1/libpanel-applet/Makefile.in
+--- gnome-panel-2.22.1.orig/libpanel-applet/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/libpanel-applet/Makefile.in 2008-04-12 20:22:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22412,7 +24034,19 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -89,7 +89,7 @@
+@@ -43,10 +43,7 @@
+ $(srcdir)/libpanelapplet-2.0-uninstalled.pc.in \
+ $(srcdir)/libpanelapplet-2.0.pc.in ChangeLog TODO
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -89,7 +86,7 @@
test_bonobo_applet_OBJECTS = test-bonobo-applet.$(OBJEXT)
test_bonobo_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
libpanel-applet-2.la
@@ -22421,7 +24055,7 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -151,6 +151,7 @@
+@@ -151,6 +148,7 @@
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
@@ -22429,7 +24063,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -211,6 +212,8 @@
+@@ -210,6 +208,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -22438,7 +24072,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -221,6 +224,7 @@
+@@ -220,6 +220,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -22446,7 +24080,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -248,6 +252,7 @@
+@@ -247,6 +248,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -22454,7 +24088,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -434,8 +439,8 @@
+@@ -433,8 +435,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -22465,7 +24099,7 @@
else :; fi; \
done
-@@ -443,8 +448,8 @@
+@@ -442,8 +444,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -22476,7 +24110,7 @@
done
clean-libLTLIBRARIES:
-@@ -466,8 +471,8 @@
+@@ -465,8 +467,8 @@
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -22487,7 +24121,7 @@
else :; fi; \
done
-@@ -599,8 +604,8 @@
+@@ -598,8 +600,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -22498,7 +24132,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -612,8 +617,8 @@
+@@ -611,8 +613,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -22509,7 +24143,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -623,13 +628,12 @@
+@@ -622,13 +624,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -22525,9 +24159,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/ltmain.sh gnome-panel-2.22.0/ltmain.sh
---- gnome-panel-2.22.0.old/ltmain.sh 2008-03-05 16:01:59.000000000 +0100
-+++ gnome-panel-2.22.0/ltmain.sh 2008-02-02 14:28:24.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/ltmain.sh gnome-panel-2.22.1/ltmain.sh
+--- gnome-panel-2.22.1.orig/ltmain.sh 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/ltmain.sh 2008-04-05 17:47:55.000000000 +0200
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -22545,7 +24179,7 @@
PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.26 Debian 1.5.26-1"
++VERSION="1.5.26 Debian 1.5.26-3"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-# See if we are running on zsh, and set the options which allow our
@@ -23185,9 +24819,9 @@
All other options (arguments beginning with \`-') are ignored.
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/Makefile.in gnome-panel-2.22.0/Makefile.in
---- gnome-panel-2.22.0.old/Makefile.in 2008-03-10 22:11:42.000000000 +0100
-+++ gnome-panel-2.22.0/Makefile.in 2008-03-17 13:42:03.000000000 +0100
+diff -Naur gnome-panel-2.22.1.orig/man/Makefile.in gnome-panel-2.22.1/man/Makefile.in
+--- gnome-panel-2.22.1.orig/man/Makefile.in 2008-04-12 20:22:14.000000000 +0200
++++ gnome-panel-2.22.1/man/Makefile.in 2008-04-12 20:22:59.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -23199,15 +24833,27 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -111,6 +111,7 @@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
+@@ -34,10 +34,7 @@
+ subdir = man
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+- $(top_srcdir)/m4/gnome-doc-utils.m4 \
+- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+- $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -88,6 +85,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
DLLTOOL = @DLLTOOL@
DOC_USER_FORMATS = @DOC_USER_FORMATS@
+DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -171,6 +172,8 @@
+@@ -147,6 +145,8 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -23216,7 +24862,7 @@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
-@@ -181,6 +184,7 @@
+@@ -157,6 +157,7 @@
MSGMERGE = @MSGMERGE@
NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
@@ -23224,7 +24870,7 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OMF_DIR = @OMF_DIR@
-@@ -208,6 +212,7 @@
+@@ -184,6 +185,7 @@
RANLIB = @RANLIB@
REBUILD = @REBUILD@
SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
@@ -23232,119 +24878,3 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -440,8 +445,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -466,8 +471,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -477,13 +482,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -553,6 +557,10 @@
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-+dist-lzma: distdir
-+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+ $(am__remove_distdir)
-+
- dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-@@ -579,6 +587,8 @@
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ *.tar.lzma*) \
-+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-@@ -722,8 +732,8 @@
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-- distclean-generic distclean-hdr distclean-libtool \
-+ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-+ distclean distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
-diff -Naur -x'*config.sub' -x'*config.guess' gnome-panel-2.22.0.old/man/Makefile.in gnome-panel-2.22.0/man/Makefile.in
---- gnome-panel-2.22.0.old/man/Makefile.in 2008-03-10 22:11:42.000000000 +0100
-+++ gnome-panel-2.22.0/man/Makefile.in 2008-03-17 13:42:03.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -88,6 +88,7 @@
- DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
- DLLTOOL = @DLLTOOL@
- DOC_USER_FORMATS = @DOC_USER_FORMATS@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -148,6 +149,8 @@
- LIBTOOL = @LIBTOOL@
- LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
- LN_S = @LN_S@
-+LOGOUT_CFLAGS = @LOGOUT_CFLAGS@
-+LOGOUT_LIBS = @LOGOUT_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -158,6 +161,7 @@
- MSGMERGE = @MSGMERGE@
- NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
- NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
-+NMEDIT = @NMEDIT@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- OMF_DIR = @OMF_DIR@
-@@ -185,6 +189,7 @@
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
Modified: desktop/experimental/gnome-panel/debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch?rev=15636&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch Sat Apr 12 18:35:23 2008
@@ -1,8 +1,9 @@
GNOME #378854; don't clean calendar backend if it wasn't loaded
---- a/applets/clock/calendar-sources.c 2008-03-19 14:11:38.000000000 +0100
-+++ b/applets/clock/calendar-sources.c 2008-03-19 14:12:09.000000000 +0100
-@@ -429,6 +429,10 @@
+diff -Naur gnome-panel-2.22.1.orig/applets/clock/calendar-sources.c gnome-panel-2.22.1/applets/clock/calendar-sources.c
+--- gnome-panel-2.22.1.orig/applets/clock/calendar-sources.c 2008-04-12 19:37:58.000000000 +0200
++++ gnome-panel-2.22.1/applets/clock/calendar-sources.c 2008-04-12 19:38:07.000000000 +0200
+@@ -444,6 +444,10 @@
{
const char *uristr;
Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=15636&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series (original)
+++ desktop/experimental/gnome-panel/debian/patches/series Sat Apr 12 18:35:23 2008
@@ -1,7 +1,8 @@
01_panel_submenus.patch
02_switch-user_lock.patch
03_gnome-panel-logout.patch
-60_caldav-clock-appointments.patch
+08_clock_applet_event.patch
+09_default_icons.patch
70_relibtoolize.patch
90_dont-cleanup-calendard-backend-when-not-loaded.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list