Bug#520918: Notification Area Applet doesn't work properly in vertical panels with GTK+ 2.16
Philipp Kaluza
pk+debs at yomu.de
Fri Mar 27 17:26:05 UTC 2009
Package: gnome-panel
Version: 2.24.2-3
Followup-For: Bug #520918
The fix Michael quoted was commited in gnome-panel's SVN in r11518
(changelog below). This also fixes up the clock applet.
Upstream bugs are:
http://bugzilla.gnome.org/show_bug.cgi?id=571041
http://bugzilla.gnome.org/show_bug.cgi?id=571042
I took the liberty of backporting the fix to 2.24.2. A proposed debdiff
is attached. (Built packages are available at:
http://playground.yomu.de/debian/pool/main/g/gnome-panel/ )
However, since this fix makes gnome-panel depend on gtk+ 2.15, (so 2.16
effectively) I'm not sure if it makes sense to roll this into the 2.24 series.
I guess this depends on how soon gtk+ 2.16 will hit unstable and how
far away gnome-panel 2.26 packages are at that point.
Greetings, and keep up the good work,
Philipp
svn changelog of the fix:
------------------------------------------------------------------------
r11518 | vuntz | 2009-02-17 10:24:48 +0100 (Tue, 17 Feb 2009) | 29 lines
Changed paths:
M /trunk/ChangeLog
M /trunk/applets/clock/ChangeLog
M /trunk/applets/clock/Makefile.am
M /trunk/applets/clock/clock.c
D /trunk/applets/clock/obox.c
D /trunk/applets/clock/obox.h
M /trunk/applets/notification_area/ChangeLog
M /trunk/applets/notification_area/Makefile.am
M /trunk/applets/notification_area/main.c
M /trunk/applets/notification_area/na-tray.c
D /trunk/applets/notification_area/obox.c
D /trunk/applets/notification_area/obox.h
M /trunk/configure.in
2009-02-17 Vincent Untz <vuntz at gnome.org>
* configure.in: require GTK+ 2.15.1 for orientable GtkBox.
2009-02-17 Vincent Untz <vuntz at gnome.org>
Kill OBox since GtkBox now supports changing the orientation.
Patch by Christian Persch <chpe at gnome.org>.
Fix bug #571042.
* Makefile.am: remove obox.[ch]
* obox.[ch]: killed
* clock.c: (clock_box_init), (clock_box_class_init): add an
instantiable GtkBox type
(create_clock_widget), (applet_change_orient): use GtkBox methods.
2009-02-17 Vincent Untz <vuntz at gnome.org>
Kill OBox since GtkBox now supports changing the orientation.
Patch by Christian Persch <chpe at gnome.org>.
Fix bug #571042.
* Makefile.am: remove obox.[ch]
* obox.[ch]: killed
* main.c: remove useless include
* na-tray.c: (na_box_init), (na_box_class_init): add an
instantiable GtkBox type
(update_size_and_orientation), (na_tray_init): use GtkBox methods.
------------------------------------------------------------------------
-- System Information:
Debian Release: 5.0
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable'), (60, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.29-1-686 (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages gnome-panel depends on:
ii gnome-about 2.22.3-2 The GNOME about box
ii gnome-control-center 1:2.22.2.1-2+b1 utilities to configure the GNOME d
ii gnome-desktop-data 2.22.3-2 Common files for GNOME 2 desktop a
ii gnome-menus 2.22.2-4 an implementation of the freedeskt
ii gnome-panel-data 2.24.2-3 common files for the GNOME Panel
ii libatk1.0-0 1.22.0-1 The ATK accessibility toolkit
ii libbonobo2-0 2.24.0-2 Bonobo CORBA interfaces library
ii libbonoboui2-0 2.22.0-1 The Bonobo UI library
ii libc6 2.9-4 GNU C Library: Shared libraries
ii libcairo2 1.8.6-2 The Cairo 2D vector graphics libra
ii libdbus-1-3 1.2.1-5 simple interprocess messaging syst
ii libdbus-glib-1-2 0.80-3 simple interprocess messaging syst
ii libecal1.2-7 2.24.5-2 Client library for evolution calen
ii libedataserver1.2-9 2.22.3-1.1 Utility library for evolution data
ii libedataserverui1.2-8 2.22.3-1.1 GUI utility library for evolution
ii libgconf2-4 2.24.0-7 GNOME configuration database syste
ii libglade2-0 1:2.6.3-1 library to load .glade files at ru
ii libglib2.0-0 2.20.0-2 The GLib library of C routines
ii libgnome-desktop-2 2.22.3-2 Utility library for loading .deskt
ii libgnome-menu2 2.22.2-4 an implementation of the freedeskt
ii libgnome2-0 2.24.1-2 The GNOME 2 library - runtime file
ii libgnomeui-0 2.24.1-1 The GNOME 2 libraries (User Interf
ii libgtk2.0-0 2.16.0-1 The GTK+ graphical user interface
ii libgweather1 2.24.3-1 GWeather shared library
ii liborbit2 1:2.14.16-0.1 libraries for ORBit2 - a CORBA ORB
ii libpanel-applet2-0 2.20.3-5 library for GNOME Panel applets
ii libpango1.0-0 1.22.4-2 Layout and rendering of internatio
ii libpolkit-dbus2 0.9-2 library for accessing PolicyKit vi
ii libpolkit2 0.9-2 library for accessing PolicyKit
ii librsvg2-2 2.22.3-2 SAX-based renderer library for SVG
ii libwnck22 2.22.3-1 Window Navigator Construction Kit
ii libx11-6 2:1.1.5-2 X11 client-side library
ii libxau6 1:1.0.3-3 X11 authorisation library
ii menu-xdg 0.3 freedesktop.org menu compliant win
Versions of packages gnome-panel recommends:
ii alacarte 0.11.6-1 easy GNOME menu editing tool
ii evolution-data-server 2.22.3-1.1 evolution database backend server
ii gnome-applets 2.24.2-1 Various applets for GNOME 2 panel
ii gnome-icon-theme 2.24.0-2 GNOME Desktop icon theme
ii gnome-session 2.22.3-2 The GNOME 2 Session Manager
ii gvfs 1.0.3-2 userspace virtual filesystem - ser
Versions of packages gnome-panel suggests:
ii gnome-system-tools 2.22.0-3 Cross-platform configuration utili
ii gnome-terminal [x-terminal-e 2.22.3-3 The GNOME 2 terminal emulator appl
ii gnome-user-guide [gnome2-use 2.22.1-1 GNOME user's guide
ii nautilus 2.24.2-2 file manager and graphical shell f
ii rxvt-unicode [x-terminal-emu 9.06-1 RXVT-like terminal emulator with U
ii tilda [x-terminal-emulator] 0.09.6-1 terminal emulator with first perso
ii xterm [x-terminal-emulator] 241-1 X terminal emulator
ii yelp 2.22.1-8+b1 Help browser for GNOME 2
-- no debconf information
-------------- next part --------------
diffstat for gnome-panel_2.24.2-3 gnome-panel_2.24.2-3.1
debian/patches/10_use_orientable_gtk_box.patch | 173
gnome-panel-2.24.2/debian/changelog | 9
gnome-panel-2.24.2/debian/control | 4
gnome-panel-2.24.2/debian/control.in | 4
gnome-panel-2.24.2/debian/patches/70_relibtoolize.patch |24691 ++++++++++++----
gnome-panel-2.24.2/debian/patches/series | 1
6 files changed, 19101 insertions(+), 5781 deletions(-)
diff -u gnome-panel-2.24.2/debian/control gnome-panel-2.24.2/debian/control
--- gnome-panel-2.24.2/debian/control
+++ gnome-panel-2.24.2/debian/control
@@ -14,7 +14,7 @@
gnome-doc-utils,
libx11-dev,
libxau-dev,
- libgtk2.0-dev (>= 2.13.1),
+ libgtk2.0-dev (>= 2.15.1),
libgnomeui-dev (>= 2.16.0-2),
libgnome-desktop-dev (>= 2.11.1),
libglade2-dev (>= 1:2.5.0),
@@ -98,7 +98,7 @@
Depends: ${misc:Depends},
libpanel-applet2-0 (= ${binary:Version}),
libgconf2-dev (>= 2.6.1),
- libgtk2.0-dev (>= 2.13.1),
+ libgtk2.0-dev (>= 2.15.1),
libgnomeui-dev (>= 2.5.4),
libbonoboui2-dev (>= 2.1.1)
Description: library for GNOME Panel applets - development files
diff -u gnome-panel-2.24.2/debian/changelog gnome-panel-2.24.2/debian/changelog
--- gnome-panel-2.24.2/debian/changelog
+++ gnome-panel-2.24.2/debian/changelog
@@ -1,3 +1,12 @@
+gnome-panel (2.24.2-3.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Backport upstream fix to replace obox with new orientable GtkBox.
+ Thanks to Michel D?nzer. (Closes: #520918)
+ * This bumps the build-dependency on libgtk2.0-dev to 2.15.1.
+
+ -- Philipp Kaluza <pk+debs at yomu.de> Fri, 27 Mar 2009 17:35:41 +0100
+
gnome-panel (2.24.2-3) experimental; urgency=low
* Recommend gnome-icon-theme 2.24.
diff -u gnome-panel-2.24.2/debian/control.in gnome-panel-2.24.2/debian/control.in
--- gnome-panel-2.24.2/debian/control.in
+++ gnome-panel-2.24.2/debian/control.in
@@ -14,7 +14,7 @@
gnome-doc-utils,
libx11-dev,
libxau-dev,
- libgtk2.0-dev (>= 2.13.1),
+ libgtk2.0-dev (>= 2.15.1),
libgnomeui-dev (>= 2.16.0-2),
libgnome-desktop-dev (>= 2.11.1),
libglade2-dev (>= 1:2.5.0),
@@ -98,7 +98,7 @@
Depends: ${misc:Depends},
libpanel-applet2-0 (= ${binary:Version}),
libgconf2-dev (>= 2.6.1),
- libgtk2.0-dev (>= 2.13.1),
+ libgtk2.0-dev (>= 2.15.1),
libgnomeui-dev (>= 2.5.4),
libbonoboui2-dev (>= 2.1.1)
Description: library for GNOME Panel applets - development files
diff -u gnome-panel-2.24.2/debian/patches/series gnome-panel-2.24.2/debian/patches/series
--- gnome-panel-2.24.2/debian/patches/series
+++ gnome-panel-2.24.2/debian/patches/series
@@ -5,4 +5,5 @@
08_clock_applet_event.patch
09_default_icons.patch
+10_use_orientable_gtk_box.patch
70_relibtoolize.patch
99_ltmain_as-needed.patch
diff -u gnome-panel-2.24.2/debian/patches/70_relibtoolize.patch gnome-panel-2.24.2/debian/patches/70_relibtoolize.patch
--- gnome-panel-2.24.2/debian/patches/70_relibtoolize.patch
+++ gnome-panel-2.24.2/debian/patches/70_relibtoolize.patch
@@ -5,27 +5,29 @@
autoconf
rm -rf autom4te.cache
-Index: gnome-panel-2.24.2/aclocal.m4
-===================================================================
---- gnome-panel-2.24.2.orig/aclocal.m4 2008-12-27 18:41:52.911987836 +0100
-+++ gnome-panel-2.24.2/aclocal.m4 2008-12-28 02:39:20.123481756 +0100
-@@ -13,4163 +13,3250 @@
+--- gnome-panel-2.24.2.orig/aclocal.m4
++++ gnome-panel-2.24.2/aclocal.m4
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 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.
+@@ -11,3649 +11,2728 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_ifndef([AC_AUTOCONF_VERSION],
+- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.62],,
-[m4_warning([this file was generated for autoconf 2.62.
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
- You have another version of autoconf. It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
--# Copyright (C) 2002, 2003, 2005, 2006, 2007 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.
+-You have another version of autoconf. It may work, but is not guaranteed to.
+-If you have problems, you may need to regenerate the build system entirely.
+-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+dnl AM_GCONF_SOURCE_2
+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+dnl (i.e. pass to gconftool-2
@@ -33,6 +35,19 @@
+dnl you should install foo.schemas files
+dnl
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007 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_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
+
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -45,13 +60,10 @@
-m4_if([$1], [1.10.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+ else
-+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+ fi
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
@@ -59,10 +71,8 @@
-# This is a private macro too. Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-+ AC_ARG_WITH([gconf-source],
-+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+ [Config database for installing schema files.]),
-+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
@@ -73,30 +83,27 @@
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
--# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+ fi
+-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
+
-# 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.
-+ AC_ARG_WITH([gconf-schema-file-dir],
-+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+ [Directory for installing schema files.]),
-+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
+ AC_ARG_ENABLE(schemas-install,
+ [ --disable-schemas-install Disable the schemas installation],
+ [case ${enableval} in
@@ -275,10 +282,16 @@
-# 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 9
+AC_SUBST($1)dnl
+])
--# serial 9
+-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+-# written in clear, in which case automake, when reading aclocal.m4,
+-# will think it sees a *use*, and therefore will trigger all it's
+-# C support machinery. Also note that it means that autoscan, seeing
+-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
@@ -286,17 +299,8 @@
+ [USE_NLS=yes
+ AC_SUBST(USE_NLS)
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery. Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ gt_cv_have_gettext=no
-+ CATOBJEXT=NONE
-+ XGETTEXT=:
-+ INTLLIBS=
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
@@ -312,14 +316,20 @@
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
--
++ CATOBJEXT=NONE
++ XGETTEXT=:
++ INTLLIBS=
+
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
--
++ AC_CHECK_HEADER(libintl.h,
++ [gt_cv_func_dgettext_libintl="no"
++ libintl_extra_libs=""
+
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -340,7 +350,33 @@
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
--
++ #
++ # First check in libc
++ #
++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
++ [AC_TRY_LINK([
++#include <libintl.h>
++],
++ [return !ngettext ("","", 1)],
++ gt_cv_func_ngettext_libc=yes,
++ gt_cv_func_ngettext_libc=no)
++ ])
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
++ [AC_TRY_LINK([
++#include <libintl.h>
++],
++ [return !dgettext ("","")],
++ gt_cv_func_dgettext_libc=yes,
++ gt_cv_func_dgettext_libc=no)
++ ])
++ fi
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ fi
+
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
@@ -361,9 +397,17 @@
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ AC_CHECK_HEADER(libintl.h,
-+ [gt_cv_func_dgettext_libintl="no"
-+ libintl_extra_libs=""
++ #
++ # If we don't have everything we want, check in libintl
++ #
++ if test "$gt_cv_func_dgettext_libc" != "yes" \
++ || test "$gt_cv_func_ngettext_libc" != "yes" \
++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++
++ AC_CHECK_LIB(intl, bindtextdomain,
++ [AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dgettext,
++ gt_cv_func_dgettext_libintl=yes)])])
- case $depmode in
- nosideeffect)
@@ -373,27 +417,38 @@
- continue
- else
- break
-+ #
-+ # First check in libc
-+ #
-+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
-+ [AC_TRY_LINK([
-+#include <libintl.h>
-+],
-+ [return !ngettext ("","", 1)],
-+ gt_cv_func_ngettext_libc=yes,
-+ gt_cv_func_ngettext_libc=no)
-+ ])
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
-+ [AC_TRY_LINK([
-+#include <libintl.h>
-+],
-+ [return !dgettext ("","")],
-+ gt_cv_func_dgettext_libc=yes,
-+ gt_cv_func_dgettext_libc=no)
-+ ])
++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++ AC_MSG_CHECKING([if -liconv is needed to use gettext])
++ AC_MSG_RESULT([])
++ AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dcgettext,
++ [gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv],
++ :,-liconv)],
++ :,-liconv)
++ fi
++
++ #
++ # If we found libintl, then check in it for bind_textdomain_codeset();
++ # we'll prefer libc if neither have bind_textdomain_codeset(),
++ # and both have dgettext and ngettext
++ #
++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $libintl_extra_libs"
++ unset ac_cv_func_bind_textdomain_codeset
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ LIBS="$glib_save_LIBS"
++
++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++ gt_cv_func_dgettext_libc=no
++ else
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ && test "$gt_cv_func_ngettext_libc" = "yes"; then
++ gt_cv_func_dgettext_libintl=no
++ fi
++ fi
++ fi
fi
- ;;
- none) break ;;
@@ -421,13 +476,78 @@
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
++
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ gt_cv_have_gettext=yes
++ fi
+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ INTLLIBS="-lintl $libintl_extra_libs"
++ fi
++
++ if test "$gt_cv_have_gettext" = "yes"; then
++ AC_DEFINE(HAVE_GETTEXT,1,
++ [Define if the GNU gettext() function is already present or preinstalled.])
++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
++ if test "$MSGFMT" != "no"; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS $INTLLIBS"
++ AC_CHECK_FUNCS(dcgettext)
++ MSGFMT_OPTS=
++ AC_MSG_CHECKING([if msgfmt accepts -c])
++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++"Project-Id-Version: test 1.0\n"
++"PO-Revision-Date: 2007-02-15 12:01+0100\n"
++"Last-Translator: test <foo at bar.xx>\n"
++"Language-Team: C <LL at li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Transfer-Encoding: 8bit\n"
++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
++ AC_SUBST(MSGFMT_OPTS)
++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr],
++ [CATOBJEXT=.gmo
++ 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 and
++ dnl and CATOBJEXT=.gmo in this case.
++ AC_CHECK_FUNC(bind_textdomain_codeset,
++ [CATOBJEXT=.gmo
++ DATADIRNAME=share],
++ [CATOBJEXT=.mo
++ DATADIRNAME=lib])
++ ;;
++ *)
++ CATOBJEXT=.mo
++ DATADIRNAME=lib
++ ;;
++ esac])
++ LIBS="$glib_save_LIBS"
++ INSTOBJEXT=.mo
++ else
++ gt_cv_have_gettext=no
++ fi
fi
-- fi
++ ])
++
++ if test "$gt_cv_have_gettext" = "yes" ; then
++ AC_DEFINE(ENABLE_NLS, 1,
++ [always defined to indicate that i18n is enabled])
+ fi
- done
--
+
- cd ..
- rm -rf conftest.dir
-else
@@ -439,211 +559,6 @@
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
--
--
--# AM_SET_DEPDIR
--# -------------
--# Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
--AC_DEFUN([AM_SET_DEPDIR],
--[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
--])
--
-
--# AM_DEP_TRACK
--# ------------
--AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[ --disable-dependency-tracking speeds up one-time build
-- --enable-dependency-tracking do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
-- am_depcomp="$ac_aux_dir/depcomp"
-- AMDEPBACKSLASH='\'
--fi
--AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])dnl
--_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
--])
-+ #
-+ # If we don't have everything we want, check in libintl
-+ #
-+ if test "$gt_cv_func_dgettext_libc" != "yes" \
-+ || test "$gt_cv_func_ngettext_libc" != "yes" \
-+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-+
-+ AC_CHECK_LIB(intl, bindtextdomain,
-+ [AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dgettext,
-+ gt_cv_func_dgettext_libintl=yes)])])
-
--# Generate code to set up dependency tracking. -*- Autoconf -*-
-+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
-+ AC_MSG_RESULT([])
-+ AC_CHECK_LIB(intl, ngettext,
-+ [AC_CHECK_LIB(intl, dcgettext,
-+ [gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv],
-+ :,-liconv)],
-+ :,-liconv)
-+ fi
-
--# Copyright (C) 1999, 2000, 2001, 2002, 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.
-+ #
-+ # If we found libintl, then check in it for bind_textdomain_codeset();
-+ # we'll prefer libc if neither have bind_textdomain_codeset(),
-+ # and both have dgettext and ngettext
-+ #
-+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS -lintl $libintl_extra_libs"
-+ unset ac_cv_func_bind_textdomain_codeset
-+ AC_CHECK_FUNCS(bind_textdomain_codeset)
-+ LIBS="$glib_save_LIBS"
-
--#serial 3
-+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
-+ gt_cv_func_dgettext_libc=no
-+ else
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
-+ gt_cv_func_dgettext_libintl=no
-+ fi
-+ fi
-+ fi
-+ fi
-
--# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# ------------------------------
--AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[for mf in $CONFIG_FILES; do
-- # Strip MF so we end up with the name of the file.
-- mf=`echo "$mf" | sed -e 's/:.*$//'`
-- # Check whether this is an Automake generated Makefile or not.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # Grep'ing the whole file is not good either: AIX grep has a line
-- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-- dirpart=`AS_DIRNAME("$mf")`
-- else
-- continue
-- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-- test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-- # Make sure the directory exists.
-- test -f "$dirpart/$file" && continue
-- fdir=`AS_DIRNAME(["$file"])`
-- AS_MKDIR_P([$dirpart/$fdir])
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-- done
--done
--])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+ if test "$gt_cv_func_dgettext_libc" = "yes" \
-+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+ gt_cv_have_gettext=yes
-+ fi
-+
-+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-+ INTLLIBS="-lintl $libintl_extra_libs"
-+ fi
-+
-+ if test "$gt_cv_have_gettext" = "yes"; then
-+ AC_DEFINE(HAVE_GETTEXT,1,
-+ [Define if the GNU gettext() function is already present or preinstalled.])
-+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-+ if test "$MSGFMT" != "no"; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS $INTLLIBS"
-+ AC_CHECK_FUNCS(dcgettext)
-+ MSGFMT_OPTS=
-+ AC_MSG_CHECKING([if msgfmt accepts -c])
-+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Project-Id-Version: test 1.0\n"
-+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-+"Last-Translator: test <foo at bar.xx>\n"
-+"Language-Team: C <LL at li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-+ AC_SUBST(MSGFMT_OPTS)
-+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr],
-+ [CATOBJEXT=.gmo
-+ 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 and
-+ dnl and CATOBJEXT=.gmo in this case.
-+ AC_CHECK_FUNC(bind_textdomain_codeset,
-+ [CATOBJEXT=.gmo
-+ DATADIRNAME=share],
-+ [CATOBJEXT=.mo
-+ DATADIRNAME=lib])
-+ ;;
-+ *)
-+ CATOBJEXT=.mo
-+ DATADIRNAME=lib
-+ ;;
-+ esac])
-+ LIBS="$glib_save_LIBS"
-+ INSTOBJEXT=.mo
-+ else
-+ gt_cv_have_gettext=no
-+ fi
-+ fi
-+ ])
-
-+ if test "$gt_cv_have_gettext" = "yes" ; then
-+ AC_DEFINE(ENABLE_NLS, 1,
-+ [always defined to indicate that i18n is enabled])
-+ fi
-
--# AM_OUTPUT_DEPENDENCY_COMMANDS
--# -----------------------------
--# This macro should only be invoked once -- use via AC_REQUIRE.
--#
--# This code is only required when automatic dependency tracking
--# is enabled. FIXME. This creates each `.P' file that we will
--# need in order to bootstrap the dependency handling code.
--AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
--[AC_CONFIG_COMMANDS([depfiles],
-- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
--])
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is not GNU xgettext we define it as : so that the
@@ -657,23 +572,22 @@
+ fi
+ fi
--# Copyright (C) 1996, 1997, 2000, 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.
+ # We need to process the po/ directory.
+ POSUB=po
--# serial 8
+-# AM_SET_DEPDIR
+-# -------------
+-# Choose a directory name for dependency files.
+-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+-AC_DEFUN([AM_SET_DEPDIR],
+-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+-])
+ AC_OUTPUT_COMMANDS(
+ [case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac])
--# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
--AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+ 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.
@@ -682,7 +596,20 @@
+ POFILES="$POFILES $lang.po"
+ done
--# Do all the work for Automake. -*- Autoconf -*-
+-# AM_DEP_TRACK
+-# ------------
+-AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE(dependency-tracking,
+-[ --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors])
+-if test "x$enable_dependency_tracking" != xno; then
+- am_depcomp="$ac_aux_dir/depcomp"
+- AMDEPBACKSLASH='\'
+-fi
+-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])dnl
+-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+-])
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
@@ -696,12 +623,7 @@
+ AC_SUBST(POSUB)
+ ])
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation
@@ -719,7 +641,12 @@
+ GLIB_LC_MESSAGES
+ GLIB_WITH_NLS
--# serial 13
+-# Copyright (C) 1999, 2000, 2001, 2002, 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.
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
@@ -751,41 +678,56 @@
+ AC_MSG_RESULT($LINGUAS)
+ fi
--# This macro actually does too much. Some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
+-#serial 3
+ dnl Construct list of names of catalog files to be constructed.
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out. PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition. After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.60])dnl
--dnl Autoconf wants to disallow AM_ names. We explicitly allow
--dnl the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
--AC_REQUIRE([AC_PROG_INSTALL])dnl
--if test "`cd $srcdir && pwd`" != "`pwd`"; then
-- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-- # is not polluted with repeated "-I."
-- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-- # test to see if srcdir already configured
-- if test -f $srcdir/config.status; then
-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+-# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-# ------------------------------
+-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[for mf in $CONFIG_FILES; do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
+- else
+- continue
- fi
--fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
+-done
+-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+ 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.
@@ -798,15 +740,6 @@
+ fi
+ AC_SUBST(MKINSTALLDIRS)
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
-- if (cygpath --version) >/dev/null 2>/dev/null; then
-- CYGPATH_W='cygpath -w'
-- else
-- CYGPATH_W=echo
-- fi
--fi
--AC_SUBST([CYGPATH_W])
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
@@ -824,56 +757,17 @@
+ < $srcdir/po/POTFILES.in > po/POTFILES
+ ])
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
--dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
--m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
--
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
--
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
--AC_REQUIRE([AM_PROG_MKDIR_P])dnl
--# We need awk for the "check" target. The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-- [_AM_PROG_TAR([v7])])])
--_AM_IF_OPTION([no-dependencies],,
--[AC_PROVIDE_IFELSE([AC_PROG_CC],
-- [_AM_DEPENDENCIES(CC)],
-- [define([AC_PROG_CC],
-- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_CXX],
-- [_AM_DEPENDENCIES(CXX)],
-- [define([AC_PROG_CXX],
-- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-- [_AM_DEPENDENCIES(OBJC)],
-- [define([AC_PROG_OBJC],
-- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
--])
+-# AM_OUTPUT_DEPENDENCY_COMMANDS
+-# -----------------------------
+-# This macro should only be invoked once -- use via AC_REQUIRE.
+-#
+-# This code is only required when automatic dependency tracking
+-# is enabled. FIXME. This creates each `.P' file that we will
+-# need in order to bootstrap the dependency handling code.
+-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[AC_CONFIG_COMMANDS([depfiles],
+- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
@@ -898,6 +792,14 @@
+ [Define the location where the catalogs will be installed])
])
+-# Copyright (C) 1996, 1997, 2000, 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.
+-
+-# serial 8
+dnl
+dnl Now the definitions that aclocal will find
+dnl
@@ -906,9 +808,8 @@
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated. The stamp files are numbered to have different names.
+-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+# 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
@@ -925,24 +826,10 @@
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
--# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
--# loop where config.status creates the headers, so we can generate
--# our stamp files there.
--AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
--[# Compute $1's index in $config_headers.
--_am_arg=$1
--_am_stamp_count=1
--for _am_header in $config_headers :; do
-- case $_am_header in
-- $_am_arg | $_am_arg:* )
-- break ;;
-- * )
-- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-- esac
--done
--echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+-# Do all the work for Automake. -*- Autoconf -*-
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2008 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
@@ -950,50 +837,77 @@
+# gnome-common.m4
+#
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
--AC_SUBST(install_sh)])
+-# serial 13
+dnl GNOME_COMMON_INIT
--# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+-# This macro actually does too much. Some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
+AC_DEFUN([GNOME_COMMON_INIT],
+[
+ dnl this macro should come after AC_CONFIG_MACRO_DIR
+ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
--# serial 2
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out. PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition. After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.60])dnl
+-dnl Autoconf wants to disallow AM_ names. We explicitly allow
+-dnl the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])dnl
+-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+- # is not polluted with repeated "-I."
+- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+- # test to see if srcdir already configured
+- if test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ 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
+ fi
+-fi
--# Check whether the underlying file-system supports filenames
--# with a leading dot. For instance MS-DOS doesn't.
--AC_DEFUN([AM_SET_LEADING_DOT],
--[rm -rf .tst 2>/dev/null
--mkdir .tst 2>/dev/null
--if test -d .tst; then
-- am__leading_dot=.
--else
-- am__leading_dot=_
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
+- else
+- CYGPATH_W=echo
+- fi
-fi
--rmdir .tst 2>/dev/null
--AC_SUBST([am__leading_dot])])
+-AC_SUBST([CYGPATH_W])
+-
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ AC_SUBST([ACLOCAL_AMFLAGS])
+])
--# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
--# From Jim Meyering
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+AC_DEFUN([GNOME_DEBUG_CHECK],
+[
+ AC_ARG_ENABLE([debug],
@@ -1001,19 +915,45 @@
+ [turn on debugging]),,
+ [enable_debug=no])
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 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.
-+ if test x$enable_debug = xyes ; then
-+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-+ [Enable additional debugging at the expense of performance and size])
-+ fi
-+])
+-# Some tools Automake needs.
+-AC_REQUIRE([AM_SANITY_CHECK])dnl
+-AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
+-AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AM_PROG_INSTALL_SH
+-AM_PROG_INSTALL_STRIP
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+-# We need awk for the "check" target. The system "awk" is bad on
+-# some platforms.
+-AC_REQUIRE([AC_PROG_AWK])dnl
+-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+- [_AM_PROG_TAR([v7])])])
+-_AM_IF_OPTION([no-dependencies],,
+-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+- [_AM_DEPENDENCIES(CC)],
+- [define([AC_PROG_CC],
+- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [_AM_DEPENDENCIES(CXX)],
+- [define([AC_PROG_CXX],
+- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+- [_AM_DEPENDENCIES(OBJC)],
+- [define([AC_PROG_OBJC],
+- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+-])
++ if test x$enable_debug = xyes ; then
++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
++ [Enable additional debugging at the expense of performance and size])
++ fi
+ ])
--# serial 4
+dnl GNOME_MAINTAINER_MODE_DEFINES ()
+dnl define DISABLE_DEPRECATED
+dnl
@@ -1021,20 +961,26 @@
+[
+ AC_REQUIRE([AM_MAINTAINER_MODE])
--AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-- dnl maintainer-mode is disabled by default
-- AC_ARG_ENABLE(maintainer-mode,
--[ --enable-maintainer-mode enable make rules and dependencies not useful
-- (and sometimes confusing) to the casual installer],
-- USE_MAINTAINER_MODE=$enableval,
-- USE_MAINTAINER_MODE=no)
-- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-- MAINT=$MAINTAINER_MODE_TRUE
-- AC_SUBST(MAINT)dnl
--]
--)
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
+-
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+-[# Compute $1's index in $config_headers.
+-_am_arg=$1
+-_am_stamp_count=1
+-for _am_header in $config_headers :; do
+- case $_am_header in
+- $_am_arg | $_am_arg:* )
+- break ;;
+- * )
+- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+- esac
+-done
+-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+ 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
@@ -1043,7 +989,11 @@
+ AC_SUBST(DISABLE_DEPRECATED)
+])
--AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+-# 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.
+dnl GNOME_COMPILE_WARNINGS
+dnl Turn on many useful compiler warnings
+dnl For now, only works on GCC
@@ -1052,13 +1002,19 @@
+ dnl More compiler warnings
+ dnl ******************************
--# Check to see how 'make' treats includes. -*- Autoconf -*-
+-# AM_PROG_INSTALL_SH
+-# ------------------
+-# Define $install_sh.
+-AC_DEFUN([AM_PROG_INSTALL_SH],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-AC_SUBST(install_sh)])
+ 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])"])
--# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
@@ -1068,51 +1024,22 @@
+ enable_compile_warnings=no
+ fi
--# serial 3
+-# serial 2
+ warning_flags=
+ realsave_CFLAGS="$CFLAGS"
--# AM_MAKE_INCLUDE()
--# -----------------
--# Check to see how make treats includes.
--AC_DEFUN([AM_MAKE_INCLUDE],
--[am_make=${MAKE-make}
--cat > confinc << 'END'
--am__doit:
-- @echo done
--.PHONY: am__doit
--END
--# If we don't find an include directive, just comment out the code.
--AC_MSG_CHECKING([for style of include used by $am_make])
--am__include="#"
--am__quote=
--_am_result=none
--# First try GNU make style include.
--echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-- am__include=include
-- am__quote=
-- _am_result=GNU
--fi
--# Now try BSD make style include.
--if test "$am__include" = "#"; then
-- echo '.include "confinc"' > confmf
-- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-- am__include=.include
-- am__quote="\""
-- _am_result=BSD
-- fi
+-# Check whether the underlying file-system supports filenames
+-# with a leading dot. For instance MS-DOS doesn't.
+-AC_DEFUN([AM_SET_LEADING_DOT],
+-[rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+- am__leading_dot=.
+-else
+- am__leading_dot=_
-fi
--AC_SUBST([am__include])
--AC_SUBST([am__quote])
--AC_MSG_RESULT([$_am_result])
--rm -f confinc confmf
--])
+-rmdir .tst 2>/dev/null
+-AC_SUBST([am__leading_dot])])
+ case "$enable_compile_warnings" in
+ no)
+ warning_flags=
@@ -1154,18 +1081,19 @@
+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+ AC_MSG_RESULT($warning_flags)
--# Copyright (C) 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.
+-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+-# From Jim Meyering
+ AC_ARG_ENABLE(iso-c,
+ AC_HELP_STRING([--enable-iso-c],
+ [Try to warn if code is not ISO C ]),,
+ [enable_iso_c=no])
--# serial 5
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 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.
+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+ complCFLAGS=
+ if test "x$enable_iso_c" != "xno"; then
@@ -1182,49 +1110,35 @@
+ fi
+ AC_MSG_RESULT($complCFLAGS)
--# AM_PROG_CC_C_O
--# --------------
--# Like AC_PROG_CC_C_O, but changed for automake.
--AC_DEFUN([AM_PROG_CC_C_O],
--[AC_REQUIRE([AC_PROG_CC_C_O])dnl
--AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--AC_REQUIRE_AUX_FILE([compile])dnl
--# FIXME: we rely on the cache variable name because
--# there is no other way.
--set dummy $CC
--ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
--if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-- # Losing compiler, so override with the script.
-- # FIXME: It is wrong to rewrite CC.
-- # But if we don't then we get into trouble of one sort or another.
-- # 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
--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])])
+-# serial 4
+ WARN_CFLAGS="$warning_flags $complCFLAGS"
+ AC_SUBST(WARN_CFLAGS)
- ])
++])
--# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+-AC_DEFUN([AM_MAINTAINER_MODE],
+-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+- dnl maintainer-mode is disabled by default
+- AC_ARG_ENABLE(maintainer-mode,
+-[ --enable-maintainer-mode enable make rules and dependencies not useful
+- (and sometimes confusing) to the casual installer],
+- USE_MAINTAINER_MODE=$enableval,
+- USE_MAINTAINER_MODE=no)
+- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+- MAINT=$MAINTAINER_MODE_TRUE
+- AC_SUBST(MAINT)dnl
+-]
+-)
+dnl For C++, do basically the same thing.
--# 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.
+-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+AC_DEFUN([GNOME_CXX_WARNINGS],[
+ AC_ARG_ENABLE(cxx-warnings,
+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+ [Turn on compiler warnings.]),,
+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
--# serial 5
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+ warnCXXFLAGS=
+ if test "x$GXX" != xyes; then
@@ -1237,12 +1151,11 @@
+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+ esac
--# AM_MISSING_PROG(NAME, PROGRAM)
--# ------------------------------
--AC_DEFUN([AM_MISSING_PROG],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--$1=${$1-"${am_missing_run}$2"}
--AC_SUBST($1)])
+-# 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.
+ ## -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
@@ -1252,114 +1165,109 @@
+ fi
+ AC_MSG_RESULT($warnCXXFLAGS)
+-# serial 3
+ AC_ARG_ENABLE(iso-cxx,
+ AC_HELP_STRING([--enable-iso-cxx],
+ [Try to warn if code is not ISO C++ ]),,
+ [enable_iso_cxx=no])
--# AM_MISSING_HAS_RUN
--# ------------------
--# Define MISSING if not defined so far and test if it supports --run.
--# If it does, set am_missing_run to use it, otherwise, to nothing.
--AC_DEFUN([AM_MISSING_HAS_RUN],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--AC_REQUIRE_AUX_FILE([missing])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
--# Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
-- am_missing_run="$MISSING --run "
--else
-- am_missing_run=
-- AC_MSG_WARN([`missing' script is too old or missing])
--fi
--])
-+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-+ complCXXFLAGS=
-+ if test "x$enable_iso_cxx" != "xno"; then
-+ if test "x$GXX" = "xyes"; then
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-ansi[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-+ esac
-
--# Copyright (C) 2003, 2004, 2005, 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.
-+ case " $CXXFLAGS " in
-+ *[\ \ ]-pedantic[\ \ ]*) ;;
-+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-+ esac
-+ fi
-+ fi
+-# AM_MAKE_INCLUDE()
+-# -----------------
+-# Check to see how make treats includes.
+-AC_DEFUN([AM_MAKE_INCLUDE],
+-[am_make=${MAKE-make}
+-cat > confinc << 'END'
+-am__doit:
+- @echo done
+-.PHONY: am__doit
+-END
+-# If we don't find an include directive, just comment out the code.
+-AC_MSG_CHECKING([for style of include used by $am_make])
+-am__include="#"
+-am__quote=
+-_am_result=none
+-# First try GNU make style include.
+-echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+- am__include=include
+- am__quote=
+- _am_result=GNU
+-fi
+-# Now try BSD make style include.
+-if test "$am__include" = "#"; then
+- echo '.include "confinc"' > confmf
+- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
++ 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
++
++ case " $CXXFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
++ esac
++ fi
+ fi
+-fi
+-AC_SUBST([am__include])
+-AC_SUBST([am__quote])
+-AC_MSG_RESULT([$_am_result])
+-rm -f confinc confmf
+ AC_MSG_RESULT($complCXXFLAGS)
-
--# AM_PROG_MKDIR_P
--# ---------------
--# Check for `mkdir -p'.
--AC_DEFUN([AM_PROG_MKDIR_P],
--[AC_PREREQ([2.60])dnl
--AC_REQUIRE([AC_PROG_MKDIR_P])dnl
--dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
--dnl while keeping a definition of mkdir_p for backward compatibility.
--dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
--dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
--dnl Makefile.ins that do not define MKDIR_P, so we do our own
--dnl adjustment using top_builddir (which is defined more often than
--dnl MKDIR_P).
--AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
--case $mkdir_p in
-- [[\\/$]]* | ?:[[\\/]]*) ;;
-- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
++
+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+ AC_SUBST(WARN_CXXFLAGS)
])
--# Helper functions for option handling. -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+-# Copyright (C) 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 3
--
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
--
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME. Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
--
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+# 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 5
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
--# Check to make sure that the build environment is sane. -*- Autoconf -*-
+-# AM_PROG_CC_C_O
+-# --------------
+-# Like AC_PROG_CC_C_O, but changed for automake.
+-AC_DEFUN([AM_PROG_CC_C_O],
+-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([compile])dnl
+-# FIXME: we rely on the cache variable name because
+-# there is no other way.
+-set dummy $CC
+-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+- # Losing compiler, so override with the script.
+- # FIXME: It is wrong to rewrite CC.
+- # But if we don't then we get into trouble of one sort or another.
+- # 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
+-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])])
+-])
--# Copyright (C) 1996, 1997, 2000, 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.
+-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
@@ -1369,38 +1277,16 @@
+ [m4_ifdef([AC_PROVIDE_$1],
+ [$2], [$3])])])
--# serial 4
+-# 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.
--# AM_SANITY_CHECK
+-# serial 5
+# AC_PROG_LIBTOOL
- # ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments. Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
-- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-- if test "$[*]" = "X"; then
-- # -L didn't work.
-- set X `ls -t $srcdir/configure conftest.file`
-- fi
-- rm -f conftest.file
-- if test "$[*]" != "X $srcdir/configure conftest.file" \
-- && test "$[*]" != "X conftest.file $srcdir/configure"; then
--
-- # 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
-- # happened. Such a system could not be considered "sane".
-- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
--alias in your environment])
-- fi
++# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
@@ -1415,16 +1301,12 @@
+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
-- test "$[2]" = conftest.file
-- )
--then
-- # Ok.
-- :
--else
-- AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--AC_MSG_RESULT(yes)])
+-# AM_MISSING_PROG(NAME, PROGRAM)
+-# ------------------------------
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+-$1=${$1-"${am_missing_run}$2"}
+-AC_SUBST($1)])
+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.
@@ -1443,33 +1325,23 @@
+ 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.
--# AM_PROG_INSTALL_STRIP
--# ---------------------
--# One issue with vendor `install' (even GNU) is that you can't
--# specify the program used to strip binaries. This is especially
--# annoying in cross-compiling environments, where the build's strip
--# is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
--# STRIPPROG with the value of the STRIP variable (set by the user).
--AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'. However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
--if test "$cross_compiling" != no; then
-- AC_CHECK_TOOL([STRIP], [strip], :)
+-# AM_MISSING_HAS_RUN
+-# ------------------
+-# Define MISSING if not defined so far and test if it supports --run.
+-# If it does, set am_missing_run to use it, otherwise, to nothing.
+-AC_DEFUN([AM_MISSING_HAS_RUN],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([missing])dnl
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+-# Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+- am_missing_run="$MISSING --run "
+-else
+- am_missing_run=
+- AC_MSG_WARN([`missing' script is too old or missing])
-fi
--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
--AC_SUBST([INSTALL_STRIP_PROGRAM])])
+-])
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
@@ -1478,7 +1350,7 @@
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
--# Copyright (C) 2006 Free Software Foundation, Inc.
+-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
@@ -1486,27 +1358,41 @@
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
--# _AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
--# This macro is traced by Automake.
--AC_DEFUN([_AM_SUBST_NOTMAKE])
+-# AM_PROG_MKDIR_P
+-# ---------------
+-# Check for `mkdir -p'.
+-AC_DEFUN([AM_PROG_MKDIR_P],
+-[AC_PREREQ([2.60])dnl
+-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+-dnl while keeping a definition of mkdir_p for backward compatibility.
+-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+-dnl Makefile.ins that do not define MKDIR_P, so we do our own
+-dnl adjustment using top_builddir (which is defined more often than
+-dnl MKDIR_P).
+-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+-case $mkdir_p in
+- [[\\/$]]* | ?:[[\\/]]*) ;;
+- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
+-])
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
--# Check how to create a tarball. -*- Autoconf -*-
+-# Helper functions for option handling. -*- Autoconf -*-
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
--# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+-# 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.
--# serial 2
+-# serial 3
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
@@ -1521,6 +1407,201 @@
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++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
+
+-# _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)])
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++_LT_AC_PROG_ECHO_BACKSLASH
+
+-# _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)])])
++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
+
+-# _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])])
++# 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']
+
+-# Check to make sure that the build environment is sane. -*- Autoconf -*-
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+-# Copyright (C) 1996, 1997, 2000, 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'
+
+-# serial 4
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
+
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments. Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+- if test "$[*]" = "X"; then
+- # -L didn't work.
+- set X `ls -t $srcdir/configure conftest.file`
+- fi
+- rm -f conftest.file
+- if test "$[*]" != "X $srcdir/configure conftest.file" \
+- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+-
+- # 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
+- # happened. Such a system could not be considered "sane".
+- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+-alias in your environment])
+- fi
+-
+- test "$[2]" = conftest.file
+- )
+-then
+- # Ok.
+- :
+-else
+- AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-AC_MSG_RESULT(yes)])
+-
+-# 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.
++# Constants:
++rm="rm -f"
+
+-# AM_PROG_INSTALL_STRIP
+-# ---------------------
+-# One issue with vendor `install' (even GNU) is that you can't
+-# specify the program used to strip binaries. This is especially
+-# annoying in cross-compiling environments, where the build's strip
+-# is unlikely to handle the host's binaries.
+-# Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
+-# STRIPPROG with the value of the STRIP variable (set by the user).
+-AC_DEFUN([AM_PROG_INSTALL_STRIP],
+-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-if test "$cross_compiling" != no; then
+- AC_CHECK_TOOL([STRIP], [strip], :)
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-AC_SUBST([INSTALL_STRIP_PROGRAM])])
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
+
+-# 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.
++# 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"
+
+-# _AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+-# This macro is traced by Automake.
+-AC_DEFUN([_AM_SUBST_NOTMAKE])
++AC_CHECK_TOOL(AR, ar, false)
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
+
+-# Check how to create a tarball. -*- Autoconf -*-
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+
+-# 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.
++# 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
+
+-# serial 2
++# 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=
+
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
@@ -1576,28 +1657,26 @@
- 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'
-- ;;
++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
-- ;;
-- 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
++ *)
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+_LT_AC_PROG_ECHO_BACKSLASH
++_LT_CC_BASENAME([$compiler])
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
@@ -1608,14 +1687,11 @@
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+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
++# 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
-done
-rm -rf conftest.dir
@@ -1627,10 +1703,7 @@
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-+# 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_REQUIRED_DARWIN_CHECKS
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
@@ -1638,8 +1711,9 @@
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl you should install foo.schemas files
-dnl
-+# Same as above, but do not quote variable references.
-+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++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)
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
@@ -1648,43 +1722,46 @@
- else
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
- fi
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++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
- AC_ARG_WITH([gconf-source],
- AC_HELP_STRING([--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
+
- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
++# Use C for the default configuration in the libtool script
++tagname=
++AC_LIBTOOL_LANG_C_CONFIG
++_LT_AC_TAGCONFIG
++])# AC_LIBTOOL_SETUP
- 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],
- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
- [Directory for installing schema files.]),
- [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
++# _LT_AC_SYS_COMPILER
++# -------------------
++AC_DEFUN([_LT_AC_SYS_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+# 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],
- [case ${enableval} in
@@ -1693,9 +1770,8 @@
- esac])
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
-+AC_CHECK_TOOL(AR, ar, false)
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -1729,8 +1805,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"
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-dnl
-dnl We go to great lengths to make sure that aclocal won't
@@ -1743,23 +1819,9 @@
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-+# 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
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_AC_SYS_COMPILER
-# GLIB_LC_MESSAGES
-#--------------------
@@ -1774,10 +1836,6 @@
- [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
-#----------------------------
@@ -1792,12 +1850,7 @@
- /*)
- 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=.
@@ -1820,13 +1873,22 @@
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+ ;;
-+ esac
-+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
+-fi
-AC_SUBST($1)dnl
--])
++# _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-%%"`
+ ])
-# GLIB_WITH_NLS
-#-----------------
@@ -1834,30 +1896,17 @@
- dnl NLS is obligatory
- [USE_NLS=yes
- AC_SUBST(USE_NLS)
-+_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_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
- #
@@ -1884,10 +1933,6 @@
- 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
@@ -1900,12 +1945,18 @@
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
-+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
++# _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
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
@@ -1917,11 +1968,6 @@
- :,-liconv)],
- :,-liconv)
- fi
-+# 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();
@@ -1934,6 +1980,18 @@
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
++# _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
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
@@ -1945,10 +2003,14 @@
- fi
- fi
- fi
-+# _LT_AC_SYS_COMPILER
-+# -------------------
-+AC_DEFUN([_LT_AC_SYS_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
++# _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], [:])
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
@@ -2013,17 +2075,60 @@
- gt_cv_have_gettext=no
- fi
- fi
-- ])
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-
++ 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"
+ ])
+-
- if test "$gt_cv_have_gettext" = "yes" ; then
- AC_DEFINE(ENABLE_NLS, 1,
- [always defined to indicate that i18n is enabled])
-- fi
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
++ 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
+-
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is not GNU xgettext we define it as : so that the
@@ -2035,32 +2140,52 @@
- [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
++ 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
++])
- # 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-%%"`
-+])
++# _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 These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
@@ -2082,18 +2207,15 @@
- 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
++# _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
-# AM_GLIB_GNU_GETTEXT
-# -------------------
@@ -2142,32 +2264,26 @@
- 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
++# _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}
- 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
-+# _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], [:])
++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
- 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).
@@ -2178,20 +2294,7 @@
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-+ 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
+- fi
- AC_SUBST(MKINSTALLDIRS)
-
- dnl Generate list of files to be processed by xgettext which will
@@ -2225,63 +2328,28 @@
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
- localedir=`eval echo "${libdir}/locale"`
--else
++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
- localedir=`eval echo "${datadir}/locale"`
--fi
++ # Restart under the correct shell.
++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+ 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])
-+ 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
-dnl Now the definitions that aclocal will find
-dnl
@@ -2289,32 +2357,7 @@
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
-+# _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
-
+-
-# 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
@@ -2330,40 +2373,28 @@
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
-
-+# _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
-
+-
+-
-# gnome-common.m4
-#
-dnl GNOME_COMMON_INIT
-+# _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}
++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])
-+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
++# 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
@@ -2371,67 +2402,22 @@
- if test -n "$ac_macro_dir"; then
- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
- fi
-+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+"[$]@"}
++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[$]1" = X--fallback-echo; then
-+ # used as fallback echo
-+ shift
-+ cat <<EOF
-+[$]*
-+EOF
-+ exit 0
-+fi
-
--AC_DEFUN([GNOME_DEBUG_CHECK],
--[
-- AC_ARG_ENABLE([debug],
-- AC_HELP_STRING([--enable-debug],
-- [turn on debugging]),,
-- [enable_debug=no])
-+# 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 x$enable_debug = xyes ; then
-- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
-- [Enable additional debugging at the expense of performance and size])
-- 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
-
--dnl GNOME_MAINTAINER_MODE_DEFINES ()
--dnl define DISABLE_DEPRECATED
--dnl
--AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
--[
-- AC_REQUIRE([AM_MAINTAINER_MODE])
+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
@@ -2443,13 +2429,12 @@
+ #
+ # So, first we look for a working echo in the user's PATH.
-- 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=""
-- fi
-- AC_SUBST(DISABLE_DEPRECATED)
--])
+-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"
@@ -2463,26 +2448,11 @@
+ done
+ IFS="$lt_save_ifs"
--dnl GNOME_COMPILE_WARNINGS
--dnl Turn on many useful compiler warnings
--dnl For now, only works on GCC
--AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-- dnl ******************************
-- dnl More compiler warnings
-- dnl ******************************
--
-- AC_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])"])
--
-- warnCFLAGS=
-- if test "x$GCC" != xyes; then
-- enable_compile_warnings=no
-- fi
--
-- warning_flags=
-- realsave_CFLAGS="$CFLAGS"
+- 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' &&
@@ -2524,6 +2494,75 @@
+ # maybe with a smaller string...
+ prev=:
+-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
++ break
++ fi
++ prev="$cmd"
++ done
+
+- 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
+- DISABLE_DEPRECATED=""
++ # Oops. We lost completely, so just stick with echo.
++ echo=echo
+ fi
+- AC_SUBST(DISABLE_DEPRECATED)
+-])
++ fi
++ fi
++ fi
++fi
++fi
+
+-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
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++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
+
+- 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],
++[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
+
- case "$enable_compile_warnings" in
- no)
- warning_flags=
@@ -2551,13 +2590,7 @@
- fi
- unset has_option
- unset SAVE_CFLAGS
-+ 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
-+ break
-+ fi
-+ prev="$cmd"
- done
+- done
- unset option
- if test "$enable_compile_warnings" = "error" ; then
- warning_flags="$warning_flags -Werror"
@@ -2566,7 +2599,21 @@
- *)
- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
- ;;
-- esac
++# 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"
++ ;;
+ esac
- CFLAGS="$realsave_CFLAGS"
- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
- AC_MSG_RESULT($warning_flags)
@@ -2575,7 +2622,7 @@
- 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
@@ -2588,14 +2635,7 @@
- *[\ \ ]-pedantic[\ \ ]*) ;;
- *) complCFLAGS="$complCFLAGS -pedantic" ;;
- esac
-+ 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
-+ # Oops. We lost completely, so just stick with echo.
-+ echo=echo
- fi
+- fi
- fi
- AC_MSG_RESULT($complCFLAGS)
-
@@ -2615,7 +2655,7 @@
- warnCXXFLAGS=
- if test "x$GXX" != xyes; then
- enable_cxx_warnings=no
-- fi
+ fi
- if test "x$enable_cxx_warnings" != "xno"; then
- if test "x$GXX" = "xyes"; then
- case " $CXXFLAGS " in
@@ -2627,74 +2667,8 @@
- ## with individual -Wno-xxx flags, unlike -Wall
- if test "x$enable_cxx_warnings" = "xyes"; then
- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
- fi
- fi
- fi
-- AC_MSG_RESULT($warnCXXFLAGS)
--
-- AC_ARG_ENABLE(iso-cxx,
-- AC_HELP_STRING([--enable-iso-cxx],
-- [Try to warn if code is not ISO C++ ]),,
-- [enable_iso_cxx=no])
--
-- 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
-+fi
-+fi
-
-- case " $CXXFLAGS " in
-- *[\ \ ]-pedantic[\ \ ]*) ;;
-- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-- esac
-- fi
-- fi
-- AC_MSG_RESULT($complCXXFLAGS)
-+# 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
-+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-+fi
-
-- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-- AC_SUBST(WARN_CXXFLAGS)
--])
-+AC_SUBST(ECHO)
-+])])# _LT_AC_PROG_ECHO_BACKSLASH
-
--# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
--# serial 52 AC_PROG_LIBTOOL
-+# _LT_AC_LOCK
-+# -----------
-+AC_DEFUN([_LT_AC_LOCK],
-+[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
-
-+# 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"
-+ ;;
-+ esac
-+ fi
+- fi
+- fi
+ rm -rf conftest*
+ ;;
+*-*-irix6*)
@@ -2726,18 +2700,23 @@
+ ;;
+ esac
+ fi
-+ fi
+ fi
+- AC_MSG_RESULT($warnCXXFLAGS)
+-
+- AC_ARG_ENABLE(iso-cxx,
+- AC_HELP_STRING([--enable-iso-cxx],
+- [Try to warn if code is not ISO C++ ]),,
+- [enable_iso_cxx=no])
+ rm -rf conftest*
+ ;;
--# 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_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.
@@ -2761,7 +2740,11 @@
+ sparc64-*linux*)
+ LD="${LD-ld} -m elf32_sparc"
+ ;;
-+ esac
+ esac
+-
+- case " $CXXFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+ ;;
+ *64-bit*)
+ case $host in
@@ -2780,13 +2763,21 @@
+ sparc*-*linux*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
-+ esac
+ esac
+- fi
+- fi
+- AC_MSG_RESULT($complCXXFLAGS)
+-
+- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+- AC_SUBST(WARN_CXXFLAGS)
+-])
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
@@ -2820,6 +2811,29 @@
+ rm -rf conftest*
+ ;;
+-# serial 52 AC_PROG_LIBTOOL
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++ AC_CHECK_TOOL(AS, as, false)
++ AC_CHECK_TOOL(OBJDUMP, objdump, false)
++ ;;
++ ])
++esac
+
++need_locks="$enable_libtool_lock"
+
+-# 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])])])
++])# _LT_AC_LOCK
+
+
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
@@ -2835,15 +2849,7 @@
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+ AC_CHECK_TOOL(AS, as, false)
-+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+ ;;
-+ ])
-+esac
-
+-
-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.
@@ -2861,10 +2867,8 @@
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-+need_locks="$enable_libtool_lock"
-
-+])# _LT_AC_LOCK
-
+-
+-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
@@ -2872,9 +2876,32 @@
-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"
+-
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+-
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
+-
+-
+-# 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_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
@@ -2912,9 +2939,15 @@
+ $rm conftest*
+])
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)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
+if test x"[$]$2" = xyes; then
+ ifelse([$5], , :, [$5])
+else
@@ -2922,10 +2955,20 @@
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
--# Prevent multiple expansion
--define([AC_PROG_LIBTOOL], [])
--])# _AC_PROG_LIBTOOL
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-_LT_AC_PROG_ECHO_BACKSLASH
+-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
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
@@ -2956,19 +2999,10 @@
+ LDFLAGS="$save_LDFLAGS"
+])
--# 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
+-# 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']
+if test x"[$]$2" = xyes; then
+ ifelse([$4], , :, [$4])
+else
@@ -2976,18 +3010,12 @@
+fi
+])# AC_LIBTOOL_LINKER_OPTION
--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
+-# Same as above, but do not quote variable references.
+-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
--AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--_LT_AC_PROG_ECHO_BACKSLASH
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
@@ -2997,39 +3025,8 @@
+ i=0
+ teststring="ABCD"
--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']
--
--# 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"
--
--# Global variables:
--default_ofile=libtool
--can_build_shared=yes
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -3039,12 +3036,8 @@
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
--# 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"
+-# Constants:
+-rm="rm -f"
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
@@ -3052,9 +3045,9 @@
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
--AC_CHECK_TOOL(AR, ar, false)
--AC_CHECK_TOOL(RANLIB, ranlib, :)
--AC_CHECK_TOOL(STRIP, strip, :)
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
+ cygwin* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
@@ -3066,14 +3059,42 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
+-# 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"
+ 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;
+ ;;
+-AC_CHECK_TOOL(AR, ar, false)
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
++ 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`
++ ;;
+
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
++ interix*)
++ # We know the value 262144 and hardcode it with a safety zone (like BSD)
++ lt_cv_sys_max_cmd_len=196608
++ ;;
+
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
@@ -3091,29 +3112,12 @@
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-+ 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`
-+ ;;
-
+-
-# 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=
-+ interix*)
-+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+ lt_cv_sys_max_cmd_len=196608
-+ ;;
-
+-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
@@ -3274,35 +3278,14 @@
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
--
--# 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-%%"`
--])
+void fnord() { int i=42;}
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -3312,18 +3295,9 @@
+ else
+ puts (dlerror ());
--# _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
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-])# _LT_AC_SYS_COMPILER
+ exit (status);
+}]
+EOF
@@ -3344,19 +3318,22 @@
+])# _LT_AC_TRY_DLOPEN_SELF
--# _LT_LINKER_BOILERPLATE
+-# _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_LIBTOOL_DLOPEN_SELF
- # ----------------------
--# 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
++# ----------------------
+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
@@ -3367,20 +3344,57 @@
+ lt_cv_dlopen=no
+ lt_cv_dlopen_libs=
++ case $host_os in
++ beos*)
++ lt_cv_dlopen="load_add_on"
++ lt_cv_dlopen_libs=
++ lt_cv_dlopen_self=yes
++ ;;
+
+-# _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
++ mingw* | pw32*)
++ lt_cv_dlopen="LoadLibrary"
++ lt_cv_dlopen_libs=
++ ;;
+
++ cygwin*)
++ lt_cv_dlopen="dlopen"
++ lt_cv_dlopen_libs=
++ ;;
+
+-# _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
+- case $host_os in
- rhapsody* | darwin*)
- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
- AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+ beos*)
-+ lt_cv_dlopen="load_add_on"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ;;
-
+-
- 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
@@ -3407,16 +3421,6 @@
- [lt_cv_ld_exported_symbols_list=yes],
- [lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
-+ mingw* | pw32*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
-+ ;;
-+
+ darwin*)
+ # if libdl is installed we need to link against it
+ AC_CHECK_LIB([dl], [dlopen],
@@ -3629,7 +3633,7 @@
- # 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"
@@ -3642,20 +3646,6 @@
- fi
- done
- IFS="$lt_save_ifs"
-+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-+# ---------------------------------
-+# Check to see if options -c and -o are simultaneously supported by compiler
-+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-+ $rm -r conftest 2>/dev/null
-+ mkdir conftest
-+ cd conftest
-+ mkdir out
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- if test "X$echo" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
@@ -3697,42 +3687,7 @@
- else
- # maybe with a smaller string...
- prev=:
-+ lt_compiler_flag="-o out/conftest2.$ac_objext"
-+ # Insert the option either (1) after the last *FLAGS variable, or
-+ # (2) before a word containing "conftest.", or (3) at the end.
-+ # Note that $ac_compile itself does not contain backslashes and begins
-+ # with a dollar sign (not a hyphen), so the echo should work correctly.
-+ lt_compile=`echo "$ac_compile" | $SED \
-+ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&AS_MESSAGE_LOG_FD
-+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings
-+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+ fi
-+ fi
-+ chmod u+w . 2>&AS_MESSAGE_LOG_FD
-+ $rm conftest*
-+ # SGI C++ compiler will create directory out/ii_files/ for
-+ # template instantiation
-+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+ $rm out/* && rmdir out
-+ cd ..
-+ rmdir conftest
-+ $rm conftest*
-+])
-+])# AC_LIBTOOL_PROG_CC_C_O
-
+-
- 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
@@ -3740,7 +3695,7 @@
- fi
- prev="$cmd"
- done
-
+-
- if test "$prev" != 'sed 50q "[$]0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
@@ -3751,59 +3706,21 @@
- fi
- fi
- fi
-+# 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
-+
-+hard_links="nottested"
-+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+ # do not overwrite the value of need_locks provided by the user
-+ AC_MSG_CHECKING([if we can lock with hard links])
-+ hard_links=yes
-+ $rm conftest*
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ touch conftest.a
-+ ln conftest.a conftest.b 2>&5 || hard_links=no
-+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+ AC_MSG_RESULT([$hard_links])
-+ 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
-+else
-+ need_locks=no
- fi
+- fi
-fi
-+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
+-fi
+-
-# 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
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
+-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-+# AC_LIBTOOL_OBJDIR
-+# -----------------
-+AC_DEFUN([AC_LIBTOOL_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+ lt_cv_objdir=.libs
-+else
-+ # MS-DOS does not allow filenames that begin with a dot.
-+ lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+])# AC_LIBTOOL_OBJDIR
-
-
+-
+-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
@@ -3811,16 +3728,7 @@
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-+# ----------------------------------------------
-+# Check hardcoding attributes.
-+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_AC_TAGVAR(hardcode_action, $1)=
-+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
-
+-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
@@ -3951,19 +3859,7 @@
- esac
- ;;
- esac
-+ # We can hardcode non-existant directories.
-+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+ # have to relink, otherwise we might link with an installed library
-+ # when we should be linking with a yet-to-be-installed one
-+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-+ # Linking always hardcodes the temporary library directory.
-+ _LT_AC_TAGVAR(hardcode_action, $1)=relink
-+ else
-+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate
- fi
+- fi
- rm -rf conftest*
- ;;
-
@@ -3979,23 +3875,8 @@
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-+else
-+ # We cannot hardcode anything, or else we can only hardcode existing
-+ # directories.
-+ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-+ # Fast installation is not supported
-+ enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+ test "$enable_shared" = no; then
-+ # Fast installation is not necessary
-+ enable_fast_install=needless
-+fi
-+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
+-
+-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
@@ -4005,78 +3886,105 @@
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
++# ---------------------------------
++# Check to see if options -c and -o are simultaneously supported by compiler
++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
++ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
++ $rm -r conftest 2>/dev/null
++ mkdir conftest
++ cd conftest
++ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
-- # Insert the option either (1) after the last *FLAGS variable, or
-- # (2) before a word containing "conftest.", or (3) at the end.
-- # Note that $ac_compile itself does not contain backslashes and begins
-- # with a dollar sign (not a hyphen), so the echo should work correctly.
++
++ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
-- lt_compile=`echo "$ac_compile" | $SED \
-- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+ lt_compile=`echo "$ac_compile" | $SED \
+ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
-- ac_status=$?
++ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
-- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++ cat out/conftest.err >&AS_MESSAGE_LOG_FD
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
-- # The compiler can only warn and ignore the option if not recognized
++ if (exit $ac_status) && test -s out/conftest2.$ac_objext
++ 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.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
-- fi
-- fi
-- $rm conftest*
--])
++ # So say no if there are warnings
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ fi
+ fi
++ chmod u+w . 2>&AS_MESSAGE_LOG_FD
++ $rm conftest*
++ # SGI C++ compiler will create directory out/ii_files/ for
++ # template instantiation
++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++ $rm out/* && rmdir out
++ cd ..
++ rmdir conftest
+ $rm conftest*
+ ])
++])# AC_LIBTOOL_PROG_CC_C_O
-if test x"[$]$2" = xyes; then
- ifelse([$5], , :, [$5])
-+# AC_LIBTOOL_SYS_LIB_STRIP
-+# ------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-+[striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+ AC_MSG_RESULT([yes])
++
++# 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
++
++hard_links="nottested"
++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++ # do not overwrite the value of need_locks provided by the user
++ AC_MSG_CHECKING([if we can lock with hard links])
++ hard_links=yes
++ $rm conftest*
++ ln conftest.a conftest.b 2>/dev/null && hard_links=no
++ touch conftest.a
++ ln conftest.a conftest.b 2>&5 || hard_links=no
++ ln conftest.a conftest.b 2>/dev/null && hard_links=no
++ AC_MSG_RESULT([$hard_links])
++ 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
else
- ifelse([$6], , :, [$6])
-+# FIXME - insert some real tests, host_os isn't really good enough
-+ case $host_os in
-+ darwin*)
-+ if test -n "$STRIP" ; then
-+ striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
++ need_locks=no
fi
-])# AC_LIBTOOL_COMPILER_OPTION
-+ ;;
-+ *)
-+ AC_MSG_RESULT([no])
-+ ;;
-+ esac
-+fi
-+])# AC_LIBTOOL_SYS_LIB_STRIP
-
+-
++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
- [AC_REQUIRE([LT_AC_PROG_SED])dnl
+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
@@ -4100,78 +4008,28 @@
- $rm -r conftest*
- LDFLAGS="$save_LDFLAGS"
-])
--
+
-if test x"[$]$2" = xyes; then
- ifelse([$4], , :, [$4])
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+m4_if($1,[],[
-+if test "$GCC" = yes; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
-+ # if the path contains ";" then we assume it to be the separator
-+ # otherwise default to the standard path separator (i.e. ":") - it is
-+ # assumed that no part of a normal pathname contains ";" but that should
-+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-+ else
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ fi
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-+}'`
-+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
++# AC_LIBTOOL_OBJDIR
++# -----------------
++AC_DEFUN([AC_LIBTOOL_OBJDIR],
++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
++[rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++ lt_cv_objdir=.libs
else
- ifelse([$5], , :, [$5])
--fi
++ # MS-DOS does not allow filenames that begin with a dot.
++ lt_cv_objdir=_libs
+ fi
-])# AC_LIBTOOL_LINKER_OPTION
--
--
++rmdir .libs 2>/dev/null])
++objdir=$lt_cv_objdir
++])# AC_LIBTOOL_OBJDIR
+
+
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
@@ -4180,7 +4038,16 @@
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
- i=0
- teststring="ABCD"
--
++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
++# ----------------------------------------------
++# Check hardcoding attributes.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
++[AC_MSG_CHECKING([how to hardcode library paths into programs])
++_LT_AC_TAGVAR(hardcode_action, $1)=
++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
+
- case $build_os in
- msdosdjgpp*)
- # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -4189,45 +4056,85 @@
- # check would be larger than it should be.
- lt_cv_sys_max_cmd_len=12288; # 12K is about right
- ;;
-+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi])
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-
-- 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;
-- ;;
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-
-- 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).
++ # We can hardcode non-existant directories.
++ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
++ # If the only mechanism to avoid hardcoding is shlibpath_var, we
++ # have to relink, otherwise we might link with an installed library
++ # when we should be linking with a yet-to-be-installed one
++ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++ test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
++ # Linking always hardcodes the temporary library directory.
++ _LT_AC_TAGVAR(hardcode_action, $1)=relink
++ else
++ # We can link without hardcoding, and we can hardcode nonexisting dirs.
++ _LT_AC_TAGVAR(hardcode_action, $1)=immediate
++ fi
++else
++ # We cannot hardcode anything, or else we can only hardcode existing
++ # directories.
++ _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
++fi
++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+
+- 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;
+- ;;
++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
++ # Fast installation is not supported
++ enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++ test "$enable_shared" = no; then
++ # Fast installation is not necessary
++ enable_fast_install=needless
++fi
++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+
+- 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;
- ;;
-+case $host_os in
-+aix3*)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+ shlibpath_var=LIBPATH
- 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;
-- ;;
-+ # AIX 3 has no versioning support, so we append a major version to the name.
-+ soname_spec='${libname}${release}${shared_ext}$major'
-+ ;;
++# AC_LIBTOOL_SYS_LIB_STRIP
++# ------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
++[striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++ AC_MSG_RESULT([yes])
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++ case $host_os in
++ darwin*)
++ if test -n "$STRIP" ; then
++ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++fi
++ ;;
++ *)
++ AC_MSG_RESULT([no])
+ ;;
++ esac
++fi
++])# AC_LIBTOOL_SYS_LIB_STRIP
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
@@ -4235,46 +4142,53 @@
- 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`
-+aix[[4-9]]*)
-+ 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
++
++# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++# -----------------------------
++# PORTME Fill in your ld.so characteristics
++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++m4_if($1,[],[
++if test "$GCC" = yes; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+ 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}'
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
else
- lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
-+ # 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'
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
- # And add a safety zone
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
@@ -4285,10 +4199,7 @@
- # We know the value 262144 and hardcode it with a safety zone (like BSD)
- lt_cv_sys_max_cmd_len=196608
- ;;
-+ shlibpath_var=LIBPATH
-+ fi
-+ ;;
-
+-
- 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
@@ -4344,38 +4255,15 @@
- AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-+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
-+ ;;
-
+-
+-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-+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_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
@@ -4383,66 +4271,41 @@
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
- [$4]
--else
++ done
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ 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"
-+cygwin* | mingw* | pw32*)
-+ version_type=windows
-+ shrext_cmds=".dll"
-+ need_version=no
-+ need_lib_prefix=no
-
+-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+ 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
-
+-
-#include <stdio.h>
-+ 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
-+ ;;
-
+-
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
-#else
@@ -4452,14 +4315,10 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+ *)
-+ 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
-+ ;;
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
++need_lib_prefix=unknown
++hardcode_into_libs=no
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -4482,40 +4341,26 @@
-# endif
-# endif
-#endif
-+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'
-+ ;;
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-+dgux*)
++case $host_os in
++aix3*)
+ 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
-+ ;;
++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++ shlibpath_var=LIBPATH
-void fnord() { int i=42;}
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- int status = $lt_dlunknown;
-+freebsd1*)
-+ dynamic_linker=no
++ # AIX 3 has no versioning support, so we append a major version to the name.
++ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
- if (self)
@@ -4524,11 +4369,15 @@
- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
- /* dlclose (self); */
- }
-+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`
++aix[[4-9]]*)
++ 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
- puts (dlerror ());
-
@@ -4542,13 +4391,40 @@
- x$lt_dlno_uscore) $1 ;;
- x$lt_dlneed_uscore) $2 ;;
- x$lt_dlunknown|x*) $3 ;;
++ # 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
-+ freebsd[[123]]*) objformat=aout ;;
-+ *) objformat=elf ;;
++ 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
- else :
- # compilation failed
- $3
++ # 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
-fi
-rm -fr conftest*
@@ -4566,61 +4442,46 @@
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
--
-+ 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
++ ;;
+
+- case $host_os in
- beos*)
- lt_cv_dlopen="load_add_on"
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
-+ 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
-+ ;;
-+ *) # from 4.6 on, and DragonFly
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
-+ ;;
-+ esac
+- ;;
++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'
+ ;;
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
--
++beos*)
++ library_names_spec='${libname}${shared_ext}'
++ dynamic_linker="$host_os ld.so"
++ shlibpath_var=LIBRARY_PATH
++ ;;
+
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
-+gnu*)
++bsdi[[45]]*)
+ 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}'
++ 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
-+ hardcode_into_libs=yes
++ 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
+ ;;
- darwin*)
@@ -4632,116 +4493,80 @@
- lt_cv_dlopen_self=yes
- ])
- ;;
-+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
++cygwin* | mingw* | pw32*)
++ version_type=windows
++ shrext_cmds=".dll"
+ need_version=no
-+ 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
-+ ;;
-+ hppa*64*)
-+ shrext_cmds='.sl'
-+ hardcode_into_libs=yes
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_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'
-+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+ ;;
-+ *)
-+ shrext_cmds='.sl'
-+ dynamic_linker="$host_os dld.sl"
-+ shlibpath_var=SHLIB_PATH
-+ 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'
-+ ;;
-+ esac
-+ # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+ postinstall_cmds='chmod 555 $lib'
-+ ;;
-
-+interix[[3-9]]*)
-+ 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'
-+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=no
-+ hardcode_into_libs=yes
-+ ;;
+
-+irix5* | irix6* | nonstopux*)
-+ case $host_os in
-+ nonstopux*) version_type=nonstopux ;;
-+ *)
-+ if test "$lt_cv_prog_gnu_ld" = yes; then
-+ version_type=linux
-+ else
-+ version_type=irix
-+ fi ;;
-+ esac
-+ 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}${release}${shared_ext} $libname${shared_ext}'
-+ case $host_os in
-+ irix5* | nonstopux*)
-+ libsuff= shlibsuff=
-+ ;;
- *)
-- AC_CHECK_FUNC([shl_load],
-- [lt_cv_dlopen="shl_load"],
-- [AC_CHECK_LIB([dld], [shl_load],
-- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-- [AC_CHECK_FUNC([dlopen],
-- [lt_cv_dlopen="dlopen"],
-- [AC_CHECK_LIB([dl], [dlopen],
-- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-- [AC_CHECK_LIB([svld], [dlopen],
-- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-- [AC_CHECK_LIB([dld], [dld_link],
-- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-- ])
-- ])
-- ])
-- ])
-- ])
-+ case $LD in # libtool.m4 will add one of these switches to LD
-+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+ libsuff= shlibsuff= libmagic=32-bit;;
-+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+ libsuff=32 shlibsuff=N32 libmagic=N32;;
-+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+ *) libsuff= shlibsuff= libmagic=never-match;;
++ 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_CHECK_FUNC([shl_load],
+- [lt_cv_dlopen="shl_load"],
+- [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+- [AC_CHECK_FUNC([dlopen],
+- [lt_cv_dlopen="dlopen"],
+- [AC_CHECK_LIB([dl], [dlopen],
+- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+- [AC_CHECK_LIB([svld], [dlopen],
+- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+- [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+- ])
+- ])
+- ])
+- ])
+- ])
++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
;;
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
++ dynamic_linker='Win32 ld.exe'
++ # FIXME: first we should search . and the directory the executable is in
++ shlibpath_var=PATH
+ ;;
- if test "x$lt_cv_dlopen" != xno; then
@@ -4749,47 +4574,30 @@
- else
- enable_dlopen=no
- fi
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+ dynamic_linker=no
-+ ;;
-
+-
- case $lt_cv_dlopen in
- dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# 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
-
+-
- save_LDFLAGS="$LDFLAGS"
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+ # 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
-
+-
- save_LIBS="$LIBS"
- LIBS="$lt_cv_dlopen_libs $LIBS"
-+ # 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,
-+ # most powerpc-linux boxes support dynamic linking these days and
-+ # people can always --disable-shared, the test was removed, and we
-+ # assume the GNU/Linux dynamic linker is in use.
-+ dynamic_linker='GNU/Linux ld.so'
++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'
+ ;;
- AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -4798,16 +4606,13 @@
- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- ])
-+netbsdelf*-gnu)
++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}'
++ 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='NetBSD ld.elf_so'
+ ;;
- if test "x$lt_cv_dlopen_self" = xyes; then
@@ -4819,88 +4624,132 @@
- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- ])
- fi
-+netbsd*)
-+ version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ 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
-+ 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
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ hardcode_into_libs=yes
++freebsd1*)
++ dynamic_linker=no
+ ;;
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
-- ;;
-- esac
-+newsos6)
-+ version_type=linux
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++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 ;;
++ esac
++ 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
-+ shlibpath_overrides_runpath=yes
++ 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
++ ;;
++ *) # from 4.6 on, and DragonFly
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
+ ;;
+ esac
+ ;;
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-+nto-qnx*)
++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}'
++ 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=yes
++ hardcode_into_libs=yes
+ ;;
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
- *) enable_dlopen_self_static=unknown ;;
-+openbsd*)
++hpux9* | hpux10* | hpux11*)
++ # Give a soname corresponding to the major version so that dld.sl refuses to
++ # link against other versions.
+ version_type=sunos
-+ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
-+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+ case $host_os in
-+ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+ *) need_version=no ;;
++ need_version=no
++ 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
++ ;;
++ hppa*64*)
++ shrext_cmds='.sl'
++ hardcode_into_libs=yes
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_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'
++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++ ;;
++ *)
++ shrext_cmds='.sl'
++ dynamic_linker="$host_os dld.sl"
++ shlibpath_var=SHLIB_PATH
++ 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'
++ ;;
esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-+ 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
-+ case $host_os in
-+ openbsd2.[[89]] | openbsd2.[[89]].*)
-+ shlibpath_overrides_runpath=no
-+ ;;
-+ *)
-+ shlibpath_overrides_runpath=yes
-+ ;;
-+ esac
-+ else
-+ shlibpath_overrides_runpath=yes
-+ fi
++ # HP-UX runs *really* slowly unless shared libraries are mode 555.
++ postinstall_cmds='chmod 555 $lib'
+ ;;
-+os2*)
-+ libname_spec='$name'
-+ shrext_cmds=".dll"
++interix[[3-9]]*)
++ version_type=linux
+ need_lib_prefix=no
-+ library_names_spec='$libname${shared_ext} $libname.a'
-+ dynamic_linker='OS/2 ld.exe'
-+ shlibpath_var=LIBPATH
++ 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'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
+ ;;
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
@@ -4917,17 +4766,7 @@
- cd conftest
- mkdir out
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+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"
-+ ;;
-
+-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
@@ -4963,33 +4802,46 @@
- $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-+rdos*)
-+ dynamic_linker=no
-+ ;;
-+
-+solaris*)
-+ version_type=linux
++irix5* | irix6* | nonstopux*)
++ case $host_os in
++ nonstopux*) version_type=nonstopux ;;
++ *)
++ if test "$lt_cv_prog_gnu_ld" = yes; then
++ version_type=linux
++ else
++ version_type=irix
++ fi ;;
++ esac
+ 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=yes
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++ case $host_os in
++ irix5* | nonstopux*)
++ libsuff= shlibsuff=
++ ;;
++ *)
++ case $LD in # libtool.m4 will add one of these switches to LD
++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++ libsuff= shlibsuff= libmagic=32-bit;;
++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++ libsuff=32 shlibsuff=N32 libmagic=N32;;
++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++ libsuff=64 shlibsuff=64 libmagic=64-bit;;
++ *) libsuff= shlibsuff= 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
-+ # ldd complains unless libraries are executable
-+ postinstall_cmds='chmod +x $lib'
+ ;;
-+sunos4*)
-+ version_type=sunos
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+ shlibpath_var=LD_LIBRARY_PATH
-+ shlibpath_overrides_runpath=yes
-+ if test "$with_gnu_ld" = yes; then
-+ need_lib_prefix=no
-+ fi
-+ need_version=yes
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++ dynamic_linker=no
+ ;;
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
@@ -4997,29 +4849,20 @@
-# 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
-+sysv4 | sysv4.3*)
++# 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
-+ case $host_vendor in
-+ sni)
-+ shlibpath_overrides_runpath=no
-+ need_lib_prefix=no
-+ export_dynamic_flag_spec='${wl}-Blargedynsym'
-+ runpath_var=LD_RUN_PATH
-+ ;;
-+ siemens)
-+ need_lib_prefix=no
-+ ;;
-+ motorola)
-+ need_lib_prefix=no
-+ need_version=no
-+ shlibpath_overrides_runpath=no
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+ ;;
-+ esac
-+ ;;
++ 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
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
@@ -5035,42 +4878,17 @@
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
- need_locks=warn
-+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
++ # 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
-else
- need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-+ ;;
-
-+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'
-+ ;;
-
+-
+-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
@@ -5086,19 +4904,15 @@
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-+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
++ # 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,
++ # most powerpc-linux boxes support dynamic linking these days and
++ # people can always --disable-shared, the test was removed, and we
++ # assume the GNU/Linux dynamic linker is in use.
++ dynamic_linker='GNU/Linux ld.so'
+ ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
@@ -5109,12 +4923,17 @@
-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_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"
++netbsdelf*-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='NetBSD ld.elf_so'
++ ;;
- # We can hardcode non-existant directories.
- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -5125,20 +4944,31 @@
- test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
- # Linking always hardcodes the temporary library directory.
- _LT_AC_TAGVAR(hardcode_action, $1)=relink
-- else
++netbsd*)
++ version_type=sunos
++ need_lib_prefix=no
++ need_version=no
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ 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
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-- fi
++ 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
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-+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
+-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
- # Fast installation is not supported
@@ -5149,15 +4979,22 @@
- enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
++newsos6)
++ version_type=linux
++ 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
++ ;;
-+# _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"])
++nto-qnx*)
++ 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=yes
++ ;;
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
@@ -5210,10 +5047,17 @@
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-m4_if($1,[],[
-if test "$GCC" = yes; then
-- case $host_os in
++openbsd*)
++ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
++ need_lib_prefix=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+ case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
-- esac
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
+ esac
- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
- if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
@@ -5221,11 +5065,21 @@
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+if test -f "$ltmain" && test -n "$tagnames"; then
-+ if test ! -f "${ofile}"; then
-+ AC_MSG_WARN([output file `$ofile' does not exist])
++ 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
++ case $host_os in
++ openbsd2.[[89]] | openbsd2.[[89]].*)
++ shlibpath_overrides_runpath=no
++ ;;
++ *)
++ shlibpath_overrides_runpath=yes
++ ;;
++ esac
+ else
+- lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ shlibpath_overrides_runpath=yes
fi
- # Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
@@ -5234,16 +5088,10 @@
- for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+
-+ 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
+- else
- test -d "$lt_sys_path" && \
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
- fi
+- fi
- done
- lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
@@ -5275,29 +5123,47 @@
-# 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
-+ fi
-+ if test -z "$LTCFLAGS"; then
-+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-+ fi
++os2*)
++ libname_spec='$name'
++ shrext_cmds=".dll"
++ need_lib_prefix=no
++ library_names_spec='$libname${shared_ext} $libname.a'
++ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=LIBPATH
++ ;;
- # AIX 3 has no versioning support, so we append a major version to the name.
-- soname_spec='${libname}${release}${shared_ext}$major'
-- ;;
-+ # 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'`
++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"
+ ;;
-aix[[4-9]]*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- hardcode_into_libs=yes
++rdos*)
++ dynamic_linker=no
++ ;;
++
++solaris*)
+ 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=yes
+ 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}'
@@ -5318,15 +5184,7 @@
- can_build_shared=no
- fi
- ;;
-+ 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
+- 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.
@@ -5340,74 +5198,109 @@
- # 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'
-+
-+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-+ then
-+ AC_MSG_ERROR([tag name \"$tagname\" already exists])
- fi
+- fi
- shlibpath_var=LIBPATH
-- fi
-- ;;
++ # ldd complains unless libraries are executable
++ postinstall_cmds='chmod +x $lib'
++ ;;
++
++sunos4*)
++ version_type=sunos
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=yes
++ if test "$with_gnu_ld" = yes; then
++ need_lib_prefix=no
+ fi
++ need_version=yes
+ ;;
-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'
-- ;;
-+ # Update the list of available tags.
-+ if test -n "$tagname"; then
-+ echo appending configuration tag \"$tagname\" to $ofile
++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
++ sni)
++ shlibpath_overrides_runpath=no
++ need_lib_prefix=no
++ export_dynamic_flag_spec='${wl}-Blargedynsym'
++ runpath_var=LD_RUN_PATH
++ ;;
++ siemens)
++ need_lib_prefix=no
++ ;;
++ motorola)
++ need_lib_prefix=no
++ need_version=no
++ shlibpath_overrides_runpath=no
++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++ ;;
++ esac
+ ;;
-beos*)
- library_names_spec='${libname}${shared_ext}'
- dynamic_linker="$host_os ld.so"
- shlibpath_var=LIBRARY_PATH
-- ;;
-+ 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
-+ ;;
++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
+ ;;
-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'
++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'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
+ 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
-- ;;
-+ F77)
-+ if test -n "$F77" && test "X$F77" != "Xno"; then
-+ AC_LIBTOOL_LANG_F77_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
+ ;;
-cygwin* | mingw* | pw32*)
- version_type=windows
- shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-+ GCJ)
-+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+ AC_LIBTOOL_LANG_GCJ_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
-
+-
- case $GCC,$host_os in
- yes,cygwin* | yes,mingw* | yes,pw32*)
- library_names_spec='$libname.dll.a'
@@ -5422,9 +5315,12 @@
- dlpath=$dir/\$dldll~
- $rm \$dlpath'
- shlibpath_overrides_runpath=yes
-+ RC)
-+ AC_LIBTOOL_LANG_RC_CONFIG
-+ ;;
++*)
++ dynamic_linker=no
++ ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
- case $host_os in
- cygwin*)
@@ -5454,7 +5350,13 @@
- ;;
- esac
- ;;
--
++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"
+
- *)
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
- ;;
@@ -5463,7 +5365,12 @@
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
--
++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
+
-darwin* | rhapsody*)
- dynamic_linker="$host_os dyld"
- version_type=darwin
@@ -5478,7 +5385,7 @@
- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
--
+
-dgux*)
- version_type=linux
- need_lib_prefix=no
@@ -5487,40 +5394,45 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-+ *)
-+ 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"])
-freebsd1*)
- dynamic_linker=no
- ;;
-+ # 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"
++if test -f "$ltmain" && test -n "$tagnames"; then
++ if test ! -f "${ofile}"; then
++ AC_MSG_WARN([output file `$ofile' does not exist])
++ fi
-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`
-+ # 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
- case $host_os in
- freebsd[[123]]*) objformat=aout ;;
- *) objformat=elf ;;
- esac
-+ rm -f "${ofile}T"
-+ AC_MSG_ERROR([unable to update list of available tagged configurations.])
- fi
-- version_type=freebsd-$objformat
++ 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
+- 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}'
@@ -5552,8 +5464,6 @@
- ;;
- esac
- ;;
-+fi
-+])# _LT_AC_TAGCONFIG
-gnu*)
- version_type=linux
@@ -5564,6 +5474,9 @@
- shlibpath_var=LD_LIBRARY_PATH
- hardcode_into_libs=yes
- ;;
++ # 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'`
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
@@ -5584,7 +5497,20 @@
- 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
++ 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 grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++ then
++ AC_MSG_ERROR([tag name \"$tagname\" already exists])
+ fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
@@ -5610,12 +5536,6 @@
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
-+# AC_LIBTOOL_DLOPEN
-+# -----------------
-+# enable checks for dlopen support
-+AC_DEFUN([AC_LIBTOOL_DLOPEN],
-+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_DLOPEN
-interix[[3-9]]*)
- version_type=linux
@@ -5628,32 +5548,14 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
++ # Update the list of available tags.
++ if test -n "$tagname"; then
++ echo appending configuration tag \"$tagname\" to $ofile
-irix5* | irix6* | nonstopux*)
- case $host_os in
- nonstopux*) version_type=nonstopux ;;
-+# 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
-+# 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 ;;
- *)
+- *)
- if test "$lt_cv_prog_gnu_ld" = yes; then
- version_type=linux
- else
@@ -5686,26 +5588,12 @@
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-+ 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
-
+-
-# 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
@@ -5722,20 +5610,13 @@
- hardcode_into_libs=yes
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+# 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
-
+-
- # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra"
- fi
-
+-
- # 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,
@@ -5744,35 +5625,7 @@
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
-+# 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
-
+-
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
@@ -5790,6 +5643,16 @@
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=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
++ ;;
-newsos6)
- version_type=linux
@@ -5797,13 +5660,13 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-+# 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
++ F77)
++ if test -n "$F77" && test "X$F77" != "Xno"; then
++ AC_LIBTOOL_LANG_F77_CONFIG
++ else
++ tagname=""
++ fi
++ ;;
-nto-qnx*)
- version_type=linux
@@ -5814,6 +5677,13 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
++ GCJ)
++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++ AC_LIBTOOL_LANG_GCJ_CONFIG
++ else
++ tagname=""
++ fi
++ ;;
-openbsd*)
- version_type=sunos
@@ -5831,43 +5701,36 @@
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
-- ;;
-- *)
++ RC)
++ AC_LIBTOOL_LANG_RC_CONFIG
+ ;;
++
+ *)
- shlibpath_overrides_runpath=yes
-- ;;
-- esac
-- else
++ 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"
++
++ # 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
- shlibpath_overrides_runpath=yes
-- fi
++ rm -f "${ofile}T"
++ AC_MSG_ERROR([unable to update list of available tagged configurations.])
+ 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],
-+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-+])# AC_ENABLE_FAST_INSTALL
++fi
++])# _LT_AC_TAGCONFIG
-os2*)
- libname_spec='$name'
@@ -5888,13 +5751,12 @@
- 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"
- ;;
-+# 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
++# AC_LIBTOOL_DLOPEN
++# -----------------
++# enable checks for dlopen support
++AC_DEFUN([AC_LIBTOOL_DLOPEN],
++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_DLOPEN
-rdos*)
- dynamic_linker=no
@@ -5912,14 +5774,12 @@
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-+# 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
-sunos4*)
- version_type=sunos
@@ -5956,20 +5816,7 @@
- ;;
- 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])
-+])])
-
+-
-sysv4*MP*)
- if test -d /usr/nec ;then
- version_type=linux
@@ -5978,7 +5825,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
-
+-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
@@ -6007,81 +5854,26 @@
- 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_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.
- ;;
+- ;;
-
- *)
+-*)
- dynamic_linker=no
- ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-+ 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
-
+-
-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"
-+*** 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
-
+-
-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"
-+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
+-fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
@@ -6093,13 +5885,12 @@
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
-+])# AC_PATH_TOOL_PREFIX
-
+-
-if test -f "$ltmain" && test -n "$tagnames"; then
- if test ! -f "${ofile}"; then
- AC_MSG_WARN([output file `$ofile' does not exist])
- fi
-
+-
- if test -z "$LTCC"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
- if test -z "$LTCC"; then
@@ -6110,80 +5901,15 @@
- fi
- if test -z "$LTCFLAGS"; then
- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-+# AC_PATH_MAGIC
-+# -------------
-+# find a file program which can recognize a shared library
-+AC_DEFUN([AC_PATH_MAGIC],
-+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+ if test -n "$ac_tool_prefix"; then
-+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+ else
-+ MAGIC_CMD=:
- fi
-+fi
-+])# AC_PATH_MAGIC
-
+- fi
+-
- # 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
-+# AC_PROG_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([AC_PROG_LD],
-+[AC_ARG_WITH([gnu-ld],
-+ [AC_HELP_STRING([--with-gnu-ld],
-+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+ [test "$withval" = no || with_gnu_ld=yes],
-+ [with_gnu_ld=no])
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
-+ AC_MSG_CHECKING([for ld used by $CC])
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [[\\/]]* | ?:[[\\/]]*)
-+ re_direlt='/[[^/]][[^/]]*/\.\./'
-+ # Canonicalize the pathname of ld
-+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
-+ ac_prog=ld
-+ ;;
-+ *)
-+ # If it is relative, then search for the first ld in PATH.
-+ with_gnu_ld=unknown
-+ ;;
-+ esac
-+elif test "$with_gnu_ld" = yes; then
-+ AC_MSG_CHECKING([for GNU ld])
-+else
-+ AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+- IFS="$lt_save_ifs"
- # Check whether tagname contains only valid characters
- case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
- "") ;;
@@ -6229,30 +5955,20 @@
-
- RC)
- AC_LIBTOOL_LANG_RC_CONFIG
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+ lt_cv_path_LD="$ac_dir/$ac_prog"
-+ # Check to see if the program is GNU ld. I'd rather use --version,
-+ # but apparently some variants of GNU ld only accept -v.
-+ # Break only if it was the GNU/non-GNU ld that we prefer.
-+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+ *GNU* | *'with BFD'*)
-+ test "$with_gnu_ld" != no && break
- ;;
+- ;;
-
- *)
+- *)
- AC_MSG_ERROR([Unsupported tag name: $tagname])
-+ test "$with_gnu_ld" != yes && break
- ;;
- esac
+- ;;
+- 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"
+- 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
@@ -6262,77 +5978,26 @@
- rm -f "${ofile}T"
- AC_MSG_ERROR([unable to update list of available tagged configurations.])
- fi
-+else
-+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+ AC_MSG_RESULT($LD)
-+else
-+ AC_MSG_RESULT(no)
- fi
+-fi
-])# _LT_AC_TAGCONFIG
-
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_PROG_LD_GNU
-+])# AC_PROG_LD
-
+-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-+# AC_PROG_LD_GNU
-+# --------------
-+AC_DEFUN([AC_PROG_LD_GNU],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+ lt_cv_prog_gnu_ld=yes
-+ ;;
-+*)
-+ lt_cv_prog_gnu_ld=no
-+ ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# AC_PROG_LD_GNU
-
+-
+-
-# 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_PROG_LD_RELOAD_FLAG
-+# ----------------------
-+# find reload flag for linker
-+# -- PORTME Some linkers may need a different reload flag.
-+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+ lt_cv_ld_reload_flag,
-+ [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+ darwin*)
-+ if test "$GCC" = yes; then
-+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+ else
-+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+ fi
-+ ;;
-+esac
-+])# AC_PROG_LD_RELOAD_FLAG
-
+-
+-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
@@ -6357,690 +6022,43 @@
- fi
- done
- IFS="$lt_save_ifs"
-- ;;
-- esac],
-- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
--])# AC_ENABLE_SHARED
-
-+# 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.
-
--# 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 $host_os in
-+aix[[4-9]]*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-
-+beos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-
--# 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
-+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
-+ ;;
-
-+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'
-+ ;;
-
--# 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
-+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*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-
--# 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"
-+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.*`
++# 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_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
--])# AC_ENABLE_FAST_INSTALL
--
--
--# 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
--
-+ esac
-+ else
-+ lt_cv_deplibs_check_method=pass_all
-+ fi
-+ ;;
-
--# 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
-+gnu*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-
-+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
-+ ;;
-
--# 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])
--])])
-+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*)
-+ 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
-+ ;;
-
--# 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.
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+ lt_cv_deplibs_check_method=pass_all
+ esac],
+ [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+@@ -4096,7 +3175,7 @@
+ lt_cv_deplibs_check_method=pass_all
;;
--*)
-- 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
+-netbsd*)
+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
-+ ;;
-
--EOF
-- fi ;;
-- esac
-- fi
-- break
-- fi
-- done
-- IFS="$lt_save_ifs"
-- MAGIC_CMD="$lt_save_MAGIC_CMD"
-+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
- ;;
--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
-
-+nto-qnx*)
-+ lt_cv_deplibs_check_method=unknown
-+ ;;
-
--# AC_PATH_MAGIC
--# -------------
--# find a file program which can recognize a shared library
--AC_DEFUN([AC_PATH_MAGIC],
--[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
--if test -z "$lt_cv_path_MAGIC_CMD"; then
-- if test -n "$ac_tool_prefix"; then
-- AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+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)$'
+ 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
-- MAGIC_CMD=:
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
- fi
--fi
--])# AC_PATH_MAGIC
-+ ;;
-
-+osf3* | osf4* | osf5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-
--# AC_PROG_LD
--# ----------
--# find the pathname to the GNU or non-GNU linker
--AC_DEFUN([AC_PROG_LD],
--[AC_ARG_WITH([gnu-ld],
-- [AC_HELP_STRING([--with-gnu-ld],
-- [assume the C compiler uses GNU ld @<:@default=no@:>@])],
-- [test "$withval" = no || with_gnu_ld=yes],
-- [with_gnu_ld=no])
--AC_REQUIRE([LT_AC_PROG_SED])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--ac_prog=ld
--if test "$GCC" = yes; then
-- # Check if gcc -print-prog-name=ld gives a path.
-- AC_MSG_CHECKING([for ld used by $CC])
-- case $host in
-- *-*-mingw*)
-- # gcc leaves a trailing carriage return which upsets mingw
-- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-- *)
-- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-- esac
-- case $ac_prog in
-- # Accept absolute paths.
-- [[\\/]]* | ?:[[\\/]]*)
-- re_direlt='/[[^/]][[^/]]*/\.\./'
-- # Canonicalize the pathname of ld
-- ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-- ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-- done
-- test -z "$LD" && LD="$ac_prog"
-- ;;
-- "")
-- # If it fails, then pretend we aren't using GCC.
-- ac_prog=ld
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+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*`
- ;;
-- *)
-- # If it is relative, then search for the first ld in PATH.
-- with_gnu_ld=unknown
-+ ncr)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ sequent)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+ ;;
-+ sni)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+ lt_cv_file_magic_test_file=/lib/libc.so
-+ ;;
-+ siemens)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ pc)
-+ lt_cv_deplibs_check_method=pass_all
- ;;
- esac
--elif test "$with_gnu_ld" = yes; then
-- AC_MSG_CHECKING([for GNU ld])
--else
-- AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(lt_cv_path_LD,
--[if test -z "$LD"; then
-- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-- for ac_dir in $PATH; do
-- IFS="$lt_save_ifs"
-- test -z "$ac_dir" && ac_dir=.
-- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-- lt_cv_path_LD="$ac_dir/$ac_prog"
-- # Check to see if the program is GNU ld. I'd rather use --version,
-- # but apparently some variants of GNU ld only accept -v.
-- # Break only if it was the GNU/non-GNU ld that we prefer.
-- case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-- *GNU* | *'with BFD'*)
-- test "$with_gnu_ld" != no && break
-- ;;
-- *)
-- test "$with_gnu_ld" != yes && break
-- ;;
-- esac
-- fi
-- done
-- IFS="$lt_save_ifs"
--else
-- lt_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$lt_cv_path_LD"
--if test -n "$LD"; then
-- AC_MSG_RESULT($LD)
--else
-- AC_MSG_RESULT(no)
--fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_PROG_LD_GNU
--])# AC_PROG_LD
-+ ;;
-
--
--# AC_PROG_LD_GNU
--# --------------
--AC_DEFUN([AC_PROG_LD_GNU],
--[AC_REQUIRE([AC_PROG_EGREP])dnl
--AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
--[# I'd rather use --version here, but apparently some GNU lds only accept -v.
--case `$LD -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
-- lt_cv_prog_gnu_ld=yes
-- ;;
--*)
-- lt_cv_prog_gnu_ld=no
-- ;;
--esac])
--with_gnu_ld=$lt_cv_prog_gnu_ld
--])# AC_PROG_LD_GNU
--
--
--# AC_PROG_LD_RELOAD_FLAG
--# ----------------------
--# find reload flag for linker
--# -- PORTME Some linkers may need a different reload flag.
--AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
--[AC_CACHE_CHECK([for $LD option to reload object files],
-- lt_cv_ld_reload_flag,
-- [lt_cv_ld_reload_flag='-r'])
--reload_flag=$lt_cv_ld_reload_flag
--case $reload_flag in
--"" | " "*) ;;
--*) reload_flag=" $reload_flag" ;;
--esac
--reload_cmds='$LD$reload_flag -o $output$reload_objs'
--case $host_os in
-- darwin*)
-- if test "$GCC" = yes; then
-- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-- else
-- reload_cmds='$LD$reload_flag -o $output$reload_objs'
-- fi
-- ;;
--esac
--])# AC_PROG_LD_RELOAD_FLAG
--
--
--# 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*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
--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
-- ;;
--
--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'
-- ;;
--
--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*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
--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
-- 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
-- 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
-- ;;
--
--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*)
-- 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
-- ;;
--
--# This must be Linux ELF.
--linux* | k*bsd*-gnu)
-- 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
-- ;;
--
--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
-- ;;
--
--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)$'
-- fi
-- ;;
--
--osf3* | osf4* | osf5*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
--rdos*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
--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*`
-- ;;
-- ncr)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
-- sequent)
-- lt_cv_file_magic_cmd='/bin/file'
-- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-- ;;
-- sni)
-- lt_cv_file_magic_cmd='/bin/file'
-- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-- lt_cv_file_magic_test_file=/lib/libc.so
-- ;;
-- siemens)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
-- pc)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
-- esac
-- ;;
--
--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
--test -z "$deplibs_check_method" && deplibs_check_method=unknown
--])# AC_DEPLIBS_CHECK_METHOD
-+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
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+])# AC_DEPLIBS_CHECK_METHOD
-
-
- # AC_PROG_NM
-@@ -5103,7 +4190,7 @@ case $host_os in
+@@ -5103,7 +4182,7 @@
;;
esac
;;
@@ -7049,42 +6067,26 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -6795,7 +5882,7 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -6795,7 +5874,7 @@
;;
esac
;;
-- netbsd*)
-+ netbsd* | netbsdelf*-gnu)
- ;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
-@@ -6860,1580 +5947,2508 @@ AC_MSG_CHECKING([for $compiler option to
- *)
- ;;
- esac
-- ;;
-- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-- case $cc_basename in
-- CC*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-+ ;;
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ case $cc_basename in
-+ CC*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ esac
-+ ;;
-+ vxworks*)
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -6875,1565 +5954,2477 @@
+ *)
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ ;;
+- esac
+- fi
+-],
+-[
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ esac
+ fi
+],
@@ -7994,31 +6996,12 @@
+ *)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
- esac
-- ;;
-- vxworks*)
-- ;;
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-- ;;
-- esac
-- fi
--],
--[
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-- case $host_os in
-- aix*)
-- # All AIX code is PIC.
-- if test "$host_cpu" = ia64; then
-- # AIX 5 now supports IA64 processor
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++
+ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -8034,14 +7017,9 @@
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ ;;
+ esac
- fi
- ;;
-
-- amigaos*)
-- # FIXME: we need at least 68020 code to build shared libraries, but
-- # adding the `-m68020' flag to GCC prevents building anything better,
-- # like `-m68040'.
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++ fi
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -8052,10 +7030,8 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-
-- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-- # PIC is the default for these OSes.
++ ;;
++
+ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -8065,27 +7041,16 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- mingw* | cygwin* | pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- # Although the cygwin gcc ignores -fPIC, still need this for old-style
-- # (--disable-auto-import) libraries
-- m4_if([$1], [GCJ], [],
-- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++ ;;
++
+ newsos6)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
-- darwin* | rhapsody*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++ ;;
++
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -8110,24 +7075,16 @@
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
- ;;
-
-- interix[[3-9]]*)
-- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-- # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ os2*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
-- msdosdjgpp*)
-- # Just because we use GCC doesn't mean we suddenly get shared libraries
-- # on systems that don't support them.
-- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-- enable_shared=no
++ ;;
++
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -8138,11 +7095,8 @@
+ fi
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
-- sysv4*MP*)
-- if test -d /usr/nec; then
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++ ;;
++
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -8156,17 +7110,10 @@
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- fi
++ fi
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
-- hpux*)
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-- case $host_cpu in
-- hppa*64*|ia64*)
-- # +Z the default
-- ;;
++ ;;
++
+ solaris*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+ if test "$GCC" = yes; then
@@ -8184,8 +7131,7 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but is careful enough not to reorder.
@@ -8195,43 +7141,17 @@
+ else
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ fi
- ;;
- esac
++ ;;
++ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
++ ;;
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-- ;;
-- esac
-- else
-- # PORTME Check for flag to pass linker flags through the system compiler.
- case $host_os in
-- aix*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- aix*)
+- # All AIX code is PIC.
- if test "$host_cpu" = ia64; then
- # AIX 5 now supports IA64 processor
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- else
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-- fi
-- ;;
-- darwin*)
-- # PIC is the default on this platform
-- # Common symbols not allowed in MH_DYLIB files
-- case $cc_basename in
-- xlc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- ;;
-- esac
-- ;;
--
-- mingw* | cygwin* | pw32* | os2*)
-- # This hack is so that the source file can tell whether it is being
-- # built for inclusion in a dll (and should export symbols for example).
-- m4_if([$1], [GCJ], [],
-- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ sunos4*)
+ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
@@ -8239,28 +7159,24 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+ fi
+ fi
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
-- hpux9* | hpux10* | hpux11*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-- # not for PA HP-UX.
-- case $host_cpu in
-- hppa*64*|ia64*)
-- # +Z the default
+- amigaos*)
+- # FIXME: we need at least 68020 code to build shared libraries, but
+- # adding the `-m68020' flag to GCC prevents building anything better,
+- # like `-m68040'.
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ sysv4)
+ case $host_vendor in
+ sni)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
- ;;
-- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++ ;;
+ siemens)
+ ## LD is ld it makes a PLAMLIB
+ ## CC just makes a GrossModule.
@@ -8271,27 +7187,27 @@
+ motorola)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
- ;;
- esac
-- # Is there a better lt_prog_compiler_static that works with the bundled CC?
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++ ;;
++ esac
+ runpath_var='LD_RUN_PATH'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
-- irix5* | irix6* | nonstopux*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # PIC (with -KPIC) is the default.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+- # PIC is the default for these OSes.
+ sysv4.3*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
;;
-- newsos6)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- mingw* | cygwin* | pw32* | os2*)
+- # This hack is so that the source file can tell whether it is being
+- # built for inclusion in a dll (and should export symbols for example).
+- # Although the cygwin gcc ignores -fPIC, still need this for old-style
+- # (--disable-auto-import) libraries
+- m4_if([$1], [GCJ], [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -8302,42 +7218,10 @@
+ fi
;;
-- linux* | k*bsd*-gnu)
-- case $cc_basename in
-- icc* | ecc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-- ;;
-- pgcc* | pgf77* | pgf90* | pgf95*)
-- # Portland Group compilers (*not* the Pentium gcc compiler,
-- # which looks to be a dead project)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- ;;
-- ccc*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # All Alpha code is PIC.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-- ;;
-- *)
-- case `$CC -V 2>&1 | sed 5q` in
-- *Sun\ C*)
-- # Sun C 5.9
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- ;;
-- *Sun\ F*)
-- # Sun Fortran 8.3 passes all unrecognized flags to the linker
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
-- ;;
-- esac
-- ;;
-- esac
+- darwin* | rhapsody*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
@@ -8345,10 +7229,9 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
-- osf3* | osf4* | osf5*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- # All OSF/1 code is PIC.
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- interix[[3-9]]*)
+- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+- # Instead, we relocate shared libraries at runtime.
+ if test "$GCC" = yes; then
+ _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'
@@ -8358,8 +7241,12 @@
+ fi
;;
-- rdos*)
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- msdosdjgpp*)
+- # Just because we use GCC doesn't mean we suddenly get shared libraries
+- # on systems that don't support them.
+- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+- enable_shared=no
+- ;;
+ 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
@@ -8376,24 +7263,29 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
-+
+
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+ if test "$GCC" = yes; then
+ _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'
+ else
+ _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'
-+ fi
+ fi
;;
-- solaris*)
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- case $cc_basename in
-- f77* | f90* | f95*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+- hpux*)
+- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+- # not for PA HP-UX.
+- case $host_cpu in
+- hppa*64*|ia64*)
+- # +Z the default
+- ;;
- *)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- ;;
- esac
+ uts4*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -8401,23 +7293,24 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
-- sunos4*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ *)
+ *)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-+ esac
+ esac
+- else
+- # PORTME Check for flag to pass linker flags through the system compiler.
+- case $host_os in
+- aix*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- if test "$host_cpu" = ia64; then
+- # AIX 5 now supports IA64 processor
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+])
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-- sysv4 | sysv4.2uw2* | sysv4.3*)
-- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++
+#
+# Do we need to explicitly link libc?
+#
@@ -8430,7 +7323,7 @@
+ case $_LT_AC_TAGVAR(archive_cmds, $1) in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
- ;;
++ ;;
+ '$CC '*)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
@@ -8438,11 +7331,7 @@
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $rm conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-- sysv4*MP*)
-- if test -d /usr/nec ;then
-- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
@@ -8464,12 +7353,23 @@
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+ fi
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+ else
+ else
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ cat conftest.err 1>&5
fi
+ $rm conftest*
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
;;
+- darwin*)
+- # PIC is the default on this platform
+- # Common symbols not allowed in MH_DYLIB files
+- case $cc_basename in
+- xlc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- ;;
+- esac
+- ;;
+ esac
+ fi
+ ;;
@@ -8516,44 +7416,287 @@
+# /* ltdll.c ends here */
+])# _LT_AC_FILE_LTDLL_C
+- mingw* | cygwin* | pw32* | os2*)
+- # This hack is so that the source file can tell whether it is being
+- # built for inclusion in a dll (and should export symbols for example).
+- m4_if([$1], [GCJ], [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+- ;;
+
+- hpux9* | hpux10* | hpux11*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+- # not for PA HP-UX.
+- case $host_cpu in
+- hppa*64*|ia64*)
+- # +Z the default
+- ;;
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+- ;;
+- esac
+- # Is there a better lt_prog_compiler_static that works with the bundled CC?
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+- ;;
++# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
++# ---------------------------------
++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+
+- irix5* | irix6* | nonstopux*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # PIC (with -KPIC) is the default.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- ;;
+
+- newsos6)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
++# old names
++AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
++AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
++AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
++AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
+
+- linux* | k*bsd*-gnu)
+- case $cc_basename in
+- icc* | ecc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+- pgcc* | pgf77* | pgf90* | pgf95*)
+- # Portland Group compilers (*not* the Pentium gcc compiler,
+- # which looks to be a dead project)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
+- ccc*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # All Alpha code is PIC.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- ;;
+- *)
+- case `$CC -V 2>&1 | sed 5q` in
+- *Sun\ C*)
+- # Sun C 5.9
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- ;;
+- *Sun\ F*)
+- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+- ;;
+- esac
+- ;;
+- esac
+- ;;
++# This is just to silence aclocal about the macro not being used
++ifelse([AC_DISABLE_FAST_INSTALL])
+
+- osf3* | osf4* | osf5*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- # All OSF/1 code is PIC.
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- ;;
++AC_DEFUN([LT_AC_PROG_GCJ],
++[AC_CHECK_TOOL(GCJ, gcj, no)
++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++ AC_SUBST(GCJFLAGS)
++])
+
+- rdos*)
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+- ;;
++AC_DEFUN([LT_AC_PROG_RC],
++[AC_CHECK_TOOL(RC, windres, no)
++])
+
+- solaris*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- case $cc_basename in
+- f77* | f90* | f95*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+- *)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+- esac
+- ;;
+
+- sunos4*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+- sysv4 | sysv4.2uw2* | sysv4.3*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- ;;
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++ as_executable_p='test -x'
++else
++ as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
+
+- sysv4*MP*)
+- if test -d /usr/nec ;then
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
++# NOTE: This macro has been submitted for inclusion into #
++# GNU Autoconf as AC_PROG_SED. When it is available in #
++# a released version of Autoconf we should remove this #
++# macro and use it instead. #
++# LT_AC_PROG_SED
++# --------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible. Prefer GNU sed if found.
++AC_DEFUN([LT_AC_PROG_SED],
++[AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for lt_ac_prog in sed gsed; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+- ;;
++ done
++ done
++done
++IFS=$as_save_IFS
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++ test ! -f $lt_ac_sed && continue
++ cat /dev/null > conftest.in
++ lt_ac_count=0
++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++ # Check for GNU sed and select it if it is found.
++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++ lt_cv_path_SED=$lt_ac_sed
++ break
++ fi
++ while true; do
++ cat conftest.in conftest.in >conftest.tmp
++ mv conftest.tmp conftest.in
++ cp conftest.in conftest.nl
++ echo >>conftest.nl
++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++ cmp -s conftest.out conftest.nl || break
++ # 10000 chars as input seems more than enough
++ test $lt_ac_count -gt 10 && break
++ lt_ac_count=`expr $lt_ac_count + 1`
++ if test $lt_ac_count -gt $lt_ac_max; then
++ lt_ac_max=$lt_ac_count
++ lt_cv_path_SED=$lt_ac_sed
++ fi
++ done
++done
++])
++SED=$lt_cv_path_SED
++AC_SUBST([SED])
++AC_MSG_RESULT([$SED])
++])
+
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
++# nls.m4 serial 3 (gettext-0.15)
++dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
- unicos*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
-+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-+# ---------------------------------
-+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++dnl Authors:
++dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
++dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
- uts4*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
++AC_PREREQ(2.50)
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
- esac
- fi
--])
++AC_DEFUN([AM_NLS],
++[
++ AC_MSG_CHECKING([whether NLS is requested])
++ dnl Default is enabled NLS
++ AC_ARG_ENABLE(nls,
++ [ --disable-nls do not use Native Language Support],
++ USE_NLS=$enableval, USE_NLS=yes)
++ AC_MSG_RESULT($USE_NLS)
++ AC_SUBST(USE_NLS)
+ ])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-+# old names
-+AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-+AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-+AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
--#
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright ? 2004 Scott James Remnant <scott at netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
+ #
-# Check to make sure the PIC flag actually works.
--#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
+ #
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
- _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
@@ -8564,7 +7707,24 @@
- esac],
- [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
--fi
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ fi
-case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
- *djgpp*)
@@ -8574,27 +7734,46 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
- ;;
-esac
-+# This is just to silence aclocal about the macro not being used
-+ifelse([AC_DISABLE_FAST_INSTALL])
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
--#
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+ #
-# Check to make sure the static flag actually works.
--#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
- _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
- $lt_tmp_static_flag,
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-+AC_DEFUN([LT_AC_PROG_GCJ],
-+[AC_CHECK_TOOL(GCJ, gcj, no)
-+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+ AC_SUBST(GCJFLAGS)
- ])
+-])
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
-+AC_DEFUN([LT_AC_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres, no)
-+])
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
@@ -8610,7 +7789,13 @@
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-- else
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
+ else
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
- ;;
@@ -8683,14 +7868,12 @@
- with_gnu_ld=no
- ;;
- esac
-
+-
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-+# Cheap backport of AS_EXECUTABLE_P and required macros
-+# from Autoconf 2.59; we should not use $as_executable_p directly.
-
+-
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
- # here allows them to be overridden if necessary.
@@ -8702,7 +7885,10 @@
- _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
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
+ fi
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
@@ -8711,89 +7897,7 @@
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
-+# _AS_TEST_PREPARE
-+# ----------------
-+m4_ifndef([_AS_TEST_PREPARE],
-+[m4_defun([_AS_TEST_PREPARE],
-+[if test -x / >/dev/null 2>&1; then
-+ as_executable_p='test -x'
-+else
-+ as_executable_p='test -f'
-+fi
-+])])# _AS_TEST_PREPARE
-+
-+# AS_EXECUTABLE_P
-+# ---------------
-+# Check whether a file is executable.
-+m4_ifndef([AS_EXECUTABLE_P],
-+[m4_defun([AS_EXECUTABLE_P],
-+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-+$as_executable_p $1[]dnl
-+])])# AS_EXECUTABLE_P
-+
-+# NOTE: This macro has been submitted for inclusion into #
-+# GNU Autoconf as AC_PROG_SED. When it is available in #
-+# a released version of Autoconf we should remove this #
-+# macro and use it instead. #
-+# LT_AC_PROG_SED
-+# --------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible. Prefer GNU sed if found.
-+AC_DEFUN([LT_AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for lt_ac_prog in sed gsed; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
-+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+ fi
-+ done
-+ done
-+done
-+IFS=$as_save_IFS
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# along with /bin/sed that truncates output.
-+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+ test ! -f $lt_ac_sed && continue
-+ cat /dev/null > conftest.in
-+ lt_ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+ # Check for GNU sed and select it if it is found.
-+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+ lt_cv_path_SED=$lt_ac_sed
-+ break
-+ fi
-+ while true; do
-+ cat conftest.in conftest.in >conftest.tmp
-+ mv conftest.tmp conftest.in
-+ cp conftest.in conftest.nl
-+ echo >>conftest.nl
-+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+ cmp -s conftest.out conftest.nl || break
-+ # 10000 chars as input seems more than enough
-+ test $lt_ac_count -gt 10 && break
-+ lt_ac_count=`expr $lt_ac_count + 1`
-+ if test $lt_ac_count -gt $lt_ac_max; then
-+ lt_ac_max=$lt_ac_count
-+ lt_cv_path_SED=$lt_ac_sed
-+ fi
-+ done
-+done
-+])
-+SED=$lt_cv_path_SED
-+AC_SUBST([SED])
-+AC_MSG_RESULT([$SED])
-+])
-
+-
- # See if GNU ld supports shared libraries.
- case $host_os in
- aix[[3-9]]*)
@@ -8801,49 +7905,25 @@
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-+# nls.m4 serial 3 (gettext-0.15)
-+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-
+-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-+dnl Authors:
-+dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-+dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-
+-
-EOF
- fi
- ;;
-+AC_PREREQ(2.50)
-
+-
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+AC_DEFUN([AM_NLS],
-+[
-+ AC_MSG_CHECKING([whether NLS is requested])
-+ dnl Default is enabled NLS
-+ AC_ARG_ENABLE(nls,
-+ [ --disable-nls do not use Native Language Support],
-+ USE_NLS=$enableval, USE_NLS=yes)
-+ AC_MSG_RESULT($USE_NLS)
-+ AC_SUBST(USE_NLS)
-+])
++else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
@@ -8853,28 +7933,16 @@
- # them.
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+#
-+# Copyright ? 2004 Scott James Remnant <scott at netsplit.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8886,27 +7954,6 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# ----------------------------------
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+
-+fi[]dnl
-+])# PKG_PROG_PKG_CONFIG
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
@@ -8916,24 +7963,20 @@
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
+#
-+# Check to see whether a particular set of modules exists. Similar
-+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
-+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-+# this or PKG_CHECK_MODULES is called, or make sure to call
-+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_EXISTS],
++AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_ifval([$2], [$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -8950,6 +7993,8 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
- interix[[3-9]]*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
@@ -8965,21 +8010,8 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+# ---------------------------------------------
-+m4_define([_PKG_CONFIG],
-+[if test -n "$PKG_CONFIG"; then
-+ if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ else
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+ [pkg_failed=yes])
-+ fi
-+else
-+ pkg_failed=untried
-+fi[]dnl
-+])# _PKG_CONFIG
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
- gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9009,16 +8041,9 @@
- tmp_sharedflag='-shared' ;;
- esac
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+# _PKG_SHORT_ERRORS_SUPPORTED
-+# -----------------------------
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])# _PKG_SHORT_ERRORS_SUPPORTED
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
@@ -9030,6 +8055,15 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -9040,30 +8074,14 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+# [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+#
-+#
-+# --------------------------------------------------------------
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
- solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++$$1_PKG_ERRORS
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
@@ -9071,9 +8089,8 @@
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
-EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9083,23 +8100,22 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+if test $pkg_failed = yes; then
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++_PKG_TEXT
++])],
++ [AC_MSG_RESULT([no])
++ $4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-+ ifelse([$4], , [AC_MSG_ERROR(dnl
-+[Package requirements ($2) were not met:
++_PKG_TEXT
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
@@ -9107,7 +8123,15 @@
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-+$$1_PKG_ERRORS
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
-_LT_EOF
- ;;
@@ -9122,8 +8146,11 @@
- ;;
- esac
- ;;
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
++# Copyright (C) 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.
- sunos4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -9131,15 +8158,11 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+_PKG_TEXT
-+])],
-+ [AC_MSG_RESULT([no])
-+ $4])
-+elif test $pkg_failed = untried; then
-+ ifelse([$4], , [AC_MSG_FAILURE(dnl
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -9150,7 +8173,12 @@
- fi
- ;;
- esac
-+_PKG_TEXT
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION so it can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++ [AM_AUTOMAKE_VERSION([1.9.6])])
- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
- runpath_var=
@@ -9174,15 +8202,7 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-+ [$4])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ ifelse([$3], , :, [$3])
-+fi[]dnl
-+])# PKG_CHECK_MODULES
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
- aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
@@ -9200,67 +8220,89 @@
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
- aix_use_runtimelinking=no
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
++# 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.
+
+- # 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]].*|aix[[5-9]]*)
+- for ld_flag in $LDFLAGS; do
+- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+- aix_use_runtimelinking=yes
+- break
+- fi
+- done
+- ;;
+- esac
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++#
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory. The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run. This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++# fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++# fails if $ac_aux_dir is absolute,
++# fails when called from a subdirectory in a VPATH build with
++# a relative $ac_aux_dir
+#
-+# 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.
-
-- # 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]].*|aix[[5-9]]*)
-- for ld_flag in $LDFLAGS; do
-- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-- aix_use_runtimelinking=yes
-- break
-- fi
-- done
-- ;;
-- esac
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.10'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version. Point them to the right macro.
-+m4_if([$1], [1.10.1], [],
-+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir. In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++# MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH. The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
- fi
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too. Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
- # 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.
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
++# AM_CONDITIONAL -*- Autoconf -*-
- _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
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
++# Copyright (C) 1997, 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.
- if test "$GCC" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
@@ -9302,49 +8344,7 @@
- fi
- fi
- fi
-+# 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.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory. The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run. This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+# fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+# fails if $ac_aux_dir is absolute,
-+# fails when called from a subdirectory in a VPATH build with
-+# a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir. In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+# MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH. The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
++# serial 7
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
@@ -9378,12 +8378,27 @@
- fi
- fi
- ;;
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[AC_PREREQ(2.52)dnl
++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])
++AC_SUBST([$1_FALSE])
++if $2; then
++ $1_TRUE=
++ $1_FALSE='#'
++else
++ $1_TRUE='#'
++ $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++ AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
@@ -9392,12 +8407,11 @@
- # see comment about different semantics on the GNU ld section
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-+# AM_CONDITIONAL -*- Autoconf -*-
- bsdi[[45]]*)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
@@ -9474,77 +8488,20 @@
- esac
- fi
- ;;
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
-+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+if $2; then
-+ $1_TRUE=
-+ $1_FALSE='#'
-+else
-+ $1_TRUE='#'
-+ $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+ AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-
-- dgux*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 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.
-
-- freebsd1*)
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
-+# serial 9
-
-- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-- # support. Future versions do this automatically, but an explicit c++rt0.o
-- # does not break anything, and helps significantly (at the cost of a little
-- # extra space).
-- freebsd2.2*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-- freebsd2*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- dgux*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | dragonfly*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- freebsd1*)
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
@@ -9561,14 +8518,30 @@
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
+
+- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+- # support. Future versions do this automatically, but an explicit c++rt0.o
+- # does not break anything, and helps significantly (at the cost of a little
+- # extra space).
+- freebsd2.2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
-+
+
+- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -9589,7 +8562,14 @@
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
-+
+
+- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd* | dragonfly*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
@@ -9649,7 +8629,6 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -9757,9 +8736,62 @@
+ AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
++AC_SUBST([AMDEPBACKSLASH])
+])
++
++# Generate code to set up dependency tracking. -*- Autoconf -*-
++
++# Copyright (C) 1999, 2000, 2001, 2002, 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 3
++
++# _AM_OUTPUT_DEPENDENCY_COMMANDS
++# ------------------------------
++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
++[for mf in $CONFIG_FILES; do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # So let's grep whole file.
++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++ dirpart=`AS_DIRNAME("$mf")`
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`AS_DIRNAME(["$file"])`
++ AS_MKDIR_P([$dirpart/$fdir])
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
++ done
++done
++])# _AM_OUTPUT_DEPENDENCY_COMMANDS
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
@@ -9772,7 +8804,6 @@
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -9784,12 +8815,18 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
++# AM_OUTPUT_DEPENDENCY_COMMANDS
++# -----------------------------
++# This macro should only be invoked once -- use via AC_REQUIRE.
+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
++# This code is only required when automatic dependency tracking
++# is enabled. FIXME. This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
++[AC_CONFIG_COMMANDS([depfiles],
++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
- newsos6)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -9798,7 +8835,12 @@
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+#serial 3
++# Copyright (C) 1996, 1997, 2000, 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.
- openbsd*)
- if test -f /usr/libexec/ld.so; then
@@ -9825,49 +8867,7 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
-+ # Strip MF so we end up with the name of the file.
-+ mf=`echo "$mf" | sed -e 's/:.*$//'`
-+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named `Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ dirpart=`AS_DIRNAME("$mf")`
-+ else
-+ continue
-+ fi
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+ test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+ # When using ansi2knr, U may be empty or an underscore; expand it
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+ # Make sure the directory exists.
-+ test -f "$dirpart/$file" && continue
-+ fdir=`AS_DIRNAME(["$file"])`
-+ AS_MKDIR_P([$dirpart/$fdir])
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
-+ done
-+done
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
++# serial 8
- os2*)
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -9876,6 +8876,8 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
- osf3*)
- if test "$GCC" = yes; then
@@ -9888,18 +8890,7 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled. FIXME. This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
++# Do all the work for Automake. -*- Autoconf -*-
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
@@ -9911,7 +8902,7 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _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~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
@@ -9923,7 +8914,7 @@
- fi
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-+# serial 8
++# serial 12
- solaris*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
@@ -9956,8 +8947,8 @@
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++# This macro actually does too much. Some checks are only needed if
++# your package does certain things. But this isn't really a big deal.
- sunos4*)
- if test "x$host_vendor" = xsequent; then
@@ -9972,7 +8963,29 @@
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+# Do all the work for Automake. -*- Autoconf -*-
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out. PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition. After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_PREREQ([2.58])dnl
++dnl Autoconf wants to disallow AM_ names. We explicitly allow
++dnl the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++AC_REQUIRE([AC_PROG_INSTALL])dnl
++# test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" &&
++ test -f $srcdir/config.status; then
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++fi
- sysv4)
- case $host_vendor in
@@ -9995,73 +9008,6 @@
- runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-- sysv4.3*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-- ;;
-+# serial 13
-
-- sysv4*MP*)
-- if test -d /usr/nec; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- runpath_var=LD_RUN_PATH
-- hardcode_runpath_var=yes
-- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-- fi
-- ;;
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-
-- 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'
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out. PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition. After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.60])dnl
-+dnl Autoconf wants to disallow AM_ names. We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+ # is not polluted with repeated "-I."
-+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+ # test to see if srcdir already configured
-+ if test -f $srcdir/config.status; then
-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+ fi
-+fi
-
-- if test "$GCC" = yes; then
-- _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'
-- else
-- _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'
-- fi
-- ;;
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
@@ -10072,22 +9018,11 @@
+fi
+AC_SUBST([CYGPATH_W])
-- 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.
-- _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
+- sysv4.3*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _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'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+- ;;
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
@@ -10095,16 +9030,27 @@
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
+
+- sysv4*MP*)
+- if test -d /usr/nec; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+- fi
+- ;;
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
+
+- 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'
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
@@ -10133,73 +9079,93 @@
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+ [_AM_DEPENDENCIES(OBJC)],
-+ [define([AC_PROG_OBJC],
-+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+])
- if test "$GCC" = yes; then
-- _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'
+- _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'
- else
-- _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'
+- _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'
- fi
- ;;
-- uts4*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- 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.
+- _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'
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
-- *)
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- if test "$GCC" = yes; then
+- _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'
+- else
+- _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'
+- fi
- ;;
-- esac
-- fi
--])
--AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
-+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
-+ $_am_arg | $_am_arg:* )
++ $1 | $1:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+- uts4*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
--# Do we need to explicitly link libc?
++#
+# 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.
-+
+
+- *)
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- esac
+- fi
+-])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
-+
+
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
#
+-# Do we need to explicitly link libc?
+-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
- # Assume -lc should be added
@@ -10353,9 +9319,16 @@
+# 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([LT_AC_PROG_GCJ],
+-[AC_CHECK_TOOL(GCJ, gcj, no)
+- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+- AC_SUBST(GCJFLAGS)
+-])
+# serial 3
-+
+
+-AC_DEFUN([LT_AC_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres, no)
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
@@ -10396,28 +9369,32 @@
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
-+])
-+
-+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
+ ])
+
++# Copyright (C) 1999, 2000, 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.
-+
-+# serial 5
--AC_DEFUN([LT_AC_PROG_GCJ],
--[AC_CHECK_TOOL(GCJ, gcj, no)
-- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-- AC_SUBST(GCJFLAGS)
+-# Cheap backport of AS_EXECUTABLE_P and required macros
+-# from Autoconf 2.59; we should not use $as_executable_p directly.
++# serial 3
+
+-# _AS_TEST_PREPARE
+-# ----------------
+-m4_ifndef([_AS_TEST_PREPARE],
+-[m4_defun([_AS_TEST_PREPARE],
+-[if test -x / >/dev/null 2>&1; then
+- as_executable_p='test -x'
+-else
+- as_executable_p='test -f'
+# AM_PROG_CC_C_O
+# --------------
+# Like AC_PROG_CC_C_O, but changed for automake.
+AC_DEFUN([AM_PROG_CC_C_O],
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([compile])dnl
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
@@ -10429,58 +9406,6 @@
+ # 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
-+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])])
- ])
-
--AC_DEFUN([LT_AC_PROG_RC],
--[AC_CHECK_TOOL(RC, windres, no)
--])
-+# Fake the existence of programs that GNU maintainers use. -*- 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.
-
--# Cheap backport of AS_EXECUTABLE_P and required macros
--# from Autoconf 2.59; we should not use $as_executable_p directly.
-+# serial 5
-
--# _AS_TEST_PREPARE
--# ----------------
--m4_ifndef([_AS_TEST_PREPARE],
--[m4_defun([_AS_TEST_PREPARE],
--[if test -x / >/dev/null 2>&1; then
-- as_executable_p='test -x'
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+ am_missing_run="$MISSING --run "
- else
-- as_executable_p='test -f'
-+ am_missing_run=
-+ AC_MSG_WARN([`missing' script is too old or missing])
fi
-])])# _AS_TEST_PREPARE
+])
@@ -10493,11 +9418,7 @@
-[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-$as_executable_p $1[]dnl
-])])# AS_EXECUTABLE_P
-+# Copyright (C) 2003, 2004, 2005, 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.
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
@@ -10560,25 +9481,13 @@
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check for `mkdir -p'.
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+ [[\\/$]]* | ?:[[\\/]]*) ;;
-+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
- ])
+-])
++# Copyright (C) 1997, 1999, 2000, 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.
-# nls.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
@@ -10594,19 +9503,19 @@
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-+# Helper functions for option handling. -*- Autoconf -*-
++# serial 4
-dnl Authors:
-dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-+# 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.
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
-AC_PREREQ(2.50)
-+# serial 3
-AC_DEFUN([AM_NLS],
-[
@@ -10617,11 +9526,21 @@
- USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT($USE_NLS)
- AC_SUBST(USE_NLS)
--])
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++ am_missing_run="$MISSING --run "
++else
++ am_missing_run=
++ AC_MSG_WARN([`missing' script is too old or missing])
++fi
+ ])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-#
@@ -10640,27 +9559,79 @@
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--#
++# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+ #
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-+# _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)])
++# 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.
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+# _AM_SET_OPTIONS(OPTIONS)
- # ----------------------------------
+-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
--fi
++# AM_PROG_MKDIR_P
++# ---------------
++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
++#
++# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
++# created by `make install' are always world readable, even if the
++# installer happens to have an overly restrictive umask (e.g. 077).
++# This was a mistake. There are at least two reasons why we must not
++# use `-m 0755':
++# - it causes special bits like SGID to be ignored,
++# - it may be too restrictive (some setups expect 775 directories).
++#
++# Do not use -m 0755 and let people choose whatever they expect by
++# setting umask.
++#
++# We cannot accept any implementation of `mkdir' that recognizes `-p'.
++# Some implementations (such as Solaris 8's) are not thread-safe: if a
++# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
++# concurrently, both version can detect that a/ is missing, but only
++# one can create it and the other will error out. Consequently we
++# restrict ourselves to GNU make (using the --version option ensures
++# this.)
++AC_DEFUN([AM_PROG_MKDIR_P],
++[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++ # We used to keeping the `.' as first argument, in order to
++ # allow $(mkdir_p) to be used without argument. As in
++ # $(mkdir_p) $(somedir)
++ # where $(somedir) is conditionally defined. However this is wrong
++ # for two reasons:
++ # 1. if the package is installed by a user who cannot write `.'
++ # make install will fail,
++ # 2. the above comment should most certainly read
++ # $(mkdir_p) $(DESTDIR)$(somedir)
++ # so it does not work when $(somedir) is undefined and
++ # $(DESTDIR) is not.
++ # To support the latter case, we have to write
++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
++ # so the `.' trick is pointless.
++ mkdir_p='mkdir -p --'
++else
++ # On NextStep and OpenStep, the `mkdir' command does not
++ # recognize any option. It will interpret all options as
++ # directories to create, and then abort because `.' already
++ # exists.
++ for d in ./-p ./--version;
++ do
++ test -d $d && rmdir $d
++ done
++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
++ if test -f "$ac_aux_dir/mkinstalldirs"; then
++ mkdir_p='$(mkinstalldirs)'
++ else
++ mkdir_p='$(install_sh) -d'
++ fi
+ fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
@@ -10673,6 +9644,80 @@
-
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
++AC_SUBST([mkdir_p])])
+
+-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+-#
+-# Check to see whether a particular set of modules exists. Similar
+-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+-#
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
+-# --------------------------------------------------------------
+-AC_DEFUN([PKG_CHECK_EXISTS],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+-if test -n "$PKG_CONFIG" && \
+- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+- m4_ifval([$2], [$2], [:])
+-m4_ifvaln([$3], [else
+- $3])dnl
+-fi])
++# Helper functions for option handling. -*- Autoconf -*-
+
++# 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.
+
+-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+-# ---------------------------------------------
+-m4_define([_PKG_CONFIG],
+-[if test -n "$$1"; then
+- pkg_cv_[]$1="$$1"
+- elif test -n "$PKG_CONFIG"; then
+- PKG_CHECK_EXISTS([$3],
+- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+- [pkg_failed=yes])
+- else
+- pkg_failed=untried
+-fi[]dnl
+-])# _PKG_CONFIG
++# serial 3
+
+-# _PKG_SHORT_ERRORS_SUPPORTED
+-# -----------------------------
+-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi[]dnl
+-])# _PKG_SHORT_ERRORS_SUPPORTED
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
++# _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)])
+
+-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+-# [ACTION-IF-NOT-FOUND])
+-#
+-#
+-# Note that if there is a possibility the first call to
+-# PKG_CHECK_MODULES might not happen, you should be sure to include an
+-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+-#
++# _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)])])
@@ -10682,48 +9727,27 @@
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
--# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
--#
--# Check to see whether a particular set of modules exists. Similar
--# to PKG_CHECK_MODULES(), but does not set variables or print errors.
--#
++
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
#
--# Similar to PKG_CHECK_MODULES, make sure that the first instance of
--# this or PKG_CHECK_MODULES is called, or make sure to call
--# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_EXISTS],
+-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--if test -n "$PKG_CONFIG" && \
-- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-- m4_ifval([$2], [$2], [:])
--m4_ifvaln([$3], [else
-- $3])dnl
--fi])
+-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+# 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.
+-pkg_failed=no
+-AC_MSG_CHECKING([for $1])
+# serial 4
--# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
--# ---------------------------------------------
--m4_define([_PKG_CONFIG],
--[if test -n "$$1"; then
-- pkg_cv_[]$1="$$1"
-- elif test -n "$PKG_CONFIG"; then
-- PKG_CHECK_EXISTS([$3],
-- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-- [pkg_failed=yes])
-- else
-- pkg_failed=untried
--fi[]dnl
--])# _PKG_CONFIG
+-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
@@ -10746,16 +9770,9 @@
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
--# _PKG_SHORT_ERRORS_SUPPORTED
--# -----------------------------
--AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi[]dnl
--])# _PKG_SHORT_ERRORS_SUPPORTED
+-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+-and $1[]_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.])
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
@@ -10764,6 +9781,15 @@
+alias in your environment])
+ fi
+-if test $pkg_failed = yes; then
+- _PKG_SHORT_ERRORS_SUPPORTED
+- if test $_pkg_short_errors_supported = yes; then
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+- else
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ test "$[2]" = conftest.file
+ )
+then
@@ -10775,27 +9801,15 @@
+fi
+AC_MSG_RESULT(yes)])
--# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
--# [ACTION-IF-NOT-FOUND])
--#
--#
--# Note that if there is a possibility the first call to
--# PKG_CHECK_MODULES might not happen, you should be sure to include an
--# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
--#
+- ifelse([$4], , [AC_MSG_ERROR(dnl
+-[Package requirements ($2) were not met:
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
--# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_MODULES],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
--AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++#
+# 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.
--pkg_failed=no
--AC_MSG_CHECKING([for $1])
+-$$1_PKG_ERRORS
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
@@ -10815,50 +9829,40 @@
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
--_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
--_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+# 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.
-
--m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
--and $1[]_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.])
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-
--if test $pkg_failed = yes; then
-- _PKG_SHORT_ERRORS_SUPPORTED
-- if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+# Check how to create a tarball. -*- Autoconf -*-
-- ifelse([$4], , [AC_MSG_ERROR(dnl
--[Package requirements ($2) were not met:
+-_PKG_TEXT
+-])],
+- [AC_MSG_RESULT([no])
+- $4])
+-elif test $pkg_failed = untried; then
+- ifelse([$4], , [AC_MSG_FAILURE(dnl
+-[The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+# Copyright (C) 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.
--$$1_PKG_ERRORS
+-_PKG_TEXT
+# serial 2
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+- [$4])
+-else
+- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+- AC_MSG_RESULT([yes])
+- ifelse([$3], , :, [$3])
+-fi[]dnl
+-])# PKG_CHECK_MODULES
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
@@ -10921,21 +9925,11 @@
+ am__untar=false
+ ;;
+ esac
-
--_PKG_TEXT
--])],
-- [AC_MSG_RESULT([no])
-- $4])
--elif test $pkg_failed = untried; then
-- ifelse([$4], , [AC_MSG_FAILURE(dnl
--[The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
++
+ # 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
-
--_PKG_TEXT
++
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
@@ -10948,50 +9942,1218 @@
+ fi
+done
+rm -rf conftest.dir
++
++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
+
+ m4_include([m4/d-type.m4])
+ m4_include([m4/gnome-doc-utils.m4])
+--- gnome-panel-2.24.2.orig/applets/clock/Makefile.in
++++ gnome-panel-2.24.2/applets/clock/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -16,11 +16,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -70,16 +74,16 @@
+ @CLOCK_INPROCESS_TRUE at libclock_applet_la_DEPENDENCIES = \
+ @CLOCK_INPROCESS_TRUE@ $(am__DEPENDENCIES_2)
+ am__libclock_applet_la_SOURCES_DIST = calendar-window.c \
+- calendar-window.h obox.c obox.h clock.c clock.h clock-face.c \
+- clock-face.h clock-location.c clock-location.h \
+- clock-location-tile.c clock-location-tile.h clock-map.c \
+- clock-map.h clock-sunpos.c clock-sunpos.h clock-utils.c \
+- clock-utils.h system-timezone.c system-timezone.h \
+- clock-marshallers.c clock-marshallers.h clock-typebuiltins.c \
+- clock-typebuiltins.h gnome-clock-applet-mechanism-glue.h \
+- calendar-client.c calendar-client.h calendar-sources.c \
+- calendar-sources.h calendar-debug.h set-timezone-dummy.c \
+- set-timezone.h set-timezone.c
++ calendar-window.h clock.c clock.h clock-face.c clock-face.h \
++ clock-location.c clock-location.h clock-location-tile.c \
++ clock-location-tile.h clock-map.c clock-map.h clock-sunpos.c \
++ clock-sunpos.h clock-utils.c clock-utils.h system-timezone.c \
++ system-timezone.h clock-marshallers.c clock-marshallers.h \
++ clock-typebuiltins.c clock-typebuiltins.h \
++ gnome-clock-applet-mechanism-glue.h calendar-client.c \
++ calendar-client.h calendar-sources.c calendar-sources.h \
++ calendar-debug.h set-timezone-dummy.c set-timezone.h \
++ set-timezone.c
+ am__objects_1 =
+ am__objects_2 = libclock_applet_la-clock-marshallers.lo \
+ libclock_applet_la-clock-typebuiltins.lo $(am__objects_1)
+@@ -90,8 +94,7 @@
+ @HAVE_POLKIT_FALSE@ libclock_applet_la-set-timezone-dummy.lo
+ @HAVE_POLKIT_TRUE at am__objects_4 = libclock_applet_la-set-timezone.lo
+ am__objects_5 = libclock_applet_la-calendar-window.lo \
+- libclock_applet_la-obox.lo libclock_applet_la-clock.lo \
+- libclock_applet_la-clock-face.lo \
++ libclock_applet_la-clock.lo libclock_applet_la-clock-face.lo \
+ libclock_applet_la-clock-location.lo \
+ libclock_applet_la-clock-location-tile.lo \
+ libclock_applet_la-clock-map.lo \
+@@ -102,10 +105,6 @@
+ @CLOCK_INPROCESS_TRUE at am_libclock_applet_la_OBJECTS = \
+ @CLOCK_INPROCESS_TRUE@ $(am__objects_5)
+ libclock_applet_la_OBJECTS = $(am_libclock_applet_la_OBJECTS)
+-libclock_applet_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+- $(libclock_applet_la_CFLAGS) $(CFLAGS) \
+- $(libclock_applet_la_LDFLAGS) $(LDFLAGS) -o $@
+ @CLOCK_INPROCESS_TRUE at am_libclock_applet_la_rpath = -rpath \
+ @CLOCK_INPROCESS_TRUE@ $(clock_appletlibdir)
+ @HAVE_POLKIT_TRUE at am__EXEEXT_1 = \
+@@ -113,10 +112,10 @@
+ libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(libexec_PROGRAMS)
+ am__clock_applet_SOURCES_DIST = calendar-window.c calendar-window.h \
+- obox.c obox.h clock.c clock.h clock-face.c clock-face.h \
+- clock-location.c clock-location.h clock-location-tile.c \
+- clock-location-tile.h clock-map.c clock-map.h clock-sunpos.c \
+- clock-sunpos.h clock-utils.c clock-utils.h system-timezone.c \
++ clock.c clock.h clock-face.c clock-face.h clock-location.c \
++ clock-location.h clock-location-tile.c clock-location-tile.h \
++ clock-map.c clock-map.h clock-sunpos.c clock-sunpos.h \
++ clock-utils.c clock-utils.h system-timezone.c \
+ system-timezone.h clock-marshallers.c clock-marshallers.h \
+ clock-typebuiltins.c clock-typebuiltins.h \
+ gnome-clock-applet-mechanism-glue.h calendar-client.c \
+@@ -132,8 +131,7 @@
+ @HAVE_POLKIT_FALSE@ clock_applet-set-timezone-dummy.$(OBJEXT)
+ @HAVE_POLKIT_TRUE at am__objects_8 = clock_applet-set-timezone.$(OBJEXT)
+ am__objects_9 = clock_applet-calendar-window.$(OBJEXT) \
+- clock_applet-obox.$(OBJEXT) clock_applet-clock.$(OBJEXT) \
+- clock_applet-clock-face.$(OBJEXT) \
++ clock_applet-clock.$(OBJEXT) clock_applet-clock-face.$(OBJEXT) \
+ clock_applet-clock-location.$(OBJEXT) \
+ clock_applet-clock-location-tile.$(OBJEXT) \
+ clock_applet-clock-map.$(OBJEXT) \
+@@ -145,9 +143,6 @@
+ clock_applet_OBJECTS = $(am_clock_applet_OBJECTS)
+ @CLOCK_INPROCESS_FALSE at clock_applet_DEPENDENCIES = \
+ @CLOCK_INPROCESS_FALSE@ $(am__DEPENDENCIES_2)
+-clock_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(clock_applet_CFLAGS) \
+- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ am_gnome_clock_applet_mechanism_OBJECTS = \
+ gnome-clock-applet-mechanism.$(OBJEXT) \
+ gnome-clock-applet-mechanism-main.$(OBJEXT) \
+@@ -156,18 +151,17 @@
+ $(am_gnome_clock_applet_mechanism_OBJECTS)
+ gnome_clock_applet_mechanism_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libclock_applet_la_SOURCES) $(clock_applet_SOURCES) \
+ $(gnome_clock_applet_mechanism_SOURCES)
+ DIST_SOURCES = $(am__libclock_applet_la_SOURCES_DIST) \
+@@ -175,11 +169,10 @@
+ $(gnome_clock_applet_mechanism_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ dbus_confDATA_INSTALL = $(INSTALL_DATA)
+ dbus_servicesDATA_INSTALL = $(INSTALL_DATA)
+ gladeDATA_INSTALL = $(INSTALL_DATA)
+@@ -189,8 +182,6 @@
+ uiDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(dbus_conf_DATA) $(dbus_services_DATA) $(glade_DATA) \
+ $(polkit_DATA) $(schemas_DATA) $(server_DATA) $(ui_DATA)
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -198,6 +189,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -214,6 +207,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -239,12 +234,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -253,9 +256,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -293,10 +303,13 @@
+ 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@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -304,6 +317,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -339,6 +354,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -346,13 +363,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -364,7 +381,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -392,12 +408,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_build_prefix = @top_build_prefix@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ SUBDIRS = pixmaps
+ INCLUDES = \
+ -I$(srcdir)/../../libpanel-applet \
+@@ -437,8 +449,6 @@
+ CLOCK_SOURCES = \
+ calendar-window.c \
+ calendar-window.h \
+- obox.c \
+- obox.h \
+ clock.c \
+ clock.h \
+ clock-face.c \
+@@ -576,21 +586,21 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-clock_appletlibLTLIBRARIES: $(clock_appletlib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(clock_appletlibdir)" || $(MKDIR_P) "$(DESTDIR)$(clock_appletlibdir)"
++ test -z "$(clock_appletlibdir)" || $(mkdir_p) "$(DESTDIR)$(clock_appletlibdir)"
+ @list='$(clock_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- 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 $(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"; \
+ else :; fi; \
+ done
+
+ uninstall-clock_appletlibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(clock_appletlib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(clock_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- 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)$(clock_appletlibdir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(clock_appletlibdir)/$$p"; \
+ done
+
+ clean-clock_appletlibLTLIBRARIES:
+@@ -602,18 +612,18 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libclock-applet.la: $(libclock_applet_la_OBJECTS) $(libclock_applet_la_DEPENDENCIES)
+- $(libclock_applet_la_LINK) $(am_libclock_applet_la_rpath) $(libclock_applet_la_OBJECTS) $(libclock_applet_la_LIBADD) $(LIBS)
++ $(LINK) $(am_libclock_applet_la_rpath) $(libclock_applet_la_LDFLAGS) $(libclock_applet_la_OBJECTS) $(libclock_applet_la_LIBADD) $(LIBS)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
++ test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+ @list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- 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; \
++ 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; \
+ else :; fi; \
+ done
+
+@@ -633,10 +643,10 @@
+ done
+ clock-applet$(EXEEXT): $(clock_applet_OBJECTS) $(clock_applet_DEPENDENCIES)
+ @rm -f clock-applet$(EXEEXT)
+- $(clock_applet_LINK) $(clock_applet_OBJECTS) $(clock_applet_LDADD) $(LIBS)
++ $(LINK) $(clock_applet_LDFLAGS) $(clock_applet_OBJECTS) $(clock_applet_LDADD) $(LIBS)
+ gnome-clock-applet-mechanism$(EXEEXT): $(gnome_clock_applet_mechanism_OBJECTS) $(gnome_clock_applet_mechanism_DEPENDENCIES)
+ @rm -f gnome-clock-applet-mechanism$(EXEEXT)
+- $(LINK) $(gnome_clock_applet_mechanism_OBJECTS) $(gnome_clock_applet_mechanism_LDADD) $(LIBS)
++ $(LINK) $(gnome_clock_applet_mechanism_LDFLAGS) $(gnome_clock_applet_mechanism_OBJECTS) $(gnome_clock_applet_mechanism_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -656,7 +666,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clock_applet-clock-typebuiltins.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clock_applet-clock-utils.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clock_applet-clock.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clock_applet-obox.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clock_applet-set-timezone-dummy.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clock_applet-set-timezone.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clock_applet-system-timezone.Po at am__quote@
+@@ -674,365 +683,343 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclock_applet_la-clock-typebuiltins.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclock_applet_la-clock-utils.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclock_applet_la-clock.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclock_applet_la-obox.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclock_applet_la-set-timezone-dummy.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclock_applet_la-set-timezone.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libclock_applet_la-system-timezone.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/system-timezone.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ libclock_applet_la-calendar-window.lo: calendar-window.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-window.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-calendar-window.Tpo -c -o libclock_applet_la-calendar-window.lo `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-calendar-window.Tpo $(DEPDIR)/libclock_applet_la-calendar-window.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-window.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-calendar-window.Tpo" -c -o libclock_applet_la-calendar-window.lo `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-calendar-window.Tpo" "$(DEPDIR)/libclock_applet_la-calendar-window.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-calendar-window.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-window.c' object='libclock_applet_la-calendar-window.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-window.lo `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c
+-
+-libclock_applet_la-obox.lo: obox.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-obox.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-obox.Tpo -c -o libclock_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-obox.Tpo $(DEPDIR)/libclock_applet_la-obox.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='libclock_applet_la-obox.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-window.lo `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c
+
+ libclock_applet_la-clock.lo: clock.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock.Tpo -c -o libclock_applet_la-clock.lo `test -f 'clock.c' || echo '$(srcdir)/'`clock.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock.Tpo $(DEPDIR)/libclock_applet_la-clock.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock.Tpo" -c -o libclock_applet_la-clock.lo `test -f 'clock.c' || echo '$(srcdir)/'`clock.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock.Tpo" "$(DEPDIR)/libclock_applet_la-clock.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock.c' object='libclock_applet_la-clock.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock.lo `test -f 'clock.c' || echo '$(srcdir)/'`clock.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock.lo `test -f 'clock.c' || echo '$(srcdir)/'`clock.c
+
+ libclock_applet_la-clock-face.lo: clock-face.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-face.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock-face.Tpo -c -o libclock_applet_la-clock-face.lo `test -f 'clock-face.c' || echo '$(srcdir)/'`clock-face.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock-face.Tpo $(DEPDIR)/libclock_applet_la-clock-face.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-face.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock-face.Tpo" -c -o libclock_applet_la-clock-face.lo `test -f 'clock-face.c' || echo '$(srcdir)/'`clock-face.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock-face.Tpo" "$(DEPDIR)/libclock_applet_la-clock-face.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock-face.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-face.c' object='libclock_applet_la-clock-face.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-face.lo `test -f 'clock-face.c' || echo '$(srcdir)/'`clock-face.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-face.lo `test -f 'clock-face.c' || echo '$(srcdir)/'`clock-face.c
+
+ libclock_applet_la-clock-location.lo: clock-location.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-location.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock-location.Tpo -c -o libclock_applet_la-clock-location.lo `test -f 'clock-location.c' || echo '$(srcdir)/'`clock-location.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock-location.Tpo $(DEPDIR)/libclock_applet_la-clock-location.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-location.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock-location.Tpo" -c -o libclock_applet_la-clock-location.lo `test -f 'clock-location.c' || echo '$(srcdir)/'`clock-location.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock-location.Tpo" "$(DEPDIR)/libclock_applet_la-clock-location.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock-location.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-location.c' object='libclock_applet_la-clock-location.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-location.lo `test -f 'clock-location.c' || echo '$(srcdir)/'`clock-location.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-location.lo `test -f 'clock-location.c' || echo '$(srcdir)/'`clock-location.c
+
+ libclock_applet_la-clock-location-tile.lo: clock-location-tile.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-location-tile.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock-location-tile.Tpo -c -o libclock_applet_la-clock-location-tile.lo `test -f 'clock-location-tile.c' || echo '$(srcdir)/'`clock-location-tile.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock-location-tile.Tpo $(DEPDIR)/libclock_applet_la-clock-location-tile.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-location-tile.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock-location-tile.Tpo" -c -o libclock_applet_la-clock-location-tile.lo `test -f 'clock-location-tile.c' || echo '$(srcdir)/'`clock-location-tile.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock-location-tile.Tpo" "$(DEPDIR)/libclock_applet_la-clock-location-tile.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock-location-tile.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-location-tile.c' object='libclock_applet_la-clock-location-tile.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-location-tile.lo `test -f 'clock-location-tile.c' || echo '$(srcdir)/'`clock-location-tile.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-location-tile.lo `test -f 'clock-location-tile.c' || echo '$(srcdir)/'`clock-location-tile.c
+
+ libclock_applet_la-clock-map.lo: clock-map.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-map.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock-map.Tpo -c -o libclock_applet_la-clock-map.lo `test -f 'clock-map.c' || echo '$(srcdir)/'`clock-map.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock-map.Tpo $(DEPDIR)/libclock_applet_la-clock-map.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-map.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock-map.Tpo" -c -o libclock_applet_la-clock-map.lo `test -f 'clock-map.c' || echo '$(srcdir)/'`clock-map.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock-map.Tpo" "$(DEPDIR)/libclock_applet_la-clock-map.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock-map.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-map.c' object='libclock_applet_la-clock-map.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-map.lo `test -f 'clock-map.c' || echo '$(srcdir)/'`clock-map.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-map.lo `test -f 'clock-map.c' || echo '$(srcdir)/'`clock-map.c
+
+ libclock_applet_la-clock-sunpos.lo: clock-sunpos.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-sunpos.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock-sunpos.Tpo -c -o libclock_applet_la-clock-sunpos.lo `test -f 'clock-sunpos.c' || echo '$(srcdir)/'`clock-sunpos.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock-sunpos.Tpo $(DEPDIR)/libclock_applet_la-clock-sunpos.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-sunpos.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock-sunpos.Tpo" -c -o libclock_applet_la-clock-sunpos.lo `test -f 'clock-sunpos.c' || echo '$(srcdir)/'`clock-sunpos.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock-sunpos.Tpo" "$(DEPDIR)/libclock_applet_la-clock-sunpos.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock-sunpos.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-sunpos.c' object='libclock_applet_la-clock-sunpos.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-sunpos.lo `test -f 'clock-sunpos.c' || echo '$(srcdir)/'`clock-sunpos.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-sunpos.lo `test -f 'clock-sunpos.c' || echo '$(srcdir)/'`clock-sunpos.c
+
+ libclock_applet_la-clock-utils.lo: clock-utils.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-utils.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock-utils.Tpo -c -o libclock_applet_la-clock-utils.lo `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock-utils.Tpo $(DEPDIR)/libclock_applet_la-clock-utils.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-utils.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock-utils.Tpo" -c -o libclock_applet_la-clock-utils.lo `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock-utils.Tpo" "$(DEPDIR)/libclock_applet_la-clock-utils.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock-utils.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-utils.c' object='libclock_applet_la-clock-utils.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-utils.lo `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-utils.lo `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c
+
+ libclock_applet_la-system-timezone.lo: system-timezone.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-system-timezone.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-system-timezone.Tpo -c -o libclock_applet_la-system-timezone.lo `test -f 'system-timezone.c' || echo '$(srcdir)/'`system-timezone.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-system-timezone.Tpo $(DEPDIR)/libclock_applet_la-system-timezone.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-system-timezone.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-system-timezone.Tpo" -c -o libclock_applet_la-system-timezone.lo `test -f 'system-timezone.c' || echo '$(srcdir)/'`system-timezone.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-system-timezone.Tpo" "$(DEPDIR)/libclock_applet_la-system-timezone.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-system-timezone.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='system-timezone.c' object='libclock_applet_la-system-timezone.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-system-timezone.lo `test -f 'system-timezone.c' || echo '$(srcdir)/'`system-timezone.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-system-timezone.lo `test -f 'system-timezone.c' || echo '$(srcdir)/'`system-timezone.c
+
+ libclock_applet_la-clock-marshallers.lo: clock-marshallers.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-marshallers.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock-marshallers.Tpo -c -o libclock_applet_la-clock-marshallers.lo `test -f 'clock-marshallers.c' || echo '$(srcdir)/'`clock-marshallers.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock-marshallers.Tpo $(DEPDIR)/libclock_applet_la-clock-marshallers.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-marshallers.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock-marshallers.Tpo" -c -o libclock_applet_la-clock-marshallers.lo `test -f 'clock-marshallers.c' || echo '$(srcdir)/'`clock-marshallers.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock-marshallers.Tpo" "$(DEPDIR)/libclock_applet_la-clock-marshallers.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock-marshallers.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-marshallers.c' object='libclock_applet_la-clock-marshallers.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-marshallers.lo `test -f 'clock-marshallers.c' || echo '$(srcdir)/'`clock-marshallers.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-marshallers.lo `test -f 'clock-marshallers.c' || echo '$(srcdir)/'`clock-marshallers.c
+
+ libclock_applet_la-clock-typebuiltins.lo: clock-typebuiltins.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-typebuiltins.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-clock-typebuiltins.Tpo -c -o libclock_applet_la-clock-typebuiltins.lo `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-clock-typebuiltins.Tpo $(DEPDIR)/libclock_applet_la-clock-typebuiltins.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-clock-typebuiltins.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-clock-typebuiltins.Tpo" -c -o libclock_applet_la-clock-typebuiltins.lo `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-clock-typebuiltins.Tpo" "$(DEPDIR)/libclock_applet_la-clock-typebuiltins.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-clock-typebuiltins.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-typebuiltins.c' object='libclock_applet_la-clock-typebuiltins.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-typebuiltins.lo `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-clock-typebuiltins.lo `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c
+
+ libclock_applet_la-calendar-client.lo: calendar-client.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-client.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-calendar-client.Tpo -c -o libclock_applet_la-calendar-client.lo `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-calendar-client.Tpo $(DEPDIR)/libclock_applet_la-calendar-client.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-client.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-calendar-client.Tpo" -c -o libclock_applet_la-calendar-client.lo `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-calendar-client.Tpo" "$(DEPDIR)/libclock_applet_la-calendar-client.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-calendar-client.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-client.c' object='libclock_applet_la-calendar-client.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-client.lo `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-client.lo `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c
+
+ libclock_applet_la-calendar-sources.lo: calendar-sources.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-sources.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-calendar-sources.Tpo -c -o libclock_applet_la-calendar-sources.lo `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-calendar-sources.Tpo $(DEPDIR)/libclock_applet_la-calendar-sources.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-calendar-sources.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-calendar-sources.Tpo" -c -o libclock_applet_la-calendar-sources.lo `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-calendar-sources.Tpo" "$(DEPDIR)/libclock_applet_la-calendar-sources.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-calendar-sources.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-sources.c' object='libclock_applet_la-calendar-sources.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-sources.lo `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-calendar-sources.lo `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c
+
+ libclock_applet_la-set-timezone-dummy.lo: set-timezone-dummy.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-set-timezone-dummy.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-set-timezone-dummy.Tpo -c -o libclock_applet_la-set-timezone-dummy.lo `test -f 'set-timezone-dummy.c' || echo '$(srcdir)/'`set-timezone-dummy.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-set-timezone-dummy.Tpo $(DEPDIR)/libclock_applet_la-set-timezone-dummy.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-set-timezone-dummy.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-set-timezone-dummy.Tpo" -c -o libclock_applet_la-set-timezone-dummy.lo `test -f 'set-timezone-dummy.c' || echo '$(srcdir)/'`set-timezone-dummy.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-set-timezone-dummy.Tpo" "$(DEPDIR)/libclock_applet_la-set-timezone-dummy.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-set-timezone-dummy.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='set-timezone-dummy.c' object='libclock_applet_la-set-timezone-dummy.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-set-timezone-dummy.lo `test -f 'set-timezone-dummy.c' || echo '$(srcdir)/'`set-timezone-dummy.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-set-timezone-dummy.lo `test -f 'set-timezone-dummy.c' || echo '$(srcdir)/'`set-timezone-dummy.c
+
+ libclock_applet_la-set-timezone.lo: set-timezone.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-set-timezone.lo -MD -MP -MF $(DEPDIR)/libclock_applet_la-set-timezone.Tpo -c -o libclock_applet_la-set-timezone.lo `test -f 'set-timezone.c' || echo '$(srcdir)/'`set-timezone.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libclock_applet_la-set-timezone.Tpo $(DEPDIR)/libclock_applet_la-set-timezone.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -MT libclock_applet_la-set-timezone.lo -MD -MP -MF "$(DEPDIR)/libclock_applet_la-set-timezone.Tpo" -c -o libclock_applet_la-set-timezone.lo `test -f 'set-timezone.c' || echo '$(srcdir)/'`set-timezone.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libclock_applet_la-set-timezone.Tpo" "$(DEPDIR)/libclock_applet_la-set-timezone.Plo"; else rm -f "$(DEPDIR)/libclock_applet_la-set-timezone.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='set-timezone.c' object='libclock_applet_la-set-timezone.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-set-timezone.lo `test -f 'set-timezone.c' || echo '$(srcdir)/'`set-timezone.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclock_applet_la_CFLAGS) $(CFLAGS) -c -o libclock_applet_la-set-timezone.lo `test -f 'set-timezone.c' || echo '$(srcdir)/'`set-timezone.c
+
+ clock_applet-calendar-window.o: calendar-window.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-window.o -MD -MP -MF $(DEPDIR)/clock_applet-calendar-window.Tpo -c -o clock_applet-calendar-window.o `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-window.Tpo $(DEPDIR)/clock_applet-calendar-window.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-window.o -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-window.Tpo" -c -o clock_applet-calendar-window.o `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-window.Tpo" "$(DEPDIR)/clock_applet-calendar-window.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-window.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-window.c' object='clock_applet-calendar-window.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-window.o `test -f 'calendar-window.c' || echo '$(srcdir)/'`calendar-window.c
+
+ clock_applet-calendar-window.obj: calendar-window.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-window.obj -MD -MP -MF $(DEPDIR)/clock_applet-calendar-window.Tpo -c -o clock_applet-calendar-window.obj `if test -f 'calendar-window.c'; then $(CYGPATH_W) 'calendar-window.c'; else $(CYGPATH_W) '$(srcdir)/calendar-window.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-window.Tpo $(DEPDIR)/clock_applet-calendar-window.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-window.obj -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-window.Tpo" -c -o clock_applet-calendar-window.obj `if test -f 'calendar-window.c'; then $(CYGPATH_W) 'calendar-window.c'; else $(CYGPATH_W) '$(srcdir)/calendar-window.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-window.Tpo" "$(DEPDIR)/clock_applet-calendar-window.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-window.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-window.c' object='clock_applet-calendar-window.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-window.obj `if test -f 'calendar-window.c'; then $(CYGPATH_W) 'calendar-window.c'; else $(CYGPATH_W) '$(srcdir)/calendar-window.c'; fi`
+
+-clock_applet-obox.o: obox.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-obox.o -MD -MP -MF $(DEPDIR)/clock_applet-obox.Tpo -c -o clock_applet-obox.o `test -f 'obox.c' || echo '$(srcdir)/'`obox.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-obox.Tpo $(DEPDIR)/clock_applet-obox.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='clock_applet-obox.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-obox.o `test -f 'obox.c' || echo '$(srcdir)/'`obox.c
+-
+-clock_applet-obox.obj: obox.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-obox.obj -MD -MP -MF $(DEPDIR)/clock_applet-obox.Tpo -c -o clock_applet-obox.obj `if test -f 'obox.c'; then $(CYGPATH_W) 'obox.c'; else $(CYGPATH_W) '$(srcdir)/obox.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-obox.Tpo $(DEPDIR)/clock_applet-obox.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='clock_applet-obox.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-obox.obj `if test -f 'obox.c'; then $(CYGPATH_W) 'obox.c'; else $(CYGPATH_W) '$(srcdir)/obox.c'; fi`
+-
+ clock_applet-clock.o: clock.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock.o -MD -MP -MF $(DEPDIR)/clock_applet-clock.Tpo -c -o clock_applet-clock.o `test -f 'clock.c' || echo '$(srcdir)/'`clock.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock.Tpo $(DEPDIR)/clock_applet-clock.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock.Tpo" -c -o clock_applet-clock.o `test -f 'clock.c' || echo '$(srcdir)/'`clock.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock.Tpo" "$(DEPDIR)/clock_applet-clock.Po"; else rm -f "$(DEPDIR)/clock_applet-clock.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock.c' object='clock_applet-clock.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock.o `test -f 'clock.c' || echo '$(srcdir)/'`clock.c
+
+ clock_applet-clock.obj: clock.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock.Tpo -c -o clock_applet-clock.obj `if test -f 'clock.c'; then $(CYGPATH_W) 'clock.c'; else $(CYGPATH_W) '$(srcdir)/clock.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock.Tpo $(DEPDIR)/clock_applet-clock.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock.Tpo" -c -o clock_applet-clock.obj `if test -f 'clock.c'; then $(CYGPATH_W) 'clock.c'; else $(CYGPATH_W) '$(srcdir)/clock.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock.Tpo" "$(DEPDIR)/clock_applet-clock.Po"; else rm -f "$(DEPDIR)/clock_applet-clock.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock.c' object='clock_applet-clock.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock.obj `if test -f 'clock.c'; then $(CYGPATH_W) 'clock.c'; else $(CYGPATH_W) '$(srcdir)/clock.c'; fi`
+
+ clock_applet-clock-face.o: clock-face.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-face.o -MD -MP -MF $(DEPDIR)/clock_applet-clock-face.Tpo -c -o clock_applet-clock-face.o `test -f 'clock-face.c' || echo '$(srcdir)/'`clock-face.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-face.Tpo $(DEPDIR)/clock_applet-clock-face.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-face.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock-face.Tpo" -c -o clock_applet-clock-face.o `test -f 'clock-face.c' || echo '$(srcdir)/'`clock-face.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-face.Tpo" "$(DEPDIR)/clock_applet-clock-face.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-face.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-face.c' object='clock_applet-clock-face.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-face.o `test -f 'clock-face.c' || echo '$(srcdir)/'`clock-face.c
+
+ clock_applet-clock-face.obj: clock-face.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-face.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock-face.Tpo -c -o clock_applet-clock-face.obj `if test -f 'clock-face.c'; then $(CYGPATH_W) 'clock-face.c'; else $(CYGPATH_W) '$(srcdir)/clock-face.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-face.Tpo $(DEPDIR)/clock_applet-clock-face.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-face.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock-face.Tpo" -c -o clock_applet-clock-face.obj `if test -f 'clock-face.c'; then $(CYGPATH_W) 'clock-face.c'; else $(CYGPATH_W) '$(srcdir)/clock-face.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-face.Tpo" "$(DEPDIR)/clock_applet-clock-face.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-face.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-face.c' object='clock_applet-clock-face.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-face.obj `if test -f 'clock-face.c'; then $(CYGPATH_W) 'clock-face.c'; else $(CYGPATH_W) '$(srcdir)/clock-face.c'; fi`
+
+ clock_applet-clock-location.o: clock-location.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-location.o -MD -MP -MF $(DEPDIR)/clock_applet-clock-location.Tpo -c -o clock_applet-clock-location.o `test -f 'clock-location.c' || echo '$(srcdir)/'`clock-location.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-location.Tpo $(DEPDIR)/clock_applet-clock-location.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-location.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock-location.Tpo" -c -o clock_applet-clock-location.o `test -f 'clock-location.c' || echo '$(srcdir)/'`clock-location.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-location.Tpo" "$(DEPDIR)/clock_applet-clock-location.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-location.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-location.c' object='clock_applet-clock-location.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-location.o `test -f 'clock-location.c' || echo '$(srcdir)/'`clock-location.c
+
+ clock_applet-clock-location.obj: clock-location.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-location.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock-location.Tpo -c -o clock_applet-clock-location.obj `if test -f 'clock-location.c'; then $(CYGPATH_W) 'clock-location.c'; else $(CYGPATH_W) '$(srcdir)/clock-location.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-location.Tpo $(DEPDIR)/clock_applet-clock-location.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-location.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock-location.Tpo" -c -o clock_applet-clock-location.obj `if test -f 'clock-location.c'; then $(CYGPATH_W) 'clock-location.c'; else $(CYGPATH_W) '$(srcdir)/clock-location.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-location.Tpo" "$(DEPDIR)/clock_applet-clock-location.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-location.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-location.c' object='clock_applet-clock-location.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-location.obj `if test -f 'clock-location.c'; then $(CYGPATH_W) 'clock-location.c'; else $(CYGPATH_W) '$(srcdir)/clock-location.c'; fi`
+
+ clock_applet-clock-location-tile.o: clock-location-tile.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-location-tile.o -MD -MP -MF $(DEPDIR)/clock_applet-clock-location-tile.Tpo -c -o clock_applet-clock-location-tile.o `test -f 'clock-location-tile.c' || echo '$(srcdir)/'`clock-location-tile.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-location-tile.Tpo $(DEPDIR)/clock_applet-clock-location-tile.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-location-tile.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock-location-tile.Tpo" -c -o clock_applet-clock-location-tile.o `test -f 'clock-location-tile.c' || echo '$(srcdir)/'`clock-location-tile.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-location-tile.Tpo" "$(DEPDIR)/clock_applet-clock-location-tile.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-location-tile.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-location-tile.c' object='clock_applet-clock-location-tile.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-location-tile.o `test -f 'clock-location-tile.c' || echo '$(srcdir)/'`clock-location-tile.c
+
+ clock_applet-clock-location-tile.obj: clock-location-tile.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-location-tile.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock-location-tile.Tpo -c -o clock_applet-clock-location-tile.obj `if test -f 'clock-location-tile.c'; then $(CYGPATH_W) 'clock-location-tile.c'; else $(CYGPATH_W) '$(srcdir)/clock-location-tile.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-location-tile.Tpo $(DEPDIR)/clock_applet-clock-location-tile.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-location-tile.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock-location-tile.Tpo" -c -o clock_applet-clock-location-tile.obj `if test -f 'clock-location-tile.c'; then $(CYGPATH_W) 'clock-location-tile.c'; else $(CYGPATH_W) '$(srcdir)/clock-location-tile.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-location-tile.Tpo" "$(DEPDIR)/clock_applet-clock-location-tile.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-location-tile.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-location-tile.c' object='clock_applet-clock-location-tile.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-location-tile.obj `if test -f 'clock-location-tile.c'; then $(CYGPATH_W) 'clock-location-tile.c'; else $(CYGPATH_W) '$(srcdir)/clock-location-tile.c'; fi`
+
+ clock_applet-clock-map.o: clock-map.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-map.o -MD -MP -MF $(DEPDIR)/clock_applet-clock-map.Tpo -c -o clock_applet-clock-map.o `test -f 'clock-map.c' || echo '$(srcdir)/'`clock-map.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-map.Tpo $(DEPDIR)/clock_applet-clock-map.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-map.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock-map.Tpo" -c -o clock_applet-clock-map.o `test -f 'clock-map.c' || echo '$(srcdir)/'`clock-map.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-map.Tpo" "$(DEPDIR)/clock_applet-clock-map.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-map.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-map.c' object='clock_applet-clock-map.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-map.o `test -f 'clock-map.c' || echo '$(srcdir)/'`clock-map.c
+
+ clock_applet-clock-map.obj: clock-map.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-map.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock-map.Tpo -c -o clock_applet-clock-map.obj `if test -f 'clock-map.c'; then $(CYGPATH_W) 'clock-map.c'; else $(CYGPATH_W) '$(srcdir)/clock-map.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-map.Tpo $(DEPDIR)/clock_applet-clock-map.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-map.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock-map.Tpo" -c -o clock_applet-clock-map.obj `if test -f 'clock-map.c'; then $(CYGPATH_W) 'clock-map.c'; else $(CYGPATH_W) '$(srcdir)/clock-map.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-map.Tpo" "$(DEPDIR)/clock_applet-clock-map.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-map.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-map.c' object='clock_applet-clock-map.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-map.obj `if test -f 'clock-map.c'; then $(CYGPATH_W) 'clock-map.c'; else $(CYGPATH_W) '$(srcdir)/clock-map.c'; fi`
+
+ clock_applet-clock-sunpos.o: clock-sunpos.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-sunpos.o -MD -MP -MF $(DEPDIR)/clock_applet-clock-sunpos.Tpo -c -o clock_applet-clock-sunpos.o `test -f 'clock-sunpos.c' || echo '$(srcdir)/'`clock-sunpos.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-sunpos.Tpo $(DEPDIR)/clock_applet-clock-sunpos.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-sunpos.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock-sunpos.Tpo" -c -o clock_applet-clock-sunpos.o `test -f 'clock-sunpos.c' || echo '$(srcdir)/'`clock-sunpos.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-sunpos.Tpo" "$(DEPDIR)/clock_applet-clock-sunpos.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-sunpos.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-sunpos.c' object='clock_applet-clock-sunpos.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-sunpos.o `test -f 'clock-sunpos.c' || echo '$(srcdir)/'`clock-sunpos.c
+
+ clock_applet-clock-sunpos.obj: clock-sunpos.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-sunpos.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock-sunpos.Tpo -c -o clock_applet-clock-sunpos.obj `if test -f 'clock-sunpos.c'; then $(CYGPATH_W) 'clock-sunpos.c'; else $(CYGPATH_W) '$(srcdir)/clock-sunpos.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-sunpos.Tpo $(DEPDIR)/clock_applet-clock-sunpos.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-sunpos.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock-sunpos.Tpo" -c -o clock_applet-clock-sunpos.obj `if test -f 'clock-sunpos.c'; then $(CYGPATH_W) 'clock-sunpos.c'; else $(CYGPATH_W) '$(srcdir)/clock-sunpos.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-sunpos.Tpo" "$(DEPDIR)/clock_applet-clock-sunpos.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-sunpos.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-sunpos.c' object='clock_applet-clock-sunpos.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-sunpos.obj `if test -f 'clock-sunpos.c'; then $(CYGPATH_W) 'clock-sunpos.c'; else $(CYGPATH_W) '$(srcdir)/clock-sunpos.c'; fi`
+
+ clock_applet-clock-utils.o: clock-utils.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-utils.o -MD -MP -MF $(DEPDIR)/clock_applet-clock-utils.Tpo -c -o clock_applet-clock-utils.o `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-utils.Tpo $(DEPDIR)/clock_applet-clock-utils.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-utils.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock-utils.Tpo" -c -o clock_applet-clock-utils.o `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-utils.Tpo" "$(DEPDIR)/clock_applet-clock-utils.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-utils.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-utils.c' object='clock_applet-clock-utils.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-utils.o `test -f 'clock-utils.c' || echo '$(srcdir)/'`clock-utils.c
+
+ clock_applet-clock-utils.obj: clock-utils.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-utils.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock-utils.Tpo -c -o clock_applet-clock-utils.obj `if test -f 'clock-utils.c'; then $(CYGPATH_W) 'clock-utils.c'; else $(CYGPATH_W) '$(srcdir)/clock-utils.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-utils.Tpo $(DEPDIR)/clock_applet-clock-utils.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-utils.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock-utils.Tpo" -c -o clock_applet-clock-utils.obj `if test -f 'clock-utils.c'; then $(CYGPATH_W) 'clock-utils.c'; else $(CYGPATH_W) '$(srcdir)/clock-utils.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-utils.Tpo" "$(DEPDIR)/clock_applet-clock-utils.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-utils.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-utils.c' object='clock_applet-clock-utils.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-utils.obj `if test -f 'clock-utils.c'; then $(CYGPATH_W) 'clock-utils.c'; else $(CYGPATH_W) '$(srcdir)/clock-utils.c'; fi`
+
+ clock_applet-system-timezone.o: system-timezone.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-system-timezone.o -MD -MP -MF $(DEPDIR)/clock_applet-system-timezone.Tpo -c -o clock_applet-system-timezone.o `test -f 'system-timezone.c' || echo '$(srcdir)/'`system-timezone.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-system-timezone.Tpo $(DEPDIR)/clock_applet-system-timezone.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-system-timezone.o -MD -MP -MF "$(DEPDIR)/clock_applet-system-timezone.Tpo" -c -o clock_applet-system-timezone.o `test -f 'system-timezone.c' || echo '$(srcdir)/'`system-timezone.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-system-timezone.Tpo" "$(DEPDIR)/clock_applet-system-timezone.Po"; else rm -f "$(DEPDIR)/clock_applet-system-timezone.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='system-timezone.c' object='clock_applet-system-timezone.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-system-timezone.o `test -f 'system-timezone.c' || echo '$(srcdir)/'`system-timezone.c
+
+ clock_applet-system-timezone.obj: system-timezone.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-system-timezone.obj -MD -MP -MF $(DEPDIR)/clock_applet-system-timezone.Tpo -c -o clock_applet-system-timezone.obj `if test -f 'system-timezone.c'; then $(CYGPATH_W) 'system-timezone.c'; else $(CYGPATH_W) '$(srcdir)/system-timezone.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-system-timezone.Tpo $(DEPDIR)/clock_applet-system-timezone.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-system-timezone.obj -MD -MP -MF "$(DEPDIR)/clock_applet-system-timezone.Tpo" -c -o clock_applet-system-timezone.obj `if test -f 'system-timezone.c'; then $(CYGPATH_W) 'system-timezone.c'; else $(CYGPATH_W) '$(srcdir)/system-timezone.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-system-timezone.Tpo" "$(DEPDIR)/clock_applet-system-timezone.Po"; else rm -f "$(DEPDIR)/clock_applet-system-timezone.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='system-timezone.c' object='clock_applet-system-timezone.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-system-timezone.obj `if test -f 'system-timezone.c'; then $(CYGPATH_W) 'system-timezone.c'; else $(CYGPATH_W) '$(srcdir)/system-timezone.c'; fi`
+
+ clock_applet-clock-marshallers.o: clock-marshallers.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-marshallers.o -MD -MP -MF $(DEPDIR)/clock_applet-clock-marshallers.Tpo -c -o clock_applet-clock-marshallers.o `test -f 'clock-marshallers.c' || echo '$(srcdir)/'`clock-marshallers.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-marshallers.Tpo $(DEPDIR)/clock_applet-clock-marshallers.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-marshallers.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock-marshallers.Tpo" -c -o clock_applet-clock-marshallers.o `test -f 'clock-marshallers.c' || echo '$(srcdir)/'`clock-marshallers.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-marshallers.Tpo" "$(DEPDIR)/clock_applet-clock-marshallers.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-marshallers.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-marshallers.c' object='clock_applet-clock-marshallers.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-marshallers.o `test -f 'clock-marshallers.c' || echo '$(srcdir)/'`clock-marshallers.c
+
+ clock_applet-clock-marshallers.obj: clock-marshallers.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-marshallers.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock-marshallers.Tpo -c -o clock_applet-clock-marshallers.obj `if test -f 'clock-marshallers.c'; then $(CYGPATH_W) 'clock-marshallers.c'; else $(CYGPATH_W) '$(srcdir)/clock-marshallers.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-marshallers.Tpo $(DEPDIR)/clock_applet-clock-marshallers.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-marshallers.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock-marshallers.Tpo" -c -o clock_applet-clock-marshallers.obj `if test -f 'clock-marshallers.c'; then $(CYGPATH_W) 'clock-marshallers.c'; else $(CYGPATH_W) '$(srcdir)/clock-marshallers.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-marshallers.Tpo" "$(DEPDIR)/clock_applet-clock-marshallers.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-marshallers.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-marshallers.c' object='clock_applet-clock-marshallers.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-marshallers.obj `if test -f 'clock-marshallers.c'; then $(CYGPATH_W) 'clock-marshallers.c'; else $(CYGPATH_W) '$(srcdir)/clock-marshallers.c'; fi`
+
+ clock_applet-clock-typebuiltins.o: clock-typebuiltins.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-typebuiltins.o -MD -MP -MF $(DEPDIR)/clock_applet-clock-typebuiltins.Tpo -c -o clock_applet-clock-typebuiltins.o `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-typebuiltins.Tpo $(DEPDIR)/clock_applet-clock-typebuiltins.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-typebuiltins.o -MD -MP -MF "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo" -c -o clock_applet-clock-typebuiltins.o `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo" "$(DEPDIR)/clock_applet-clock-typebuiltins.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-typebuiltins.c' object='clock_applet-clock-typebuiltins.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-typebuiltins.o `test -f 'clock-typebuiltins.c' || echo '$(srcdir)/'`clock-typebuiltins.c
+
+ clock_applet-clock-typebuiltins.obj: clock-typebuiltins.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-typebuiltins.obj -MD -MP -MF $(DEPDIR)/clock_applet-clock-typebuiltins.Tpo -c -o clock_applet-clock-typebuiltins.obj `if test -f 'clock-typebuiltins.c'; then $(CYGPATH_W) 'clock-typebuiltins.c'; else $(CYGPATH_W) '$(srcdir)/clock-typebuiltins.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-clock-typebuiltins.Tpo $(DEPDIR)/clock_applet-clock-typebuiltins.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-clock-typebuiltins.obj -MD -MP -MF "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo" -c -o clock_applet-clock-typebuiltins.obj `if test -f 'clock-typebuiltins.c'; then $(CYGPATH_W) 'clock-typebuiltins.c'; else $(CYGPATH_W) '$(srcdir)/clock-typebuiltins.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo" "$(DEPDIR)/clock_applet-clock-typebuiltins.Po"; else rm -f "$(DEPDIR)/clock_applet-clock-typebuiltins.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='clock-typebuiltins.c' object='clock_applet-clock-typebuiltins.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-clock-typebuiltins.obj `if test -f 'clock-typebuiltins.c'; then $(CYGPATH_W) 'clock-typebuiltins.c'; else $(CYGPATH_W) '$(srcdir)/clock-typebuiltins.c'; fi`
+
+ clock_applet-calendar-client.o: calendar-client.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-client.o -MD -MP -MF $(DEPDIR)/clock_applet-calendar-client.Tpo -c -o clock_applet-calendar-client.o `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-client.Tpo $(DEPDIR)/clock_applet-calendar-client.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-client.o -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-client.Tpo" -c -o clock_applet-calendar-client.o `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-client.Tpo" "$(DEPDIR)/clock_applet-calendar-client.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-client.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-client.c' object='clock_applet-calendar-client.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-client.o `test -f 'calendar-client.c' || echo '$(srcdir)/'`calendar-client.c
+
+ clock_applet-calendar-client.obj: calendar-client.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-client.obj -MD -MP -MF $(DEPDIR)/clock_applet-calendar-client.Tpo -c -o clock_applet-calendar-client.obj `if test -f 'calendar-client.c'; then $(CYGPATH_W) 'calendar-client.c'; else $(CYGPATH_W) '$(srcdir)/calendar-client.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-client.Tpo $(DEPDIR)/clock_applet-calendar-client.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-client.obj -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-client.Tpo" -c -o clock_applet-calendar-client.obj `if test -f 'calendar-client.c'; then $(CYGPATH_W) 'calendar-client.c'; else $(CYGPATH_W) '$(srcdir)/calendar-client.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-client.Tpo" "$(DEPDIR)/clock_applet-calendar-client.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-client.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-client.c' object='clock_applet-calendar-client.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-client.obj `if test -f 'calendar-client.c'; then $(CYGPATH_W) 'calendar-client.c'; else $(CYGPATH_W) '$(srcdir)/calendar-client.c'; fi`
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-- [$4])
--else
-- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-- AC_MSG_RESULT([yes])
-- ifelse([$3], , :, [$3])
--fi[]dnl
--])# PKG_CHECK_MODULES
-+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
+ clock_applet-calendar-sources.o: calendar-sources.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-sources.o -MD -MP -MF $(DEPDIR)/clock_applet-calendar-sources.Tpo -c -o clock_applet-calendar-sources.o `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-sources.Tpo $(DEPDIR)/clock_applet-calendar-sources.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-sources.o -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-sources.Tpo" -c -o clock_applet-calendar-sources.o `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-sources.Tpo" "$(DEPDIR)/clock_applet-calendar-sources.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-sources.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-sources.c' object='clock_applet-calendar-sources.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-sources.o `test -f 'calendar-sources.c' || echo '$(srcdir)/'`calendar-sources.c
- m4_include([m4/d-type.m4])
- m4_include([m4/gnome-doc-utils.m4])
-Index: gnome-panel-2.24.2/applets/clock/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/applets/clock/Makefile.in 2008-12-27 18:41:52.859989118 +0100
-+++ gnome-panel-2.24.2/applets/clock/Makefile.in 2008-12-28 02:39:35.551481403 +0100
-@@ -293,6 +293,8 @@ LIBS = @LIBS@
- 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@
-@@ -395,7 +397,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = pixmaps
-Index: gnome-panel-2.24.2/applets/clock/pixmaps/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/applets/clock/pixmaps/Makefile.in 2008-12-27 18:41:52.815989601 +0100
-+++ gnome-panel-2.24.2/applets/clock/pixmaps/Makefile.in 2008-12-28 02:39:35.639481414 +0100
-@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ clock_applet-calendar-sources.obj: calendar-sources.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-sources.obj -MD -MP -MF $(DEPDIR)/clock_applet-calendar-sources.Tpo -c -o clock_applet-calendar-sources.obj `if test -f 'calendar-sources.c'; then $(CYGPATH_W) 'calendar-sources.c'; else $(CYGPATH_W) '$(srcdir)/calendar-sources.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-calendar-sources.Tpo $(DEPDIR)/clock_applet-calendar-sources.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-calendar-sources.obj -MD -MP -MF "$(DEPDIR)/clock_applet-calendar-sources.Tpo" -c -o clock_applet-calendar-sources.obj `if test -f 'calendar-sources.c'; then $(CYGPATH_W) 'calendar-sources.c'; else $(CYGPATH_W) '$(srcdir)/calendar-sources.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-calendar-sources.Tpo" "$(DEPDIR)/clock_applet-calendar-sources.Po"; else rm -f "$(DEPDIR)/clock_applet-calendar-sources.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='calendar-sources.c' object='clock_applet-calendar-sources.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-calendar-sources.obj `if test -f 'calendar-sources.c'; then $(CYGPATH_W) 'calendar-sources.c'; else $(CYGPATH_W) '$(srcdir)/calendar-sources.c'; fi`
+
+ clock_applet-set-timezone-dummy.o: set-timezone-dummy.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-set-timezone-dummy.o -MD -MP -MF $(DEPDIR)/clock_applet-set-timezone-dummy.Tpo -c -o clock_applet-set-timezone-dummy.o `test -f 'set-timezone-dummy.c' || echo '$(srcdir)/'`set-timezone-dummy.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-set-timezone-dummy.Tpo $(DEPDIR)/clock_applet-set-timezone-dummy.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-set-timezone-dummy.o -MD -MP -MF "$(DEPDIR)/clock_applet-set-timezone-dummy.Tpo" -c -o clock_applet-set-timezone-dummy.o `test -f 'set-timezone-dummy.c' || echo '$(srcdir)/'`set-timezone-dummy.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-set-timezone-dummy.Tpo" "$(DEPDIR)/clock_applet-set-timezone-dummy.Po"; else rm -f "$(DEPDIR)/clock_applet-set-timezone-dummy.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='set-timezone-dummy.c' object='clock_applet-set-timezone-dummy.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-set-timezone-dummy.o `test -f 'set-timezone-dummy.c' || echo '$(srcdir)/'`set-timezone-dummy.c
+
+ clock_applet-set-timezone-dummy.obj: set-timezone-dummy.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-set-timezone-dummy.obj -MD -MP -MF $(DEPDIR)/clock_applet-set-timezone-dummy.Tpo -c -o clock_applet-set-timezone-dummy.obj `if test -f 'set-timezone-dummy.c'; then $(CYGPATH_W) 'set-timezone-dummy.c'; else $(CYGPATH_W) '$(srcdir)/set-timezone-dummy.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-set-timezone-dummy.Tpo $(DEPDIR)/clock_applet-set-timezone-dummy.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-set-timezone-dummy.obj -MD -MP -MF "$(DEPDIR)/clock_applet-set-timezone-dummy.Tpo" -c -o clock_applet-set-timezone-dummy.obj `if test -f 'set-timezone-dummy.c'; then $(CYGPATH_W) 'set-timezone-dummy.c'; else $(CYGPATH_W) '$(srcdir)/set-timezone-dummy.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-set-timezone-dummy.Tpo" "$(DEPDIR)/clock_applet-set-timezone-dummy.Po"; else rm -f "$(DEPDIR)/clock_applet-set-timezone-dummy.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='set-timezone-dummy.c' object='clock_applet-set-timezone-dummy.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-set-timezone-dummy.obj `if test -f 'set-timezone-dummy.c'; then $(CYGPATH_W) 'set-timezone-dummy.c'; else $(CYGPATH_W) '$(srcdir)/set-timezone-dummy.c'; fi`
+
+ clock_applet-set-timezone.o: set-timezone.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-set-timezone.o -MD -MP -MF $(DEPDIR)/clock_applet-set-timezone.Tpo -c -o clock_applet-set-timezone.o `test -f 'set-timezone.c' || echo '$(srcdir)/'`set-timezone.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-set-timezone.Tpo $(DEPDIR)/clock_applet-set-timezone.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-set-timezone.o -MD -MP -MF "$(DEPDIR)/clock_applet-set-timezone.Tpo" -c -o clock_applet-set-timezone.o `test -f 'set-timezone.c' || echo '$(srcdir)/'`set-timezone.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-set-timezone.Tpo" "$(DEPDIR)/clock_applet-set-timezone.Po"; else rm -f "$(DEPDIR)/clock_applet-set-timezone.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='set-timezone.c' object='clock_applet-set-timezone.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-set-timezone.o `test -f 'set-timezone.c' || echo '$(srcdir)/'`set-timezone.c
+
+ clock_applet-set-timezone.obj: set-timezone.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-set-timezone.obj -MD -MP -MF $(DEPDIR)/clock_applet-set-timezone.Tpo -c -o clock_applet-set-timezone.obj `if test -f 'set-timezone.c'; then $(CYGPATH_W) 'set-timezone.c'; else $(CYGPATH_W) '$(srcdir)/set-timezone.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/clock_applet-set-timezone.Tpo $(DEPDIR)/clock_applet-set-timezone.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -MT clock_applet-set-timezone.obj -MD -MP -MF "$(DEPDIR)/clock_applet-set-timezone.Tpo" -c -o clock_applet-set-timezone.obj `if test -f 'set-timezone.c'; then $(CYGPATH_W) 'set-timezone.c'; else $(CYGPATH_W) '$(srcdir)/set-timezone.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/clock_applet-set-timezone.Tpo" "$(DEPDIR)/clock_applet-set-timezone.Po"; else rm -f "$(DEPDIR)/clock_applet-set-timezone.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='set-timezone.c' object='clock_applet-set-timezone.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clock_applet_CFLAGS) $(CFLAGS) -c -o clock_applet-set-timezone.obj `if test -f 'set-timezone.c'; then $(CYGPATH_W) 'set-timezone.c'; else $(CYGPATH_W) '$(srcdir)/set-timezone.c'; fi`
+@@ -1042,9 +1029,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-dbus_confDATA: $(dbus_conf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(dbus_confdir)" || $(MKDIR_P) "$(DESTDIR)$(dbus_confdir)"
++ test -z "$(dbus_confdir)" || $(mkdir_p) "$(DESTDIR)$(dbus_confdir)"
+ @list='$(dbus_conf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -1061,7 +1052,7 @@
+ done
+ install-dbus_servicesDATA: $(dbus_services_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(dbus_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(dbus_servicesdir)"
++ test -z "$(dbus_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(dbus_servicesdir)"
+ @list='$(dbus_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -1078,7 +1069,7 @@
+ done
+ install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
++ test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -1095,7 +1086,7 @@
+ done
+ install-polkitDATA: $(polkit_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(polkitdir)" || $(MKDIR_P) "$(DESTDIR)$(polkitdir)"
++ test -z "$(polkitdir)" || $(mkdir_p) "$(DESTDIR)$(polkitdir)"
+ @list='$(polkit_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -1112,7 +1103,7 @@
+ done
+ install-schemasDATA: $(schemas_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
++ test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
+ @list='$(schemas_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -1129,7 +1120,7 @@
+ done
+ install-serverDATA: $(server_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
++ test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
+ @list='$(server_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -1146,7 +1137,7 @@
+ done
+ install-uiDATA: $(ui_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
++ test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)"
+ @list='$(ui_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -1193,7 +1184,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -1237,8 +1229,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -1263,8 +1255,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -1274,12 +1266,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -1293,21 +1286,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -1321,7 +1315,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -1329,8 +1323,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1342,7 +1334,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(clock_appletlibdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(dbus_confdir)" "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(polkitdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+@@ -1380,7 +1372,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -1397,20 +1389,12 @@
+ install-gladeDATA install-polkitDATA install-schemasDATA \
+ install-serverDATA install-uiDATA
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am: install-libexecPROGRAMS
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -1433,35 +1417,32 @@
+
+ uninstall-am: uninstall-clock_appletlibLTLIBRARIES \
+ uninstall-dbus_confDATA uninstall-dbus_servicesDATA \
+- uninstall-gladeDATA uninstall-libexecPROGRAMS \
+- uninstall-polkitDATA uninstall-schemasDATA \
+- uninstall-serverDATA uninstall-uiDATA
+-
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
+-
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean \
+- clean-clock_appletlibLTLIBRARIES clean-generic \
+- clean-libexecPROGRAMS clean-libtool ctags ctags-recursive \
+- distclean distclean-compile distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am \
++ uninstall-gladeDATA uninstall-info-am \
++ uninstall-libexecPROGRAMS uninstall-polkitDATA \
++ uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA
++
++uninstall-info: uninstall-info-recursive
++
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-clock_appletlibLTLIBRARIES clean-generic \
++ clean-libexecPROGRAMS clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-recursive distclean-tags distdir \
++ dvi dvi-am html html-am info info-am install install-am \
+ install-clock_appletlibLTLIBRARIES install-data \
+ install-data-am install-data-local install-dbus_confDATA \
+- install-dbus_servicesDATA install-dvi install-dvi-am \
+- install-exec install-exec-am install-gladeDATA install-html \
+- install-html-am install-info install-info-am \
+- install-libexecPROGRAMS install-man install-pdf install-pdf-am \
+- install-polkitDATA install-ps install-ps-am \
++ install-dbus_servicesDATA install-exec install-exec-am \
++ install-gladeDATA install-info install-info-am \
++ install-libexecPROGRAMS install-man install-polkitDATA \
+ install-schemasDATA install-serverDATA install-strip \
+ install-uiDATA installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-clock_appletlibLTLIBRARIES \
+- uninstall-dbus_confDATA uninstall-dbus_servicesDATA \
+- uninstall-gladeDATA uninstall-libexecPROGRAMS \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++ uninstall-clock_appletlibLTLIBRARIES uninstall-dbus_confDATA \
++ uninstall-dbus_servicesDATA uninstall-gladeDATA \
++ uninstall-info-am uninstall-libexecPROGRAMS \
+ uninstall-polkitDATA uninstall-schemasDATA \
+ uninstall-serverDATA uninstall-uiDATA
+
+--- gnome-panel-2.24.2.orig/applets/clock/pixmaps/Makefile.in
++++ gnome-panel-2.24.2/applets/clock/pixmaps/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -14,11 +14,15 @@
+
+ @SET_MAKE@
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,6 +63,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -75,6 +81,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -100,12 +108,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -114,9 +130,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -154,10 +177,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -10999,20 +11161,311 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -165,6 +191,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -200,6 +228,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -207,13 +237,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -225,7 +255,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -253,12 +282,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
icondir = $(datadir)/gnome-panel/pixmaps
-Index: gnome-panel-2.24.2/applets/fish/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/applets/fish/Makefile.in 2008-12-27 18:41:52.787987020 +0100
-+++ gnome-panel-2.24.2/applets/fish/Makefile.in 2008-12-28 02:39:35.791481390 +0100
-@@ -209,6 +209,8 @@ LIBS = @LIBS@
+ icon_DATA = \
+ clock-calendar-icon.png \
+@@ -316,9 +341,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-iconDATA: $(icon_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
++ test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
+ @list='$(icon_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -341,21 +370,22 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -371,7 +401,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(icondir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -404,7 +434,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -418,20 +448,12 @@
+
+ install-data-am: install-iconDATA
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -450,21 +472,17 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-iconDATA
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-iconDATA uninstall-info-am
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
++ install-data install-data-am install-exec install-exec-am \
+ install-iconDATA install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-iconDATA
++ uninstall uninstall-am uninstall-iconDATA uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/applets/fish/Makefile.in
++++ gnome-panel-2.24.2/applets/fish/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -16,11 +16,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,10 +73,6 @@
+ @FISH_INPROCESS_TRUE at am_libfish_applet_2_la_OBJECTS = \
+ @FISH_INPROCESS_TRUE@ $(am__objects_1)
+ libfish_applet_2_la_OBJECTS = $(am_libfish_applet_2_la_OBJECTS)
+-libfish_applet_2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+- $(libfish_applet_2_la_CFLAGS) $(CFLAGS) \
+- $(libfish_applet_2_la_LDFLAGS) $(LDFLAGS) -o $@
+ @FISH_INPROCESS_TRUE at am_libfish_applet_2_la_rpath = -rpath \
+ @FISH_INPROCESS_TRUE@ $(fish_applet_2libdir)
+ libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@@ -83,21 +83,17 @@
+ fish_applet_2_OBJECTS = $(am_fish_applet_2_OBJECTS)
+ @FISH_INPROCESS_FALSE at fish_applet_2_DEPENDENCIES = \
+ @FISH_INPROCESS_FALSE@ $(am__DEPENDENCIES_2)
+-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. at am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libfish_applet_2_la_SOURCES) $(fish_applet_2_SOURCES)
+ DIST_SOURCES = $(am__libfish_applet_2_la_SOURCES_DIST) \
+ $(am__fish_applet_2_SOURCES_DIST)
+@@ -114,6 +110,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -130,6 +128,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -155,12 +155,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -169,9 +177,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -209,10 +224,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -11020,20 +11473,497 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -311,7 +313,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -220,6 +238,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -255,6 +275,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -262,13 +284,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -280,7 +302,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -308,12 +329,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
INCLUDES = \
-Index: gnome-panel-2.24.2/applets/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/applets/Makefile.in 2008-12-27 18:41:52.763990395 +0100
-+++ gnome-panel-2.24.2/applets/Makefile.in 2008-12-28 02:39:35.203480958 +0100
-@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ -I$(srcdir) \
+ -I$(srcdir)/../../libpanel-applet \
+@@ -407,21 +424,21 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-fish_applet_2libLTLIBRARIES: $(fish_applet_2lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(fish_applet_2libdir)" || $(MKDIR_P) "$(DESTDIR)$(fish_applet_2libdir)"
++ test -z "$(fish_applet_2libdir)" || $(mkdir_p) "$(DESTDIR)$(fish_applet_2libdir)"
+ @list='$(fish_applet_2lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- 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"; \
++ 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"; \
+ else :; fi; \
+ done
+
+ uninstall-fish_applet_2libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(fish_applet_2lib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(fish_applet_2lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- 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"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(fish_applet_2libdir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(fish_applet_2libdir)/$$p"; \
+ done
+
+ clean-fish_applet_2libLTLIBRARIES:
+@@ -433,18 +450,18 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libfish-applet-2.la: $(libfish_applet_2_la_OBJECTS) $(libfish_applet_2_la_DEPENDENCIES)
+- $(libfish_applet_2_la_LINK) $(am_libfish_applet_2_la_rpath) $(libfish_applet_2_la_OBJECTS) $(libfish_applet_2_la_LIBADD) $(LIBS)
++ $(LINK) $(am_libfish_applet_2_la_rpath) $(libfish_applet_2_la_LDFLAGS) $(libfish_applet_2_la_OBJECTS) $(libfish_applet_2_la_LIBADD) $(LIBS)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
++ test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+ @list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- 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; \
++ 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; \
+ else :; fi; \
+ done
+
+@@ -464,7 +481,7 @@
+ done
+ fish-applet-2$(EXEEXT): $(fish_applet_2_OBJECTS) $(fish_applet_2_DEPENDENCIES)
+ @rm -f fish-applet-2$(EXEEXT)
+- $(fish_applet_2_LINK) $(fish_applet_2_OBJECTS) $(fish_applet_2_LDADD) $(LIBS)
++ $(LINK) $(fish_applet_2_LDFLAGS) $(fish_applet_2_OBJECTS) $(fish_applet_2_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -476,43 +493,43 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libfish_applet_2_la-fish.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ libfish_applet_2_la-fish.lo: fish.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfish_applet_2_la_CFLAGS) $(CFLAGS) -MT libfish_applet_2_la-fish.lo -MD -MP -MF $(DEPDIR)/libfish_applet_2_la-fish.Tpo -c -o libfish_applet_2_la-fish.lo `test -f 'fish.c' || echo '$(srcdir)/'`fish.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libfish_applet_2_la-fish.Tpo $(DEPDIR)/libfish_applet_2_la-fish.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfish_applet_2_la_CFLAGS) $(CFLAGS) -MT libfish_applet_2_la-fish.lo -MD -MP -MF "$(DEPDIR)/libfish_applet_2_la-fish.Tpo" -c -o libfish_applet_2_la-fish.lo `test -f 'fish.c' || echo '$(srcdir)/'`fish.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libfish_applet_2_la-fish.Tpo" "$(DEPDIR)/libfish_applet_2_la-fish.Plo"; else rm -f "$(DEPDIR)/libfish_applet_2_la-fish.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fish.c' object='libfish_applet_2_la-fish.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfish_applet_2_la_CFLAGS) $(CFLAGS) -c -o libfish_applet_2_la-fish.lo `test -f 'fish.c' || echo '$(srcdir)/'`fish.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfish_applet_2_la_CFLAGS) $(CFLAGS) -c -o libfish_applet_2_la-fish.lo `test -f 'fish.c' || echo '$(srcdir)/'`fish.c
+
+ fish_applet_2-fish.o: fish.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -MT fish_applet_2-fish.o -MD -MP -MF $(DEPDIR)/fish_applet_2-fish.Tpo -c -o fish_applet_2-fish.o `test -f 'fish.c' || echo '$(srcdir)/'`fish.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/fish_applet_2-fish.Tpo $(DEPDIR)/fish_applet_2-fish.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -MT fish_applet_2-fish.o -MD -MP -MF "$(DEPDIR)/fish_applet_2-fish.Tpo" -c -o fish_applet_2-fish.o `test -f 'fish.c' || echo '$(srcdir)/'`fish.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fish_applet_2-fish.Tpo" "$(DEPDIR)/fish_applet_2-fish.Po"; else rm -f "$(DEPDIR)/fish_applet_2-fish.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fish.c' object='fish_applet_2-fish.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -c -o fish_applet_2-fish.o `test -f 'fish.c' || echo '$(srcdir)/'`fish.c
+
+ fish_applet_2-fish.obj: fish.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -MT fish_applet_2-fish.obj -MD -MP -MF $(DEPDIR)/fish_applet_2-fish.Tpo -c -o fish_applet_2-fish.obj `if test -f 'fish.c'; then $(CYGPATH_W) 'fish.c'; else $(CYGPATH_W) '$(srcdir)/fish.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/fish_applet_2-fish.Tpo $(DEPDIR)/fish_applet_2-fish.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -MT fish_applet_2-fish.obj -MD -MP -MF "$(DEPDIR)/fish_applet_2-fish.Tpo" -c -o fish_applet_2-fish.obj `if test -f 'fish.c'; then $(CYGPATH_W) 'fish.c'; else $(CYGPATH_W) '$(srcdir)/fish.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/fish_applet_2-fish.Tpo" "$(DEPDIR)/fish_applet_2-fish.Po"; else rm -f "$(DEPDIR)/fish_applet_2-fish.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fish.c' object='fish_applet_2-fish.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fish_applet_2_CFLAGS) $(CFLAGS) -c -o fish_applet_2-fish.obj `if test -f 'fish.c'; then $(CYGPATH_W) 'fish.c'; else $(CYGPATH_W) '$(srcdir)/fish.c'; fi`
+@@ -522,9 +539,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-fishbitmapsDATA: $(fishbitmaps_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(fishbitmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(fishbitmapsdir)"
++ test -z "$(fishbitmapsdir)" || $(mkdir_p) "$(DESTDIR)$(fishbitmapsdir)"
+ @list='$(fishbitmaps_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -541,7 +562,7 @@
+ done
+ install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
++ test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -558,7 +579,7 @@
+ done
+ install-schemasDATA: $(schemas_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
++ test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
+ @list='$(schemas_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -575,7 +596,7 @@
+ done
+ install-serverDATA: $(server_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
++ test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
+ @list='$(server_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -592,7 +613,7 @@
+ done
+ install-uiDATA: $(ui_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
++ test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)"
+ @list='$(ui_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -613,8 +634,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -626,8 +647,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -637,12 +658,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -656,21 +678,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -686,7 +709,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(fish_applet_2libdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(fishbitmapsdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -722,7 +745,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -739,20 +762,12 @@
+ install-gladeDATA install-schemasDATA install-serverDATA \
+ install-uiDATA
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-libexecPROGRAMS
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -775,10 +790,8 @@
+
+ uninstall-am: uninstall-fish_applet_2libLTLIBRARIES \
+ uninstall-fishbitmapsDATA uninstall-gladeDATA \
+- uninstall-libexecPROGRAMS uninstall-schemasDATA \
+- uninstall-serverDATA uninstall-uiDATA
+-
+-.MAKE: install-am install-strip
++ uninstall-info-am uninstall-libexecPROGRAMS \
++ uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean \
+ clean-fish_applet_2libLTLIBRARIES clean-generic \
+@@ -786,12 +799,10 @@
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-local install-dvi install-dvi-am install-exec \
+- install-exec-am install-fish_applet_2libLTLIBRARIES \
+- install-fishbitmapsDATA install-gladeDATA install-html \
+- install-html-am install-info install-info-am \
+- install-libexecPROGRAMS install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-schemasDATA \
++ install-data-local install-exec install-exec-am \
++ install-fish_applet_2libLTLIBRARIES install-fishbitmapsDATA \
++ install-gladeDATA install-info install-info-am \
++ install-libexecPROGRAMS install-man install-schemasDATA \
+ install-serverDATA install-strip install-uiDATA installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+@@ -799,8 +810,8 @@
+ tags uninstall uninstall-am \
+ uninstall-fish_applet_2libLTLIBRARIES \
+ uninstall-fishbitmapsDATA uninstall-gladeDATA \
+- uninstall-libexecPROGRAMS uninstall-schemasDATA \
+- uninstall-serverDATA uninstall-uiDATA
++ uninstall-info-am uninstall-libexecPROGRAMS \
++ uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA
+
+
+ $(server_in_files): $(server_in_files).in Makefile
+--- gnome-panel-2.24.2.orig/applets/Makefile.in
++++ gnome-panel-2.24.2/applets/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -47,13 +51,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -61,6 +62,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -77,6 +80,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -102,12 +107,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -116,9 +129,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +176,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -11041,20 +11971,412 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -167,6 +190,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -202,6 +227,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -209,13 +236,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -227,7 +254,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -255,12 +281,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
SUBDIRS = \
-Index: gnome-panel-2.24.2/applets/notification_area/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/applets/notification_area/Makefile.in 2008-12-27 18:41:52.715987855 +0100
-+++ gnome-panel-2.24.2/applets/notification_area/Makefile.in 2008-12-28 02:39:35.999481150 +0100
-@@ -231,6 +231,8 @@ LIBS = @LIBS@
+ clock \
+ fish \
+@@ -309,6 +331,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -340,7 +366,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -384,8 +411,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -410,8 +437,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -421,12 +448,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -440,21 +468,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -468,7 +497,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -476,8 +505,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -517,7 +544,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -531,20 +559,12 @@
+
+ install-data-am: install-data-local
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -563,24 +583,22 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-data-local install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am
++ install-data-am install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+ install-data-local:
+ if test -f $(DESTDIR)$(gen_util_server); then \
+--- gnome-panel-2.24.2.orig/applets/notification_area/Makefile.in
++++ gnome-panel-2.24.2/applets/notification_area/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -16,11 +16,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,11 +69,10 @@
+ @NOTIFICATION_AREA_INPROCESS_TRUE at libnotification_area_applet_la_DEPENDENCIES = \
+ @NOTIFICATION_AREA_INPROCESS_TRUE@ $(am__DEPENDENCIES_2)
+ am__libnotification_area_applet_la_SOURCES_DIST = fixedtip.h \
+- fixedtip.c main.c obox.c obox.h na-tray.c na-tray.h \
+- na-tray-manager.c na-tray-manager.h na-marshal.c na-marshal.h
++ fixedtip.c main.c na-tray.c na-tray.h na-tray-manager.c \
++ na-tray-manager.h na-marshal.c na-marshal.h
+ am__objects_1 = libnotification_area_applet_la-fixedtip.lo \
+ libnotification_area_applet_la-main.lo \
+- libnotification_area_applet_la-obox.lo \
+ libnotification_area_applet_la-na-tray.lo \
+ libnotification_area_applet_la-na-tray-manager.lo \
+ libnotification_area_applet_la-na-marshal.lo
+@@ -77,21 +80,16 @@
+ @NOTIFICATION_AREA_INPROCESS_TRUE@ $(am__objects_1)
+ libnotification_area_applet_la_OBJECTS = \
+ $(am_libnotification_area_applet_la_OBJECTS)
+-libnotification_area_applet_la_LINK = $(LIBTOOL) --tag=CC \
+- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+- $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) \
+- $(libnotification_area_applet_la_LDFLAGS) $(LDFLAGS) -o $@
+ @NOTIFICATION_AREA_INPROCESS_TRUE at am_libnotification_area_applet_la_rpath = \
+ @NOTIFICATION_AREA_INPROCESS_TRUE@ -rpath \
+ @NOTIFICATION_AREA_INPROCESS_TRUE@ $(notification_area_appletlibdir)
+ libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+ am__notification_area_applet_SOURCES_DIST = fixedtip.h fixedtip.c \
+- main.c obox.c obox.h na-tray.c na-tray.h na-tray-manager.c \
+- na-tray-manager.h na-marshal.c na-marshal.h
++ main.c na-tray.c na-tray.h na-tray-manager.c na-tray-manager.h \
++ na-marshal.c na-marshal.h
+ am__objects_2 = notification_area_applet-fixedtip.$(OBJEXT) \
+ notification_area_applet-main.$(OBJEXT) \
+- notification_area_applet-obox.$(OBJEXT) \
+ notification_area_applet-na-tray.$(OBJEXT) \
+ notification_area_applet-na-tray-manager.$(OBJEXT) \
+ notification_area_applet-na-marshal.$(OBJEXT)
+@@ -101,27 +99,21 @@
+ $(am_notification_area_applet_OBJECTS)
+ @NOTIFICATION_AREA_INPROCESS_FALSE at notification_area_applet_DEPENDENCIES = \
+ @NOTIFICATION_AREA_INPROCESS_FALSE@ $(am__DEPENDENCIES_2)
+-notification_area_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+- $(notification_area_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
+ am_testtray_OBJECTS = fixedtip.$(OBJEXT) na-marshal.$(OBJEXT) \
+- na-tray.$(OBJEXT) na-tray-manager.$(OBJEXT) obox.$(OBJEXT) \
+- testtray.$(OBJEXT)
++ na-tray.$(OBJEXT) na-tray-manager.$(OBJEXT) testtray.$(OBJEXT)
+ testtray_OBJECTS = $(am_testtray_OBJECTS)
+ testtray_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libnotification_area_applet_la_SOURCES) \
+ $(notification_area_applet_SOURCES) $(testtray_SOURCES)
+ DIST_SOURCES = $(am__libnotification_area_applet_la_SOURCES_DIST) \
+@@ -136,6 +128,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -152,6 +146,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -177,12 +173,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -191,9 +195,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -231,10 +242,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -11062,20 +12384,657 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -333,7 +335,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -242,6 +256,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -277,6 +293,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -284,13 +302,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -302,7 +320,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -330,12 +347,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
INCLUDES = \
-Index: gnome-panel-2.24.2/applets/wncklet/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/applets/wncklet/Makefile.in 2008-12-27 18:41:52.687989185 +0100
-+++ gnome-panel-2.24.2/applets/wncklet/Makefile.in 2008-12-28 02:39:36.191482019 +0100
-@@ -219,6 +219,8 @@ LIBS = @LIBS@
+ -I$(srcdir) \
+ -I$(srcdir)/../../libpanel-applet \
+@@ -356,8 +369,6 @@
+ fixedtip.h \
+ fixedtip.c \
+ main.c \
+- obox.c \
+- obox.h \
+ na-tray.c \
+ na-tray.h \
+ na-tray-manager.c \
+@@ -407,8 +418,6 @@
+ na-tray.h \
+ na-tray-manager.c \
+ na-tray-manager.h \
+- obox.c \
+- obox.h \
+ testtray.c
+
+ testtray_LDADD = \
+@@ -451,21 +460,21 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-notification_area_appletlibLTLIBRARIES: $(notification_area_appletlib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(notification_area_appletlibdir)" || $(MKDIR_P) "$(DESTDIR)$(notification_area_appletlibdir)"
++ test -z "$(notification_area_appletlibdir)" || $(mkdir_p) "$(DESTDIR)$(notification_area_appletlibdir)"
+ @list='$(notification_area_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- 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"; \
++ 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"; \
+ else :; fi; \
+ done
+
+ uninstall-notification_area_appletlibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(notification_area_appletlib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(notification_area_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- 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"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(notification_area_appletlibdir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(notification_area_appletlibdir)/$$p"; \
+ done
+
+ clean-notification_area_appletlibLTLIBRARIES:
+@@ -477,18 +486,18 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libnotification-area-applet.la: $(libnotification_area_applet_la_OBJECTS) $(libnotification_area_applet_la_DEPENDENCIES)
+- $(libnotification_area_applet_la_LINK) $(am_libnotification_area_applet_la_rpath) $(libnotification_area_applet_la_OBJECTS) $(libnotification_area_applet_la_LIBADD) $(LIBS)
++ $(LINK) $(am_libnotification_area_applet_la_rpath) $(libnotification_area_applet_la_LDFLAGS) $(libnotification_area_applet_la_OBJECTS) $(libnotification_area_applet_la_LIBADD) $(LIBS)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
++ test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+ @list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- 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; \
++ 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; \
+ else :; fi; \
+ done
+
+@@ -515,10 +524,10 @@
+ done
+ notification-area-applet$(EXEEXT): $(notification_area_applet_OBJECTS) $(notification_area_applet_DEPENDENCIES)
+ @rm -f notification-area-applet$(EXEEXT)
+- $(notification_area_applet_LINK) $(notification_area_applet_OBJECTS) $(notification_area_applet_LDADD) $(LIBS)
++ $(LINK) $(notification_area_applet_LDFLAGS) $(notification_area_applet_OBJECTS) $(notification_area_applet_LDADD) $(LIBS)
+ testtray$(EXEEXT): $(testtray_OBJECTS) $(testtray_DEPENDENCIES)
+ @rm -f testtray$(EXEEXT)
+- $(LINK) $(testtray_OBJECTS) $(testtray_LDADD) $(LIBS)
++ $(LINK) $(testtray_LDFLAGS) $(testtray_OBJECTS) $(testtray_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -532,7 +541,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnotification_area_applet_la-na-marshal.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnotification_area_applet_la-na-tray.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libnotification_area_applet_la-obox.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/na-marshal.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/na-tray-manager.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/na-tray.Po at am__quote@
+@@ -541,153 +549,130 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/notification_area_applet-na-marshal.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/notification_area_applet-na-tray-manager.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/notification_area_applet-na-tray.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/notification_area_applet-obox.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/obox.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testtray.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ libnotification_area_applet_la-fixedtip.lo: fixedtip.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-fixedtip.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-fixedtip.Tpo -c -o libnotification_area_applet_la-fixedtip.lo `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-fixedtip.Tpo $(DEPDIR)/libnotification_area_applet_la-fixedtip.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-fixedtip.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-fixedtip.Tpo" -c -o libnotification_area_applet_la-fixedtip.lo `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-fixedtip.Tpo" "$(DEPDIR)/libnotification_area_applet_la-fixedtip.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-fixedtip.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fixedtip.c' object='libnotification_area_applet_la-fixedtip.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-fixedtip.lo `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-fixedtip.lo `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c
+
+ libnotification_area_applet_la-main.lo: main.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-main.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-main.Tpo -c -o libnotification_area_applet_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-main.Tpo $(DEPDIR)/libnotification_area_applet_la-main.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-main.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-main.Tpo" -c -o libnotification_area_applet_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-main.Tpo" "$(DEPDIR)/libnotification_area_applet_la-main.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-main.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='libnotification_area_applet_la-main.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c
+-
+-libnotification_area_applet_la-obox.lo: obox.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-obox.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-obox.Tpo -c -o libnotification_area_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-obox.Tpo $(DEPDIR)/libnotification_area_applet_la-obox.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='libnotification_area_applet_la-obox.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-obox.lo `test -f 'obox.c' || echo '$(srcdir)/'`obox.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c
+
+ libnotification_area_applet_la-na-tray.lo: na-tray.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-tray.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-na-tray.Tpo -c -o libnotification_area_applet_la-na-tray.lo `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-na-tray.Tpo $(DEPDIR)/libnotification_area_applet_la-na-tray.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-tray.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-na-tray.Tpo" -c -o libnotification_area_applet_la-na-tray.lo `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-na-tray.Tpo" "$(DEPDIR)/libnotification_area_applet_la-na-tray.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-na-tray.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray.c' object='libnotification_area_applet_la-na-tray.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-tray.lo `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-tray.lo `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c
+
+ libnotification_area_applet_la-na-tray-manager.lo: na-tray-manager.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-tray-manager.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Tpo -c -o libnotification_area_applet_la-na-tray-manager.lo `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Tpo $(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-tray-manager.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Tpo" -c -o libnotification_area_applet_la-na-tray-manager.lo `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Tpo" "$(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-na-tray-manager.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray-manager.c' object='libnotification_area_applet_la-na-tray-manager.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-tray-manager.lo `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-tray-manager.lo `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c
+
+ libnotification_area_applet_la-na-marshal.lo: na-marshal.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-marshal.lo -MD -MP -MF $(DEPDIR)/libnotification_area_applet_la-na-marshal.Tpo -c -o libnotification_area_applet_la-na-marshal.lo `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnotification_area_applet_la-na-marshal.Tpo $(DEPDIR)/libnotification_area_applet_la-na-marshal.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -MT libnotification_area_applet_la-na-marshal.lo -MD -MP -MF "$(DEPDIR)/libnotification_area_applet_la-na-marshal.Tpo" -c -o libnotification_area_applet_la-na-marshal.lo `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnotification_area_applet_la-na-marshal.Tpo" "$(DEPDIR)/libnotification_area_applet_la-na-marshal.Plo"; else rm -f "$(DEPDIR)/libnotification_area_applet_la-na-marshal.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-marshal.c' object='libnotification_area_applet_la-na-marshal.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-marshal.lo `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnotification_area_applet_la_CFLAGS) $(CFLAGS) -c -o libnotification_area_applet_la-na-marshal.lo `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c
+
+ notification_area_applet-fixedtip.o: fixedtip.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-fixedtip.o -MD -MP -MF $(DEPDIR)/notification_area_applet-fixedtip.Tpo -c -o notification_area_applet-fixedtip.o `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-fixedtip.Tpo $(DEPDIR)/notification_area_applet-fixedtip.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-fixedtip.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-fixedtip.Tpo" -c -o notification_area_applet-fixedtip.o `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-fixedtip.Tpo" "$(DEPDIR)/notification_area_applet-fixedtip.Po"; else rm -f "$(DEPDIR)/notification_area_applet-fixedtip.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fixedtip.c' object='notification_area_applet-fixedtip.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-fixedtip.o `test -f 'fixedtip.c' || echo '$(srcdir)/'`fixedtip.c
+
+ notification_area_applet-fixedtip.obj: fixedtip.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-fixedtip.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-fixedtip.Tpo -c -o notification_area_applet-fixedtip.obj `if test -f 'fixedtip.c'; then $(CYGPATH_W) 'fixedtip.c'; else $(CYGPATH_W) '$(srcdir)/fixedtip.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-fixedtip.Tpo $(DEPDIR)/notification_area_applet-fixedtip.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-fixedtip.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-fixedtip.Tpo" -c -o notification_area_applet-fixedtip.obj `if test -f 'fixedtip.c'; then $(CYGPATH_W) 'fixedtip.c'; else $(CYGPATH_W) '$(srcdir)/fixedtip.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-fixedtip.Tpo" "$(DEPDIR)/notification_area_applet-fixedtip.Po"; else rm -f "$(DEPDIR)/notification_area_applet-fixedtip.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fixedtip.c' object='notification_area_applet-fixedtip.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-fixedtip.obj `if test -f 'fixedtip.c'; then $(CYGPATH_W) 'fixedtip.c'; else $(CYGPATH_W) '$(srcdir)/fixedtip.c'; fi`
+
+ notification_area_applet-main.o: main.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-main.o -MD -MP -MF $(DEPDIR)/notification_area_applet-main.Tpo -c -o notification_area_applet-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-main.Tpo $(DEPDIR)/notification_area_applet-main.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-main.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-main.Tpo" -c -o notification_area_applet-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-main.Tpo" "$(DEPDIR)/notification_area_applet-main.Po"; else rm -f "$(DEPDIR)/notification_area_applet-main.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='notification_area_applet-main.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+
+ notification_area_applet-main.obj: main.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-main.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-main.Tpo -c -o notification_area_applet-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-main.Tpo $(DEPDIR)/notification_area_applet-main.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-main.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-main.Tpo" -c -o notification_area_applet-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-main.Tpo" "$(DEPDIR)/notification_area_applet-main.Po"; else rm -f "$(DEPDIR)/notification_area_applet-main.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='notification_area_applet-main.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+
+-notification_area_applet-obox.o: obox.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-obox.o -MD -MP -MF $(DEPDIR)/notification_area_applet-obox.Tpo -c -o notification_area_applet-obox.o `test -f 'obox.c' || echo '$(srcdir)/'`obox.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-obox.Tpo $(DEPDIR)/notification_area_applet-obox.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='notification_area_applet-obox.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-obox.o `test -f 'obox.c' || echo '$(srcdir)/'`obox.c
+-
+-notification_area_applet-obox.obj: obox.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-obox.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-obox.Tpo -c -o notification_area_applet-obox.obj `if test -f 'obox.c'; then $(CYGPATH_W) 'obox.c'; else $(CYGPATH_W) '$(srcdir)/obox.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-obox.Tpo $(DEPDIR)/notification_area_applet-obox.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='obox.c' object='notification_area_applet-obox.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-obox.obj `if test -f 'obox.c'; then $(CYGPATH_W) 'obox.c'; else $(CYGPATH_W) '$(srcdir)/obox.c'; fi`
+-
+ notification_area_applet-na-tray.o: na-tray.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray.o -MD -MP -MF $(DEPDIR)/notification_area_applet-na-tray.Tpo -c -o notification_area_applet-na-tray.o `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-tray.Tpo $(DEPDIR)/notification_area_applet-na-tray.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-tray.Tpo" -c -o notification_area_applet-na-tray.o `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-tray.Tpo" "$(DEPDIR)/notification_area_applet-na-tray.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-tray.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray.c' object='notification_area_applet-na-tray.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-tray.o `test -f 'na-tray.c' || echo '$(srcdir)/'`na-tray.c
+
+ notification_area_applet-na-tray.obj: na-tray.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-na-tray.Tpo -c -o notification_area_applet-na-tray.obj `if test -f 'na-tray.c'; then $(CYGPATH_W) 'na-tray.c'; else $(CYGPATH_W) '$(srcdir)/na-tray.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-tray.Tpo $(DEPDIR)/notification_area_applet-na-tray.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-tray.Tpo" -c -o notification_area_applet-na-tray.obj `if test -f 'na-tray.c'; then $(CYGPATH_W) 'na-tray.c'; else $(CYGPATH_W) '$(srcdir)/na-tray.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-tray.Tpo" "$(DEPDIR)/notification_area_applet-na-tray.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-tray.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray.c' object='notification_area_applet-na-tray.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-tray.obj `if test -f 'na-tray.c'; then $(CYGPATH_W) 'na-tray.c'; else $(CYGPATH_W) '$(srcdir)/na-tray.c'; fi`
+
+ notification_area_applet-na-tray-manager.o: na-tray-manager.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray-manager.o -MD -MP -MF $(DEPDIR)/notification_area_applet-na-tray-manager.Tpo -c -o notification_area_applet-na-tray-manager.o `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-tray-manager.Tpo $(DEPDIR)/notification_area_applet-na-tray-manager.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray-manager.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo" -c -o notification_area_applet-na-tray-manager.o `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo" "$(DEPDIR)/notification_area_applet-na-tray-manager.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray-manager.c' object='notification_area_applet-na-tray-manager.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-tray-manager.o `test -f 'na-tray-manager.c' || echo '$(srcdir)/'`na-tray-manager.c
+
+ notification_area_applet-na-tray-manager.obj: na-tray-manager.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray-manager.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-na-tray-manager.Tpo -c -o notification_area_applet-na-tray-manager.obj `if test -f 'na-tray-manager.c'; then $(CYGPATH_W) 'na-tray-manager.c'; else $(CYGPATH_W) '$(srcdir)/na-tray-manager.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-tray-manager.Tpo $(DEPDIR)/notification_area_applet-na-tray-manager.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-tray-manager.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo" -c -o notification_area_applet-na-tray-manager.obj `if test -f 'na-tray-manager.c'; then $(CYGPATH_W) 'na-tray-manager.c'; else $(CYGPATH_W) '$(srcdir)/na-tray-manager.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo" "$(DEPDIR)/notification_area_applet-na-tray-manager.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-tray-manager.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-tray-manager.c' object='notification_area_applet-na-tray-manager.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-tray-manager.obj `if test -f 'na-tray-manager.c'; then $(CYGPATH_W) 'na-tray-manager.c'; else $(CYGPATH_W) '$(srcdir)/na-tray-manager.c'; fi`
+
+ notification_area_applet-na-marshal.o: na-marshal.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-marshal.o -MD -MP -MF $(DEPDIR)/notification_area_applet-na-marshal.Tpo -c -o notification_area_applet-na-marshal.o `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-marshal.Tpo $(DEPDIR)/notification_area_applet-na-marshal.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-marshal.o -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-marshal.Tpo" -c -o notification_area_applet-na-marshal.o `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-marshal.Tpo" "$(DEPDIR)/notification_area_applet-na-marshal.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-marshal.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-marshal.c' object='notification_area_applet-na-marshal.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-marshal.o `test -f 'na-marshal.c' || echo '$(srcdir)/'`na-marshal.c
+
+ notification_area_applet-na-marshal.obj: na-marshal.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-marshal.obj -MD -MP -MF $(DEPDIR)/notification_area_applet-na-marshal.Tpo -c -o notification_area_applet-na-marshal.obj `if test -f 'na-marshal.c'; then $(CYGPATH_W) 'na-marshal.c'; else $(CYGPATH_W) '$(srcdir)/na-marshal.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/notification_area_applet-na-marshal.Tpo $(DEPDIR)/notification_area_applet-na-marshal.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -MT notification_area_applet-na-marshal.obj -MD -MP -MF "$(DEPDIR)/notification_area_applet-na-marshal.Tpo" -c -o notification_area_applet-na-marshal.obj `if test -f 'na-marshal.c'; then $(CYGPATH_W) 'na-marshal.c'; else $(CYGPATH_W) '$(srcdir)/na-marshal.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/notification_area_applet-na-marshal.Tpo" "$(DEPDIR)/notification_area_applet-na-marshal.Po"; else rm -f "$(DEPDIR)/notification_area_applet-na-marshal.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='na-marshal.c' object='notification_area_applet-na-marshal.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(notification_area_applet_CFLAGS) $(CFLAGS) -c -o notification_area_applet-na-marshal.obj `if test -f 'na-marshal.c'; then $(CYGPATH_W) 'na-marshal.c'; else $(CYGPATH_W) '$(srcdir)/na-marshal.c'; fi`
+@@ -697,9 +682,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-serverDATA: $(server_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
++ test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
+ @list='$(server_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -716,7 +705,7 @@
+ done
+ install-uiDATA: $(ui_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
++ test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)"
+ @list='$(ui_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -737,8 +726,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -750,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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -761,12 +750,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -780,21 +770,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -811,7 +802,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(notification_area_appletlibdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+@@ -850,7 +841,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -865,20 +856,12 @@
+ install-data-am: install-notification_area_appletlibLTLIBRARIES \
+ install-serverDATA install-uiDATA
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-libexecPROGRAMS
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -899,28 +882,25 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-libexecPROGRAMS \
++uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \
+ uninstall-notification_area_appletlibLTLIBRARIES \
+ uninstall-serverDATA uninstall-uiDATA
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \
+ clean-notification_area_appletlibLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am \
+ install-libexecPROGRAMS install-man \
+- install-notification_area_appletlibLTLIBRARIES install-pdf \
+- install-pdf-am install-ps install-ps-am install-serverDATA \
+- install-strip install-uiDATA installcheck installcheck-am \
+- installdirs maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-libexecPROGRAMS \
++ install-notification_area_appletlibLTLIBRARIES \
++ install-serverDATA install-strip install-uiDATA installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-info-am \
++ uninstall-libexecPROGRAMS \
+ uninstall-notification_area_appletlibLTLIBRARIES \
+ uninstall-serverDATA uninstall-uiDATA
+
+--- gnome-panel-2.24.2.orig/applets/wncklet/Makefile.in
++++ gnome-panel-2.24.2/applets/wncklet/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -16,11 +16,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -75,10 +79,6 @@
+ @WNCKLET_INPROCESS_TRUE at am_libwnck_applet_la_OBJECTS = \
+ @WNCKLET_INPROCESS_TRUE@ $(am__objects_1)
+ libwnck_applet_la_OBJECTS = $(am_libwnck_applet_la_OBJECTS)
+-libwnck_applet_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+- $(libwnck_applet_la_CFLAGS) $(CFLAGS) \
+- $(libwnck_applet_la_LDFLAGS) $(LDFLAGS) -o $@
+ @WNCKLET_INPROCESS_TRUE at am_libwnck_applet_la_rpath = -rpath \
+ @WNCKLET_INPROCESS_TRUE@ $(wnck_appletlibdir)
+ libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@@ -95,21 +95,17 @@
+ wnck_applet_OBJECTS = $(am_wnck_applet_OBJECTS)
+ @WNCKLET_INPROCESS_FALSE at wnck_applet_DEPENDENCIES = \
+ @WNCKLET_INPROCESS_FALSE@ $(am__DEPENDENCIES_2)
+-wnck_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(wnck_applet_CFLAGS) \
+- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libwnck_applet_la_SOURCES) $(wnck_applet_SOURCES)
+ DIST_SOURCES = $(am__libwnck_applet_la_SOURCES_DIST) \
+ $(am__wnck_applet_SOURCES_DIST)
+@@ -124,6 +120,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -140,6 +138,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -165,12 +165,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -179,9 +187,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -219,10 +234,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -11083,19 +13042,497 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -321,7 +323,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -230,6 +248,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -265,6 +285,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -272,13 +294,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -290,7 +312,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -318,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
INCLUDES = \
-Index: gnome-panel-2.24.2/configure
-===================================================================
---- gnome-panel-2.24.2.orig/configure 2008-12-27 18:41:52.643985757 +0100
-+++ gnome-panel-2.24.2/configure 2008-12-28 02:39:42.123483083 +0100
+ -I$(top_builddir) \
+ -I$(top_builddir)/applets/wncklet \
+@@ -427,21 +444,21 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-wnck_appletlibLTLIBRARIES: $(wnck_appletlib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(wnck_appletlibdir)" || $(MKDIR_P) "$(DESTDIR)$(wnck_appletlibdir)"
++ test -z "$(wnck_appletlibdir)" || $(mkdir_p) "$(DESTDIR)$(wnck_appletlibdir)"
+ @list='$(wnck_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- 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"; \
++ 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"; \
+ else :; fi; \
+ done
+
+ uninstall-wnck_appletlibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(wnck_appletlib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(wnck_appletlib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- 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"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(wnck_appletlibdir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(wnck_appletlibdir)/$$p"; \
+ done
+
+ clean-wnck_appletlibLTLIBRARIES:
+@@ -453,18 +470,18 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libwnck-applet.la: $(libwnck_applet_la_OBJECTS) $(libwnck_applet_la_DEPENDENCIES)
+- $(libwnck_applet_la_LINK) $(am_libwnck_applet_la_rpath) $(libwnck_applet_la_OBJECTS) $(libwnck_applet_la_LIBADD) $(LIBS)
++ $(LINK) $(am_libwnck_applet_la_rpath) $(libwnck_applet_la_LDFLAGS) $(libwnck_applet_la_OBJECTS) $(libwnck_applet_la_LIBADD) $(LIBS)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
++ test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+ @list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- 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; \
++ 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; \
+ else :; fi; \
+ done
+
+@@ -484,7 +501,7 @@
+ done
+ wnck-applet$(EXEEXT): $(wnck_applet_OBJECTS) $(wnck_applet_DEPENDENCIES)
+ @rm -f wnck-applet$(EXEEXT)
+- $(wnck_applet_LINK) $(wnck_applet_OBJECTS) $(wnck_applet_LDADD) $(LIBS)
++ $(LINK) $(wnck_applet_LDFLAGS) $(wnck_applet_OBJECTS) $(wnck_applet_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -504,127 +521,127 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wnck_applet-workspace-switcher.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ libwnck_applet_la-wncklet.lo: wncklet.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-wncklet.lo -MD -MP -MF $(DEPDIR)/libwnck_applet_la-wncklet.Tpo -c -o libwnck_applet_la-wncklet.lo `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwnck_applet_la-wncklet.Tpo $(DEPDIR)/libwnck_applet_la-wncklet.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-wncklet.lo -MD -MP -MF "$(DEPDIR)/libwnck_applet_la-wncklet.Tpo" -c -o libwnck_applet_la-wncklet.lo `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwnck_applet_la-wncklet.Tpo" "$(DEPDIR)/libwnck_applet_la-wncklet.Plo"; else rm -f "$(DEPDIR)/libwnck_applet_la-wncklet.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wncklet.c' object='libwnck_applet_la-wncklet.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-wncklet.lo `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-wncklet.lo `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c
+
+ libwnck_applet_la-window-menu.lo: window-menu.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-window-menu.lo -MD -MP -MF $(DEPDIR)/libwnck_applet_la-window-menu.Tpo -c -o libwnck_applet_la-window-menu.lo `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwnck_applet_la-window-menu.Tpo $(DEPDIR)/libwnck_applet_la-window-menu.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-window-menu.lo -MD -MP -MF "$(DEPDIR)/libwnck_applet_la-window-menu.Tpo" -c -o libwnck_applet_la-window-menu.lo `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwnck_applet_la-window-menu.Tpo" "$(DEPDIR)/libwnck_applet_la-window-menu.Plo"; else rm -f "$(DEPDIR)/libwnck_applet_la-window-menu.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-menu.c' object='libwnck_applet_la-window-menu.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-window-menu.lo `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-window-menu.lo `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c
+
+ libwnck_applet_la-window-list.lo: window-list.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-window-list.lo -MD -MP -MF $(DEPDIR)/libwnck_applet_la-window-list.Tpo -c -o libwnck_applet_la-window-list.lo `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwnck_applet_la-window-list.Tpo $(DEPDIR)/libwnck_applet_la-window-list.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-window-list.lo -MD -MP -MF "$(DEPDIR)/libwnck_applet_la-window-list.Tpo" -c -o libwnck_applet_la-window-list.lo `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwnck_applet_la-window-list.Tpo" "$(DEPDIR)/libwnck_applet_la-window-list.Plo"; else rm -f "$(DEPDIR)/libwnck_applet_la-window-list.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-list.c' object='libwnck_applet_la-window-list.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-window-list.lo `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-window-list.lo `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c
+
+ libwnck_applet_la-workspace-switcher.lo: workspace-switcher.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-workspace-switcher.lo -MD -MP -MF $(DEPDIR)/libwnck_applet_la-workspace-switcher.Tpo -c -o libwnck_applet_la-workspace-switcher.lo `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwnck_applet_la-workspace-switcher.Tpo $(DEPDIR)/libwnck_applet_la-workspace-switcher.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-workspace-switcher.lo -MD -MP -MF "$(DEPDIR)/libwnck_applet_la-workspace-switcher.Tpo" -c -o libwnck_applet_la-workspace-switcher.lo `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwnck_applet_la-workspace-switcher.Tpo" "$(DEPDIR)/libwnck_applet_la-workspace-switcher.Plo"; else rm -f "$(DEPDIR)/libwnck_applet_la-workspace-switcher.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='workspace-switcher.c' object='libwnck_applet_la-workspace-switcher.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-workspace-switcher.lo `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-workspace-switcher.lo `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c
+
+ libwnck_applet_la-showdesktop.lo: showdesktop.c
+- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-showdesktop.lo -MD -MP -MF $(DEPDIR)/libwnck_applet_la-showdesktop.Tpo -c -o libwnck_applet_la-showdesktop.lo `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libwnck_applet_la-showdesktop.Tpo $(DEPDIR)/libwnck_applet_la-showdesktop.Plo
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -MT libwnck_applet_la-showdesktop.lo -MD -MP -MF "$(DEPDIR)/libwnck_applet_la-showdesktop.Tpo" -c -o libwnck_applet_la-showdesktop.lo `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libwnck_applet_la-showdesktop.Tpo" "$(DEPDIR)/libwnck_applet_la-showdesktop.Plo"; else rm -f "$(DEPDIR)/libwnck_applet_la-showdesktop.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='showdesktop.c' object='libwnck_applet_la-showdesktop.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-showdesktop.lo `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwnck_applet_la_CFLAGS) $(CFLAGS) -c -o libwnck_applet_la-showdesktop.lo `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c
+
+ wnck_applet-wncklet.o: wncklet.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-wncklet.o -MD -MP -MF $(DEPDIR)/wnck_applet-wncklet.Tpo -c -o wnck_applet-wncklet.o `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-wncklet.Tpo $(DEPDIR)/wnck_applet-wncklet.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-wncklet.o -MD -MP -MF "$(DEPDIR)/wnck_applet-wncklet.Tpo" -c -o wnck_applet-wncklet.o `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-wncklet.Tpo" "$(DEPDIR)/wnck_applet-wncklet.Po"; else rm -f "$(DEPDIR)/wnck_applet-wncklet.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wncklet.c' object='wnck_applet-wncklet.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-wncklet.o `test -f 'wncklet.c' || echo '$(srcdir)/'`wncklet.c
+
+ wnck_applet-wncklet.obj: wncklet.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-wncklet.obj -MD -MP -MF $(DEPDIR)/wnck_applet-wncklet.Tpo -c -o wnck_applet-wncklet.obj `if test -f 'wncklet.c'; then $(CYGPATH_W) 'wncklet.c'; else $(CYGPATH_W) '$(srcdir)/wncklet.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-wncklet.Tpo $(DEPDIR)/wnck_applet-wncklet.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-wncklet.obj -MD -MP -MF "$(DEPDIR)/wnck_applet-wncklet.Tpo" -c -o wnck_applet-wncklet.obj `if test -f 'wncklet.c'; then $(CYGPATH_W) 'wncklet.c'; else $(CYGPATH_W) '$(srcdir)/wncklet.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-wncklet.Tpo" "$(DEPDIR)/wnck_applet-wncklet.Po"; else rm -f "$(DEPDIR)/wnck_applet-wncklet.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wncklet.c' object='wnck_applet-wncklet.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-wncklet.obj `if test -f 'wncklet.c'; then $(CYGPATH_W) 'wncklet.c'; else $(CYGPATH_W) '$(srcdir)/wncklet.c'; fi`
+
+ wnck_applet-window-menu.o: window-menu.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-menu.o -MD -MP -MF $(DEPDIR)/wnck_applet-window-menu.Tpo -c -o wnck_applet-window-menu.o `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-window-menu.Tpo $(DEPDIR)/wnck_applet-window-menu.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-menu.o -MD -MP -MF "$(DEPDIR)/wnck_applet-window-menu.Tpo" -c -o wnck_applet-window-menu.o `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-window-menu.Tpo" "$(DEPDIR)/wnck_applet-window-menu.Po"; else rm -f "$(DEPDIR)/wnck_applet-window-menu.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-menu.c' object='wnck_applet-window-menu.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-window-menu.o `test -f 'window-menu.c' || echo '$(srcdir)/'`window-menu.c
+
+ wnck_applet-window-menu.obj: window-menu.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-menu.obj -MD -MP -MF $(DEPDIR)/wnck_applet-window-menu.Tpo -c -o wnck_applet-window-menu.obj `if test -f 'window-menu.c'; then $(CYGPATH_W) 'window-menu.c'; else $(CYGPATH_W) '$(srcdir)/window-menu.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-window-menu.Tpo $(DEPDIR)/wnck_applet-window-menu.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-menu.obj -MD -MP -MF "$(DEPDIR)/wnck_applet-window-menu.Tpo" -c -o wnck_applet-window-menu.obj `if test -f 'window-menu.c'; then $(CYGPATH_W) 'window-menu.c'; else $(CYGPATH_W) '$(srcdir)/window-menu.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-window-menu.Tpo" "$(DEPDIR)/wnck_applet-window-menu.Po"; else rm -f "$(DEPDIR)/wnck_applet-window-menu.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-menu.c' object='wnck_applet-window-menu.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-window-menu.obj `if test -f 'window-menu.c'; then $(CYGPATH_W) 'window-menu.c'; else $(CYGPATH_W) '$(srcdir)/window-menu.c'; fi`
+
+ wnck_applet-window-list.o: window-list.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-list.o -MD -MP -MF $(DEPDIR)/wnck_applet-window-list.Tpo -c -o wnck_applet-window-list.o `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-window-list.Tpo $(DEPDIR)/wnck_applet-window-list.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-list.o -MD -MP -MF "$(DEPDIR)/wnck_applet-window-list.Tpo" -c -o wnck_applet-window-list.o `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-window-list.Tpo" "$(DEPDIR)/wnck_applet-window-list.Po"; else rm -f "$(DEPDIR)/wnck_applet-window-list.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-list.c' object='wnck_applet-window-list.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-window-list.o `test -f 'window-list.c' || echo '$(srcdir)/'`window-list.c
+
+ wnck_applet-window-list.obj: window-list.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-list.obj -MD -MP -MF $(DEPDIR)/wnck_applet-window-list.Tpo -c -o wnck_applet-window-list.obj `if test -f 'window-list.c'; then $(CYGPATH_W) 'window-list.c'; else $(CYGPATH_W) '$(srcdir)/window-list.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-window-list.Tpo $(DEPDIR)/wnck_applet-window-list.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-window-list.obj -MD -MP -MF "$(DEPDIR)/wnck_applet-window-list.Tpo" -c -o wnck_applet-window-list.obj `if test -f 'window-list.c'; then $(CYGPATH_W) 'window-list.c'; else $(CYGPATH_W) '$(srcdir)/window-list.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-window-list.Tpo" "$(DEPDIR)/wnck_applet-window-list.Po"; else rm -f "$(DEPDIR)/wnck_applet-window-list.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='window-list.c' object='wnck_applet-window-list.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-window-list.obj `if test -f 'window-list.c'; then $(CYGPATH_W) 'window-list.c'; else $(CYGPATH_W) '$(srcdir)/window-list.c'; fi`
+
+ wnck_applet-workspace-switcher.o: workspace-switcher.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-workspace-switcher.o -MD -MP -MF $(DEPDIR)/wnck_applet-workspace-switcher.Tpo -c -o wnck_applet-workspace-switcher.o `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-workspace-switcher.Tpo $(DEPDIR)/wnck_applet-workspace-switcher.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-workspace-switcher.o -MD -MP -MF "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo" -c -o wnck_applet-workspace-switcher.o `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo" "$(DEPDIR)/wnck_applet-workspace-switcher.Po"; else rm -f "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='workspace-switcher.c' object='wnck_applet-workspace-switcher.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-workspace-switcher.o `test -f 'workspace-switcher.c' || echo '$(srcdir)/'`workspace-switcher.c
+
+ wnck_applet-workspace-switcher.obj: workspace-switcher.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-workspace-switcher.obj -MD -MP -MF $(DEPDIR)/wnck_applet-workspace-switcher.Tpo -c -o wnck_applet-workspace-switcher.obj `if test -f 'workspace-switcher.c'; then $(CYGPATH_W) 'workspace-switcher.c'; else $(CYGPATH_W) '$(srcdir)/workspace-switcher.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-workspace-switcher.Tpo $(DEPDIR)/wnck_applet-workspace-switcher.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-workspace-switcher.obj -MD -MP -MF "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo" -c -o wnck_applet-workspace-switcher.obj `if test -f 'workspace-switcher.c'; then $(CYGPATH_W) 'workspace-switcher.c'; else $(CYGPATH_W) '$(srcdir)/workspace-switcher.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo" "$(DEPDIR)/wnck_applet-workspace-switcher.Po"; else rm -f "$(DEPDIR)/wnck_applet-workspace-switcher.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='workspace-switcher.c' object='wnck_applet-workspace-switcher.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-workspace-switcher.obj `if test -f 'workspace-switcher.c'; then $(CYGPATH_W) 'workspace-switcher.c'; else $(CYGPATH_W) '$(srcdir)/workspace-switcher.c'; fi`
+
+ wnck_applet-showdesktop.o: showdesktop.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-showdesktop.o -MD -MP -MF $(DEPDIR)/wnck_applet-showdesktop.Tpo -c -o wnck_applet-showdesktop.o `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-showdesktop.Tpo $(DEPDIR)/wnck_applet-showdesktop.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-showdesktop.o -MD -MP -MF "$(DEPDIR)/wnck_applet-showdesktop.Tpo" -c -o wnck_applet-showdesktop.o `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-showdesktop.Tpo" "$(DEPDIR)/wnck_applet-showdesktop.Po"; else rm -f "$(DEPDIR)/wnck_applet-showdesktop.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='showdesktop.c' object='wnck_applet-showdesktop.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-showdesktop.o `test -f 'showdesktop.c' || echo '$(srcdir)/'`showdesktop.c
+
+ wnck_applet-showdesktop.obj: showdesktop.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-showdesktop.obj -MD -MP -MF $(DEPDIR)/wnck_applet-showdesktop.Tpo -c -o wnck_applet-showdesktop.obj `if test -f 'showdesktop.c'; then $(CYGPATH_W) 'showdesktop.c'; else $(CYGPATH_W) '$(srcdir)/showdesktop.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/wnck_applet-showdesktop.Tpo $(DEPDIR)/wnck_applet-showdesktop.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -MT wnck_applet-showdesktop.obj -MD -MP -MF "$(DEPDIR)/wnck_applet-showdesktop.Tpo" -c -o wnck_applet-showdesktop.obj `if test -f 'showdesktop.c'; then $(CYGPATH_W) 'showdesktop.c'; else $(CYGPATH_W) '$(srcdir)/showdesktop.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/wnck_applet-showdesktop.Tpo" "$(DEPDIR)/wnck_applet-showdesktop.Po"; else rm -f "$(DEPDIR)/wnck_applet-showdesktop.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='showdesktop.c' object='wnck_applet-showdesktop.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(wnck_applet_CFLAGS) $(CFLAGS) -c -o wnck_applet-showdesktop.obj `if test -f 'showdesktop.c'; then $(CYGPATH_W) 'showdesktop.c'; else $(CYGPATH_W) '$(srcdir)/showdesktop.c'; fi`
+@@ -634,9 +651,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
++ test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -653,7 +674,7 @@
+ done
+ install-schemasDATA: $(schemas_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
++ test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
+ @list='$(schemas_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -670,7 +691,7 @@
+ done
+ install-serverDATA: $(server_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
++ test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
+ @list='$(server_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -687,7 +708,7 @@
+ done
+ install-uiDATA: $(ui_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
++ test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)"
+ @list='$(ui_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -708,8 +729,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -721,8 +742,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -732,12 +753,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -751,21 +773,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -781,7 +804,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(wnck_appletlibdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -817,7 +840,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -833,20 +856,12 @@
+ install-schemasDATA install-serverDATA install-uiDATA \
+ install-wnck_appletlibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-libexecPROGRAMS
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -867,28 +882,26 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-gladeDATA uninstall-libexecPROGRAMS \
+- uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA \
++uninstall-am: uninstall-gladeDATA uninstall-info-am \
++ uninstall-libexecPROGRAMS uninstall-schemasDATA \
++ uninstall-serverDATA uninstall-uiDATA \
+ uninstall-wnck_appletlibLTLIBRARIES
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libexecPROGRAMS clean-libtool \
+ clean-wnck_appletlibLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-local install-dvi install-dvi-am install-exec \
+- install-exec-am install-gladeDATA install-html install-html-am \
+- install-info install-info-am install-libexecPROGRAMS \
+- install-man install-pdf install-pdf-am install-ps \
+- install-ps-am install-schemasDATA install-serverDATA \
+- install-strip install-uiDATA install-wnck_appletlibLTLIBRARIES \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-gladeDATA \
++ install-data-local install-exec install-exec-am \
++ install-gladeDATA install-info install-info-am \
++ install-libexecPROGRAMS install-man install-schemasDATA \
++ install-serverDATA install-strip install-uiDATA \
++ install-wnck_appletlibLTLIBRARIES installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++ uninstall-am uninstall-gladeDATA uninstall-info-am \
+ uninstall-libexecPROGRAMS uninstall-schemasDATA \
+ uninstall-serverDATA uninstall-uiDATA \
+ uninstall-wnck_appletlibLTLIBRARIES
+--- gnome-panel-2.24.2.orig/configure
++++ gnome-panel-2.24.2/configure
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -11110,7 +13547,7 @@
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
-@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
+@@ -17,7 +17,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -11119,7 +13556,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -39,45 +39,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
+@@ -39,45 +39,17 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -11174,7 +13611,7 @@
fi
# Support unset when possible.
-@@ -93,6 +65,8 @@ fi
+@@ -93,6 +65,8 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
@@ -11183,7 +13620,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-@@ -115,7 +89,7 @@ if test "x$as_myself" = x; then
+@@ -115,7 +89,7 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
@@ -11192,7 +13629,7 @@
{ (exit 1); exit 1; }
fi
-@@ -128,10 +102,17 @@ PS2='> '
+@@ -128,10 +102,17 @@
PS4='+ '
# NLS nuisances.
@@ -11214,7 +13651,7 @@
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -153,7 +134,7 @@ as_me=`$as_basename -- "$0" ||
+@@ -153,7 +134,7 @@
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
@@ -11223,7 +13660,7 @@
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
-@@ -179,7 +160,7 @@ else
+@@ -179,7 +160,7 @@
as_have_required=no
fi
@@ -11232,7 +13669,7 @@
(as_func_return () {
(exit \$1)
}
-@@ -261,7 +242,7 @@ IFS=$as_save_IFS
+@@ -261,7 +242,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -11241,7 +13678,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -282,7 +263,7 @@ _ASEOF
+@@ -282,7 +263,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -11250,7 +13687,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -362,10 +343,10 @@ fi
+@@ -362,10 +343,10 @@
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
@@ -11265,7 +13702,7 @@
fi
-@@ -434,10 +415,9 @@ fi
+@@ -434,10 +415,9 @@
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
@@ -11279,7 +13716,7 @@
}
-@@ -473,7 +453,7 @@ test \$exitcode = 0") || {
+@@ -473,7 +453,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -11288,7 +13725,7 @@
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
-@@ -501,6 +481,7 @@ case `echo -n x` in
+@@ -501,6 +481,7 @@
*)
ECHO_N='-n';;
esac
@@ -11296,7 +13733,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -513,22 +494,19 @@ if test -d conf$$.dir; then
+@@ -513,22 +494,19 @@
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
@@ -11330,7 +13767,7 @@
else
as_ln_s='cp -p'
fi
-@@ -553,10 +531,10 @@ else
+@@ -553,10 +531,10 @@
as_test_x='
eval sh -c '\''
if test -d "$1"; then
@@ -11343,7 +13780,15 @@
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
-@@ -842,7 +820,6 @@ MAKEINFO
+@@ -830,7 +808,6 @@
+ INSTALL_PROGRAM
+ INSTALL_SCRIPT
+ INSTALL_DATA
+-am__isrc
+ CYGPATH_W
+ PACKAGE
+ VERSION
+@@ -842,7 +819,6 @@
install_sh
STRIP
INSTALL_STRIP_PROGRAM
@@ -11351,7 +13796,7 @@
mkdir_p
AWK
SET_MAKE
-@@ -941,6 +918,8 @@ DISABLE_DEPRECATED_CFLAGS
+@@ -941,6 +917,8 @@
PKG_CONFIG
PANEL_CFLAGS
PANEL_LIBS
@@ -11360,7 +13805,7 @@
LIBPANEL_APPLET_CFLAGS
LIBPANEL_APPLET_LIBS
WNCKLET_CFLAGS
-@@ -1016,38 +995,6 @@ REBUILD
+@@ -1016,38 +994,6 @@
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -11399,7 +13844,7 @@
ac_precious_vars='build_alias
host_alias
target_alias
-@@ -1066,6 +1013,8 @@ FFLAGS
+@@ -1066,6 +1012,8 @@
PKG_CONFIG
PANEL_CFLAGS
PANEL_LIBS
@@ -11408,7 +13853,7 @@
LIBPANEL_APPLET_CFLAGS
LIBPANEL_APPLET_LIBS
WNCKLET_CFLAGS
-@@ -1090,8 +1039,6 @@ XMKMF'
+@@ -1090,8 +1038,6 @@
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
@@ -11417,7 +13862,7 @@
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
-@@ -1190,21 +1137,13 @@ do
+@@ -1190,21 +1136,13 @@
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
@@ -11444,7 +13889,7 @@
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
-@@ -1217,21 +1156,13 @@ do
+@@ -1217,21 +1155,13 @@
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
@@ -11471,7 +13916,7 @@
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -1422,38 +1353,22 @@ do
+@@ -1422,38 +1352,22 @@
ac_init_version=: ;;
-with-* | --with-*)
@@ -11520,7 +13965,7 @@
--x)
# Obsolete; use --with-x.
-@@ -1473,7 +1388,7 @@ do
+@@ -1473,7 +1387,7 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -11529,7 +13974,7 @@
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
-@@ -1482,16 +1397,16 @@ Try \`$0 --help' for more information."
+@@ -1482,16 +1396,16 @@
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
@@ -11549,7 +13994,7 @@
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
-@@ -1500,38 +1415,22 @@ done
+@@ -1500,38 +1414,22 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -11591,7 +14036,7 @@
{ (exit 1); exit 1; }; }
done
-@@ -1546,7 +1445,7 @@ target=$target_alias
+@@ -1546,7 +1444,7 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -11600,7 +14045,7 @@
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
-@@ -1562,10 +1461,10 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1562,10 +1460,10 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -11613,7 +14058,7 @@
{ (exit 1); exit 1; }; }
-@@ -1573,12 +1472,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+@@ -1573,12 +1471,12 @@
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
@@ -11632,7 +14077,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -1605,12 +1504,12 @@ else
+@@ -1605,12 +1503,12 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -11647,7 +14092,7 @@
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
-@@ -1659,9 +1558,9 @@ Configuration:
+@@ -1659,9 +1557,9 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
@@ -11659,7 +14104,7 @@
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-@@ -1671,25 +1570,25 @@ for instance \`--prefix=\$HOME'.
+@@ -1671,25 +1569,25 @@
For better control, use the options below.
Fine tuning of the installation directories:
@@ -11704,7 +14149,7 @@
_ACEOF
cat <<\_ACEOF
-@@ -1716,7 +1615,6 @@ if test -n "$ac_init_help"; then
+@@ -1716,7 +1614,6 @@
cat <<\_ACEOF
Optional Features:
@@ -11712,7 +14157,7 @@
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-maintainer-mode enable make rules and dependencies not useful
-@@ -1786,6 +1684,9 @@ Some influential environment variables:
+@@ -1786,6 +1683,9 @@
PANEL_CFLAGS
C compiler flags for PANEL, overriding pkg-config
PANEL_LIBS linker flags for PANEL, overriding pkg-config
@@ -11722,7 +14167,7 @@
LIBPANEL_APPLET_CFLAGS
C compiler flags for LIBPANEL_APPLET, overriding pkg-config
LIBPANEL_APPLET_LIBS
-@@ -1830,17 +1731,15 @@ fi
+@@ -1830,17 +1730,15 @@
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
@@ -11743,7 +14188,7 @@
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -1876,7 +1775,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -1876,7 +1774,7 @@
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
@@ -11752,7 +14197,7 @@
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
-@@ -1886,10 +1785,10 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1886,10 +1784,10 @@
if $ac_init_version; then
cat <<\_ACEOF
gnome-panel configure 2.24.2
@@ -11765,7 +14210,7 @@
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
-@@ -1900,7 +1799,7 @@ This file contains any messages produced
+@@ -1900,7 +1798,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by gnome-panel $as_me 2.24.2, which was
@@ -11774,7 +14219,7 @@
$ $0 $@
-@@ -1936,7 +1835,7 @@ for as_dir in $PATH
+@@ -1936,7 +1834,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11783,7 +14228,7 @@
done
IFS=$as_save_IFS
-@@ -1971,7 +1870,7 @@ do
+@@ -1971,7 +1869,7 @@
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
@@ -11792,7 +14237,7 @@
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -2023,12 +1922,11 @@ _ASBOX
+@@ -2023,12 +1921,11 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -11807,7 +14252,7 @@
*) $as_unset $ac_var ;;
esac ;;
esac
-@@ -2058,9 +1956,9 @@ _ASBOX
+@@ -2058,9 +1955,9 @@
do
eval ac_val=\$$ac_var
case $ac_val in
@@ -11819,7 +14264,7 @@
done | sort
echo
-@@ -2075,9 +1973,9 @@ _ASBOX
+@@ -2075,9 +1972,9 @@
do
eval ac_val=\$$ac_var
case $ac_val in
@@ -11831,7 +14276,7 @@
done | sort
echo
fi
-@@ -2093,8 +1991,8 @@ _ASBOX
+@@ -2093,8 +1990,8 @@
echo
fi
test "$ac_signal" != 0 &&
@@ -11842,7 +14287,7 @@
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-@@ -2136,24 +2034,21 @@ _ACEOF
+@@ -2136,24 +2033,21 @@
# Let the site file select an alternate cache file if it wants to.
@@ -11876,7 +14321,7 @@
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
-@@ -2163,16 +2058,16 @@ if test -r "$cache_file"; then
+@@ -2163,16 +2057,16 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
@@ -11897,7 +14342,7 @@
>$cache_file
fi
-@@ -2186,38 +2081,29 @@ for ac_var in $ac_precious_vars; do
+@@ -2186,38 +2080,29 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -11948,7 +14393,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -2227,10 +2113,10 @@ $as_echo "$as_me: current value: \`$ac
+@@ -2227,10 +2112,10 @@
fi
done
if $ac_cache_corrupted; then
@@ -11963,7 +14408,17 @@
{ (exit 1); exit 1; }; }
fi
-@@ -2286,8 +2172,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
+@@ -2267,8 +2152,7 @@
+
+ ac_config_headers="$ac_config_headers config.h"
+
+-am__api_version='1.10'
+-
++am__api_version="1.9"
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
+@@ -2286,8 +2170,8 @@
fi
done
if test -z "$ac_aux_dir"; then
@@ -11974,7 +14429,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -2313,12 +2199,11 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2313,12 +2197,11 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -11990,7 +14445,7 @@
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -2347,29 +2232,17 @@ case $as_dir/ in
+@@ -2347,29 +2230,17 @@
# program-specific install script used by HP pwplus--don't use.
:
else
@@ -12022,7 +14477,7 @@
fi
if test "${ac_cv_path_install+set}" = set; then
-@@ -2382,8 +2255,8 @@ fi
+@@ -2382,8 +2253,8 @@
INSTALL=$ac_install_sh
fi
fi
@@ -12033,7 +14488,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -2393,8 +2266,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2393,8 +2264,8 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -12044,7 +14499,7 @@
# Just in case
sleep 1
echo timestamp > conftest.file
-@@ -2417,9 +2290,9 @@ if (
+@@ -2417,9 +2288,9 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -12056,7 +14511,7 @@
alias in your environment" >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -2430,23 +2303,26 @@ then
+@@ -2430,23 +2301,26 @@
# Ok.
:
else
@@ -12090,39 +14545,94 @@
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2457,15 +2333,15 @@ if eval "$MISSING --run true"; then
+@@ -2457,66 +2331,51 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+-fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+-if test -z "$MKDIR_P"; then
+- if test "${ac_cv_path_mkdir+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_prog in mkdir gmkdir; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+- 'mkdir (GNU coreutils) '* | \
+- 'mkdir (coreutils) '* | \
+- 'mkdir (fileutils) '4.1*)
+- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+- break 3;;
+- esac
+- done
+- done
+-done
+-IFS=$as_save_IFS
+-
+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
--{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
--$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
- if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
-- $as_echo_n "(cached) " >&6
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-@@ -2500,8 +2376,8 @@ fi
- MKDIR_P="$ac_install_sh -d"
+- if test "${ac_cv_path_mkdir+set}" = set; then
+- MKDIR_P="$ac_cv_path_mkdir -p"
++if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++ # We used to keeping the `.' as first argument, in order to
++ # allow $(mkdir_p) to be used without argument. As in
++ # $(mkdir_p) $(somedir)
++ # where $(somedir) is conditionally defined. However this is wrong
++ # for two reasons:
++ # 1. if the package is installed by a user who cannot write `.'
++ # make install will fail,
++ # 2. the above comment should most certainly read
++ # $(mkdir_p) $(DESTDIR)$(somedir)
++ # so it does not work when $(somedir) is undefined and
++ # $(DESTDIR) is not.
++ # To support the latter case, we have to write
++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
++ # so the `.' trick is pointless.
++ mkdir_p='mkdir -p --'
++else
++ # On NextStep and OpenStep, the `mkdir' command does not
++ # recognize any option. It will interpret all options as
++ # directories to create, and then abort because `.' already
++ # exists.
++ for d in ./-p ./--version;
++ do
++ test -d $d && rmdir $d
++ done
++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
++ if test -f "$ac_aux_dir/mkinstalldirs"; then
++ mkdir_p='$(mkinstalldirs)'
+ else
+- # As a last resort, use the slow shell script. Don't cache a
+- # value for MKDIR_P within a source directory, because that will
+- # break other packages using the cache if that directory is
+- # removed, or if the value is a relative name.
+- test -d ./--version && rmdir ./--version
+- MKDIR_P="$ac_install_sh -d"
++ mkdir_p='$(install_sh) -d'
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+echo "${ECHO_T}$MKDIR_P" >&6; }
+-
+-mkdir_p="$MKDIR_P"
+-case $mkdir_p in
+- [\\/$]* | ?:[\\/]*) ;;
+- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
- mkdir_p="$MKDIR_P"
- case $mkdir_p in
-@@ -2513,10 +2389,10 @@ for ac_prog in gawk mawk nawk awk
+ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -12136,7 +14646,7 @@
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -2529,7 +2405,7 @@ do
+@@ -2529,7 +2388,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
@@ -12145,7 +14655,7 @@
break 2
fi
done
-@@ -2540,23 +2416,22 @@ fi
+@@ -2540,23 +2399,22 @@
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
@@ -12177,7 +14687,7 @@
else
cat >conftest.make <<\_ACEOF
SHELL = /bin/sh
-@@ -2573,12 +2448,12 @@ esac
+@@ -2573,12 +2431,12 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -12194,18 +14704,38 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2597,8 +2472,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
+@@ -2591,16 +2449,12 @@
+ fi
+ rmdir .tst 2>/dev/null
+
+-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+- # is not polluted with repeated "-I."
+- am__isrc=' -I$(srcdir)'
+- # test to see if srcdir already configured
+- if test -f $srcdir/config.status; then
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++# test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" &&
++ test -f $srcdir/config.status; then
++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
- fi
+- fi
fi
-@@ -2653,10 +2528,10 @@ if test "$cross_compiling" != no; then
+
+ # test whether we have cygpath
+@@ -2643,7 +2497,7 @@
+
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+ # Installed binaries are usually stripped using `strip' when the user
+ # run `make install-strip'. However `strip' might not be the right
+@@ -2653,10 +2507,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -12219,7 +14749,7 @@
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -2669,7 +2544,7 @@ do
+@@ -2669,7 +2523,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
@@ -12228,7 +14758,7 @@
break 2
fi
done
-@@ -2680,11 +2555,11 @@ fi
+@@ -2680,11 +2534,11 @@
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -12244,7 +14774,7 @@
fi
-@@ -2693,10 +2568,10 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2693,10 +2547,10 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -12258,7 +14788,7 @@
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -2709,7 +2584,7 @@ do
+@@ -2709,7 +2563,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
@@ -12267,7 +14797,7 @@
break 2
fi
done
-@@ -2720,11 +2595,11 @@ fi
+@@ -2720,11 +2574,11 @@
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -12283,7 +14813,7 @@
fi
if test "x$ac_ct_STRIP" = x; then
-@@ -2732,10 +2607,10 @@ fi
+@@ -2732,10 +2586,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12296,7 +14826,16 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -2785,8 +2660,8 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+@@ -2747,7 +2601,7 @@
+ fi
+
+ fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+@@ -2785,8 +2639,8 @@
LIB_PANEL_APPLET_LT_VERSION=2:47:2
@@ -12307,18 +14846,22 @@
# Check whether --enable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-@@ -2794,8 +2669,8 @@ else
+@@ -2794,9 +2648,11 @@
USE_MAINTAINER_MODE=no
fi
- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
+- if test $USE_MAINTAINER_MODE = yes; then
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
- if test $USE_MAINTAINER_MODE = yes; then
++
++
++if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
-@@ -2819,8 +2694,8 @@ fi
+ else
+@@ -2819,8 +2675,8 @@
@@ -12329,7 +14872,7 @@
# Check whether --enable-nls was given.
if test "${enable_nls+set}" = set; then
enableval=$enable_nls; USE_NLS=$enableval
-@@ -2828,8 +2703,8 @@ else
+@@ -2828,8 +2684,8 @@
USE_NLS=yes
fi
@@ -12340,7 +14883,7 @@
DEPDIR="${am__leading_dot}deps"
-@@ -2844,8 +2719,8 @@ am__doit:
+@@ -2844,8 +2700,8 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -12351,7 +14894,7 @@
am__include="#"
am__quote=
_am_result=none
-@@ -2872,8 +2747,8 @@ if test "$am__include" = "#"; then
+@@ -2872,8 +2728,8 @@
fi
@@ -12361,8 +14904,27 @@
+echo "${ECHO_T}$_am_result" >&6; }
rm -f confinc confmf
- # Check whether --enable-dependency-tracking was given.
-@@ -2902,10 +2777,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ # Check whether --enable-dependency-tracking was given.
+@@ -2885,7 +2741,9 @@
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+ fi
+- if test "x$enable_dependency_tracking" != xno; then
++
++
++if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+ else
+@@ -2894,6 +2752,7 @@
+ fi
+
+
++
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -2902,10 +2761,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -12376,7 +14938,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2918,7 +2793,7 @@ do
+@@ -2918,7 +2777,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -12385,7 +14947,7 @@
break 2
fi
done
-@@ -2929,11 +2804,11 @@ fi
+@@ -2929,11 +2788,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -12401,7 +14963,7 @@
fi
-@@ -2942,10 +2817,10 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2942,10 +2801,10 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -12415,7 +14977,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2958,7 +2833,7 @@ do
+@@ -2958,7 +2817,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
@@ -12424,7 +14986,7 @@
break 2
fi
done
-@@ -2969,11 +2844,11 @@ fi
+@@ -2969,11 +2828,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -12440,7 +15002,7 @@
fi
if test "x$ac_ct_CC" = x; then
-@@ -2981,10 +2856,10 @@ fi
+@@ -2981,10 +2840,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12453,7 +15015,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -2999,10 +2874,10 @@ if test -z "$CC"; then
+@@ -2999,10 +2858,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -12467,7 +15029,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3015,7 +2890,7 @@ do
+@@ -3015,7 +2874,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -12476,7 +15038,7 @@
break 2
fi
done
-@@ -3026,11 +2901,11 @@ fi
+@@ -3026,11 +2885,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -12492,7 +15054,7 @@
fi
-@@ -3039,10 +2914,10 @@ fi
+@@ -3039,10 +2898,10 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -12506,7 +15068,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3060,7 +2935,7 @@ do
+@@ -3060,7 +2919,7 @@
continue
fi
ac_cv_prog_CC="cc"
@@ -12515,7 +15077,7 @@
break 2
fi
done
-@@ -3083,11 +2958,11 @@ fi
+@@ -3083,11 +2942,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -12531,7 +15093,7 @@
fi
-@@ -3098,10 +2973,10 @@ if test -z "$CC"; then
+@@ -3098,10 +2957,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -12545,7 +15107,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3114,7 +2989,7 @@ do
+@@ -3114,7 +2973,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -12554,7 +15116,7 @@
break 2
fi
done
-@@ -3125,11 +3000,11 @@ fi
+@@ -3125,11 +2984,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -12570,7 +15132,7 @@
fi
-@@ -3142,10 +3017,10 @@ if test -z "$CC"; then
+@@ -3142,10 +3001,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -12584,7 +15146,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -3158,7 +3033,7 @@ do
+@@ -3158,7 +3017,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -12593,7 +15155,7 @@
break 2
fi
done
-@@ -3169,11 +3044,11 @@ fi
+@@ -3169,11 +3028,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -12609,7 +15171,7 @@
fi
-@@ -3185,10 +3060,10 @@ done
+@@ -3185,10 +3044,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -12622,7 +15184,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -3200,48 +3075,44 @@ fi
+@@ -3200,48 +3059,44 @@
fi
@@ -12681,7 +15243,7 @@
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-@@ -3260,22 +3131,27 @@ main ()
+@@ -3260,22 +3115,27 @@
}
_ACEOF
ac_clean_files_save=$ac_clean_files
@@ -12718,7 +15280,7 @@
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
-@@ -3286,11 +3162,10 @@ case "(($ac_try" in
+@@ -3286,11 +3146,10 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12732,7 +15294,7 @@
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -3301,7 +3176,7 @@ for ac_file in $ac_files ''
+@@ -3301,7 +3160,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
@@ -12741,7 +15303,7 @@
;;
[ab].out )
# We found the default executable, but exeext='' is most
-@@ -3328,15 +3203,15 @@ else
+@@ -3328,15 +3187,15 @@
ac_file=''
fi
@@ -12762,7 +15324,7 @@
See \`config.log' for more details." >&2;}
{ (exit 77); exit 77; }; }
fi
-@@ -3345,8 +3220,8 @@ ac_exeext=$ac_cv_exeext
+@@ -3345,8 +3204,8 @@
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
@@ -12773,7 +15335,7 @@
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
-@@ -3355,51 +3230,49 @@ if test "$cross_compiling" != yes; then
+@@ -3355,51 +3214,49 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12840,7 +15402,7 @@
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-@@ -3408,31 +3281,31 @@ $as_echo "$ac_try_echo") >&5
+@@ -3408,31 +3265,31 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -12880,7 +15442,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3455,41 +3328,40 @@ case "(($ac_try" in
+@@ -3455,41 +3312,40 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12933,7 +15495,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3515,21 +3387,20 @@ case "(($ac_try" in
+@@ -3515,21 +3371,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -12958,7 +15520,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -3539,19 +3410,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -3539,19 +3394,15 @@
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -12984,7 +15546,7 @@
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -3578,21 +3445,20 @@ case "(($ac_try" in
+@@ -3578,21 +3429,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13009,7 +15571,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
-@@ -3617,21 +3483,20 @@ case "(($ac_try" in
+@@ -3617,21 +3467,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13034,7 +15596,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3657,21 +3522,20 @@ case "(($ac_try" in
+@@ -3657,21 +3506,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13059,7 +15621,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3686,8 +3550,8 @@ fi
+@@ -3686,8 +3534,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
@@ -13070,7 +15632,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -3703,10 +3567,10 @@ else
+@@ -3703,10 +3551,10 @@
CFLAGS=
fi
fi
@@ -13084,7 +15646,7 @@
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-@@ -3777,21 +3641,20 @@ case "(($ac_try" in
+@@ -3777,21 +3625,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13109,7 +15671,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3807,15 +3670,15 @@ fi
+@@ -3807,15 +3654,15 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -13131,7 +15693,7 @@
esac
-@@ -3827,10 +3690,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3827,10 +3674,10 @@
depcc="$CC" am_compiler_list=
@@ -13145,7 +15707,15 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -3918,8 +3781,8 @@ else
+@@ -3892,7 +3739,6 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -3918,11 +3764,13 @@
fi
fi
@@ -13155,8 +15725,14 @@
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- if
-@@ -3938,8 +3801,8 @@ fi
+- if
++
++
++if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+@@ -3938,8 +3786,8 @@
case "$am__api_version" in
1.01234)
@@ -13167,7 +15743,7 @@
{ (exit 1); exit 1; }; }
;;
*)
-@@ -3947,27 +3810,27 @@ $as_echo "$as_me: error: Automake 1.5 or
+@@ -3947,27 +3795,27 @@
esac
if test -n "0.40.0"; then
@@ -13204,7 +15780,7 @@
else
case $INTLTOOL_UPDATE in
[\\/]* | ?:[\\/]*)
-@@ -3982,7 +3845,7 @@ do
+@@ -3982,7 +3830,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
@@ -13213,7 +15789,7 @@
break 2
fi
done
-@@ -3994,20 +3857,20 @@ esac
+@@ -3994,20 +3842,20 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -13241,7 +15817,7 @@
else
case $INTLTOOL_MERGE in
[\\/]* | ?:[\\/]*)
-@@ -4022,7 +3885,7 @@ do
+@@ -4022,7 +3870,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
@@ -13250,7 +15826,7 @@
break 2
fi
done
-@@ -4034,20 +3897,20 @@ esac
+@@ -4034,20 +3882,20 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -13278,7 +15854,7 @@
else
case $INTLTOOL_EXTRACT in
[\\/]* | ?:[\\/]*)
-@@ -4062,7 +3925,7 @@ do
+@@ -4062,7 +3910,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
@@ -13287,7 +15863,7 @@
break 2
fi
done
-@@ -4074,17 +3937,17 @@ esac
+@@ -4074,17 +3922,17 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -13311,7 +15887,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -4131,10 +3994,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+@@ -4131,10 +3979,10 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -13325,7 +15901,7 @@
else
case $XGETTEXT in
[\\/]* | ?:[\\/]*)
-@@ -4149,7 +4012,7 @@ do
+@@ -4149,7 +3997,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
@@ -13334,7 +15910,7 @@
break 2
fi
done
-@@ -4161,20 +4024,20 @@ esac
+@@ -4161,20 +4009,20 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -13362,7 +15938,7 @@
else
case $MSGMERGE in
[\\/]* | ?:[\\/]*)
-@@ -4189,7 +4052,7 @@ do
+@@ -4189,7 +4037,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
@@ -13371,7 +15947,7 @@
break 2
fi
done
-@@ -4201,20 +4064,20 @@ esac
+@@ -4201,20 +4049,20 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -13399,7 +15975,7 @@
else
case $MSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -4229,7 +4092,7 @@ do
+@@ -4229,7 +4077,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -13408,7 +15984,7 @@
break 2
fi
done
-@@ -4241,20 +4104,20 @@ esac
+@@ -4241,20 +4089,20 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -13436,7 +16012,7 @@
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -4269,7 +4132,7 @@ do
+@@ -4269,7 +4117,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -13445,7 +16021,7 @@
break 2
fi
done
-@@ -4282,34 +4145,34 @@ esac
+@@ -4282,34 +4130,34 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -13491,7 +16067,7 @@
else
case $INTLTOOL_PERL in
[\\/]* | ?:[\\/]*)
-@@ -4324,7 +4187,7 @@ do
+@@ -4324,7 +4172,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
@@ -13500,7 +16076,7 @@
break 2
fi
done
-@@ -4336,33 +4199,33 @@ esac
+@@ -4336,33 +4184,33 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -13548,7 +16124,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -4395,32 +4258,29 @@ case "(($ac_try" in
+@@ -4395,32 +4243,29 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13589,7 +16165,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4473,35 +4333,31 @@ case "(($ac_try" in
+@@ -4473,35 +4318,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13632,7 +16208,7 @@
if test $ac_cv_func_bind_textdomain_codeset = yes; then
DATADIRNAME=share
else
-@@ -4515,7 +4371,6 @@ fi
+@@ -4515,7 +4356,6 @@
esac
fi
@@ -13640,7 +16216,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -4525,10 +4380,10 @@ fi
+@@ -4525,10 +4365,10 @@
@@ -13654,7 +16230,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -4566,30 +4421,26 @@ case "(($ac_try" in
+@@ -4566,30 +4406,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -13690,7 +16266,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
-@@ -4604,8 +4455,8 @@ fi
+@@ -4604,8 +4440,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -13701,7 +16277,7 @@
ac_res=$ac_cv_search_strerror
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -4620,10 +4471,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4620,10 +4456,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -13715,7 +16291,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4636,7 +4487,7 @@ do
+@@ -4636,7 +4472,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -13724,7 +16300,7 @@
break 2
fi
done
-@@ -4647,11 +4498,11 @@ fi
+@@ -4647,11 +4483,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -13740,7 +16316,7 @@
fi
-@@ -4660,10 +4511,10 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -4660,10 +4496,10 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -13754,7 +16330,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4676,7 +4527,7 @@ do
+@@ -4676,7 +4512,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
@@ -13763,7 +16339,7 @@
break 2
fi
done
-@@ -4687,11 +4538,11 @@ fi
+@@ -4687,11 +4523,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -13779,7 +16355,7 @@
fi
if test "x$ac_ct_CC" = x; then
-@@ -4699,10 +4550,10 @@ fi
+@@ -4699,10 +4535,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13792,7 +16368,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -4717,10 +4568,10 @@ if test -z "$CC"; then
+@@ -4717,10 +4553,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -13806,7 +16382,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4733,7 +4584,7 @@ do
+@@ -4733,7 +4569,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -13815,7 +16391,7 @@
break 2
fi
done
-@@ -4744,11 +4595,11 @@ fi
+@@ -4744,11 +4580,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -13831,7 +16407,7 @@
fi
-@@ -4757,10 +4608,10 @@ fi
+@@ -4757,10 +4593,10 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -13845,7 +16421,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4778,7 +4629,7 @@ do
+@@ -4778,7 +4614,7 @@
continue
fi
ac_cv_prog_CC="cc"
@@ -13854,7 +16430,7 @@
break 2
fi
done
-@@ -4801,11 +4652,11 @@ fi
+@@ -4801,11 +4637,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -13870,7 +16446,7 @@
fi
-@@ -4816,10 +4667,10 @@ if test -z "$CC"; then
+@@ -4816,10 +4652,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -13884,7 +16460,7 @@
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -4832,7 +4683,7 @@ do
+@@ -4832,7 +4668,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -13893,7 +16469,7 @@
break 2
fi
done
-@@ -4843,11 +4694,11 @@ fi
+@@ -4843,11 +4679,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -13909,7 +16485,7 @@
fi
-@@ -4860,10 +4711,10 @@ if test -z "$CC"; then
+@@ -4860,10 +4696,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -13923,7 +16499,7 @@
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -4876,7 +4727,7 @@ do
+@@ -4876,7 +4712,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -13932,7 +16508,7 @@
break 2
fi
done
-@@ -4887,11 +4738,11 @@ fi
+@@ -4887,11 +4723,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
@@ -13948,7 +16524,7 @@
fi
-@@ -4903,10 +4754,10 @@ done
+@@ -4903,10 +4739,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -13961,7 +16537,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -4918,54 +4769,50 @@ fi
+@@ -4918,54 +4754,50 @@
fi
@@ -14029,7 +16605,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4991,21 +4838,20 @@ case "(($ac_try" in
+@@ -4991,21 +4823,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14054,7 +16630,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -5015,19 +4861,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -5015,19 +4846,15 @@
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -14080,7 +16656,7 @@
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -5054,21 +4896,20 @@ case "(($ac_try" in
+@@ -5054,21 +4881,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14105,7 +16681,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
-@@ -5093,21 +4934,20 @@ case "(($ac_try" in
+@@ -5093,21 +4919,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14130,7 +16706,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -5133,21 +4973,20 @@ case "(($ac_try" in
+@@ -5133,21 +4958,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14155,7 +16731,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5162,8 +5001,8 @@ fi
+@@ -5162,8 +4986,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
@@ -14166,7 +16742,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -5179,10 +5018,10 @@ else
+@@ -5179,10 +5003,10 @@
CFLAGS=
fi
fi
@@ -14180,7 +16756,7 @@
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-@@ -5253,21 +5092,20 @@ case "(($ac_try" in
+@@ -5253,21 +5077,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14205,7 +16781,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -5283,15 +5121,15 @@ fi
+@@ -5283,15 +5106,15 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -14227,7 +16803,7 @@
esac
-@@ -5303,10 +5141,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -5303,10 +5126,10 @@
depcc="$CC" am_compiler_list=
@@ -14241,7 +16817,15 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -5394,8 +5232,8 @@ else
+@@ -5368,7 +5191,6 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -5394,11 +5216,13 @@
fi
fi
@@ -14251,8 +16835,14 @@
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- if
-@@ -5414,15 +5252,15 @@ ac_cpp='$CPP $CPPFLAGS'
+- if
++
++
++if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+@@ -5414,15 +5238,15 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -14271,7 +16861,7 @@
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -5454,21 +5292,20 @@ case "(($ac_try" in
+@@ -5454,21 +5278,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14296,7 +16886,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -5492,14 +5329,13 @@ case "(($ac_try" in
+@@ -5492,14 +5315,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14313,7 +16903,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -5507,7 +5343,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -5507,7 +5329,7 @@
# Broken: success on invalid input.
continue
else
@@ -14322,7 +16912,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -5532,8 +5368,8 @@ fi
+@@ -5532,8 +5354,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -14333,7 +16923,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -5561,21 +5397,20 @@ case "(($ac_try" in
+@@ -5561,21 +5383,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14358,7 +16948,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -5599,14 +5434,13 @@ case "(($ac_try" in
+@@ -5599,14 +5420,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14375,7 +16965,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -5614,7 +5448,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -5614,7 +5434,7 @@
# Broken: success on invalid input.
continue
else
@@ -14384,7 +16974,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -5630,9 +5464,9 @@ rm -f conftest.err conftest.$ac_ext
+@@ -5630,9 +5450,9 @@
if $ac_preproc_ok; then
:
else
@@ -14396,7 +16986,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -5644,37 +5478,42 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5644,37 +5464,42 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -14451,7 +17041,7 @@
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -5689,60 +5528,74 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -5689,60 +5514,74 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -14546,7 +17136,7 @@
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
-@@ -5757,31 +5610,40 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -5757,31 +5596,40 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
@@ -14598,7 +17188,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5808,21 +5670,20 @@ case "(($ac_try" in
+@@ -5808,21 +5656,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14623,7 +17213,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
-@@ -5914,40 +5775,37 @@ case "(($ac_try" in
+@@ -5914,40 +5761,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -14672,7 +17262,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -6032,34 +5890,34 @@ fi
+@@ -6032,34 +5876,34 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -14720,7 +17310,7 @@
{ (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
-@@ -6076,27 +5934,27 @@ IFS=$ac_save_IFS
+@@ -6076,27 +5920,27 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -14757,7 +17347,7 @@
{ (exit 1); exit 1; }; };;
esac
host=$ac_cv_host
-@@ -6113,10 +5971,10 @@ IFS=$ac_save_IFS
+@@ -6113,10 +5957,10 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -14771,7 +17361,7 @@
else
# Loop through the user's path and test for sed and gsed.
# Then use that list of sed's as ones to test for truncation.
-@@ -6169,8 +6027,8 @@ fi
+@@ -6169,8 +6013,8 @@
SED=$lt_cv_path_SED
@@ -14782,7 +17372,7 @@
# Check whether --with-gnu-ld was given.
-@@ -6183,8 +6041,8 @@ fi
+@@ -6183,8 +6027,8 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -14793,7 +17383,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -6213,14 +6071,14 @@ $as_echo_n "checking for ld used by $CC.
+@@ -6213,14 +6057,14 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -14813,7 +17403,7 @@
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -6250,19 +6108,19 @@ fi
+@@ -6250,19 +6094,19 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -14842,7 +17432,7 @@
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
-@@ -6274,20 +6132,20 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -6274,20 +6118,20 @@
;;
esac
fi
@@ -14870,7 +17460,7 @@
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
"" | " "*) ;;
-@@ -6304,10 +6162,10 @@ case $host_os in
+@@ -6304,10 +6148,10 @@
;;
esac
@@ -14884,7 +17474,7 @@
else
if test -n "$NM"; then
# Let the user override the test.
-@@ -6353,25 +6211,25 @@ else
+@@ -6353,25 +6197,25 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
@@ -14921,7 +17511,7 @@
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -6483,7 +6341,7 @@ linux* | k*bsd*-gnu)
+@@ -6483,7 +6327,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -14930,7 +17520,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
-@@ -6554,8 +6412,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
+@@ -6554,8 +6398,8 @@
esac
fi
@@ -14941,7 +17531,7 @@
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6588,7 +6446,7 @@ ia64-*-hpux*)
+@@ -6588,7 +6432,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14950,12 +17540,12 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
-@@ -6603,11 +6461,11 @@ ia64-*-hpux*)
+@@ -6603,11 +6447,11 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6606 "configure"' > conftest.$ac_ext
-+ echo '#line 6464 "configure"' > conftest.$ac_ext
++ echo '#line 6450 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14964,7 +17554,7 @@
(exit $ac_status); }; then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
-@@ -6645,7 +6503,7 @@ s390*-*linux*|sparc*-*linux*)
+@@ -6645,7 +6489,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14973,7 +17563,7 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.o` in
*32-bit*)
-@@ -6668,7 +6526,6 @@ s390*-*linux*|sparc*-*linux*)
+@@ -6668,7 +6512,6 @@
esac
;;
*64-bit*)
@@ -14981,7 +17571,7 @@
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -6696,10 +6553,10 @@ s390*-*linux*|sparc*-*linux*)
+@@ -6696,10 +6539,10 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -14995,7 +17585,7 @@
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -6728,30 +6585,26 @@ case "(($ac_try" in
+@@ -6728,30 +6571,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15031,7 +17621,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
-@@ -6761,8 +6614,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -6761,8 +6600,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -15042,7 +17632,7 @@
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
CFLAGS="$SAVE_CFLAGS"
-@@ -6774,7 +6627,7 @@ sparc*-*solaris*)
+@@ -6774,7 +6613,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15051,7 +17641,7 @@
(exit $ac_status); }; then
case `/usr/bin/file conftest.o` in
*64-bit*)
-@@ -6796,10 +6649,10 @@ sparc*-*solaris*)
+@@ -6796,10 +6635,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
@@ -15065,7 +17655,7 @@
else
if test -n "$DLLTOOL"; then
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-@@ -6812,7 +6665,7 @@ do
+@@ -6812,7 +6651,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
@@ -15074,7 +17664,7 @@
break 2
fi
done
-@@ -6823,11 +6676,11 @@ fi
+@@ -6823,11 +6662,11 @@
fi
DLLTOOL=$ac_cv_prog_DLLTOOL
if test -n "$DLLTOOL"; then
@@ -15090,7 +17680,7 @@
fi
-@@ -6836,10 +6689,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then
+@@ -6836,10 +6675,10 @@
ac_ct_DLLTOOL=$DLLTOOL
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
@@ -15104,7 +17694,7 @@
else
if test -n "$ac_ct_DLLTOOL"; then
ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-@@ -6852,7 +6705,7 @@ do
+@@ -6852,7 +6691,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
@@ -15113,7 +17703,7 @@
break 2
fi
done
-@@ -6863,11 +6716,11 @@ fi
+@@ -6863,11 +6702,11 @@
fi
ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
if test -n "$ac_ct_DLLTOOL"; then
@@ -15129,7 +17719,7 @@
fi
if test "x$ac_ct_DLLTOOL" = x; then
-@@ -6875,10 +6728,10 @@ fi
+@@ -6875,10 +6714,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15142,7 +17732,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -6892,10 +6745,10 @@ fi
+@@ -6892,10 +6731,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -15156,7 +17746,7 @@
else
if test -n "$AS"; then
ac_cv_prog_AS="$AS" # Let the user override the test.
-@@ -6908,7 +6761,7 @@ do
+@@ -6908,7 +6747,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AS="${ac_tool_prefix}as"
@@ -15165,7 +17755,7 @@
break 2
fi
done
-@@ -6919,11 +6772,11 @@ fi
+@@ -6919,11 +6758,11 @@
fi
AS=$ac_cv_prog_AS
if test -n "$AS"; then
@@ -15181,7 +17771,7 @@
fi
-@@ -6932,10 +6785,10 @@ if test -z "$ac_cv_prog_AS"; then
+@@ -6932,10 +6771,10 @@
ac_ct_AS=$AS
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
@@ -15195,7 +17785,7 @@
else
if test -n "$ac_ct_AS"; then
ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-@@ -6948,7 +6801,7 @@ do
+@@ -6948,7 +6787,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AS="as"
@@ -15204,7 +17794,7 @@
break 2
fi
done
-@@ -6959,11 +6812,11 @@ fi
+@@ -6959,11 +6798,11 @@
fi
ac_ct_AS=$ac_cv_prog_ac_ct_AS
if test -n "$ac_ct_AS"; then
@@ -15220,7 +17810,7 @@
fi
if test "x$ac_ct_AS" = x; then
-@@ -6971,10 +6824,10 @@ fi
+@@ -6971,10 +6810,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15233,7 +17823,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -6988,10 +6841,10 @@ fi
+@@ -6988,10 +6827,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -15247,7 +17837,7 @@
else
if test -n "$OBJDUMP"; then
ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-@@ -7004,7 +6857,7 @@ do
+@@ -7004,7 +6843,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
@@ -15256,7 +17846,7 @@
break 2
fi
done
-@@ -7015,11 +6868,11 @@ fi
+@@ -7015,11 +6854,11 @@
fi
OBJDUMP=$ac_cv_prog_OBJDUMP
if test -n "$OBJDUMP"; then
@@ -15272,7 +17862,7 @@
fi
-@@ -7028,10 +6881,10 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -7028,10 +6867,10 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -15286,7 +17876,7 @@
else
if test -n "$ac_ct_OBJDUMP"; then
ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-@@ -7044,7 +6897,7 @@ do
+@@ -7044,7 +6883,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OBJDUMP="objdump"
@@ -15295,7 +17885,7 @@
break 2
fi
done
-@@ -7055,11 +6908,11 @@ fi
+@@ -7055,11 +6894,11 @@
fi
ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
if test -n "$ac_ct_OBJDUMP"; then
@@ -15311,7 +17901,7 @@
fi
if test "x$ac_ct_OBJDUMP" = x; then
-@@ -7067,10 +6920,10 @@ fi
+@@ -7067,10 +6906,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15324,7 +17914,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -7101,11 +6954,11 @@ need_locks="$enable_libtool_lock"
+@@ -7101,11 +6940,11 @@
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
@@ -15340,7 +17930,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -7123,21 +6976,20 @@ case "(($ac_try" in
+@@ -7123,21 +6962,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15365,7 +17955,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -7145,14 +6997,12 @@ fi
+@@ -7145,14 +6983,12 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -15385,7 +17975,7 @@
_ACEOF
fi
-@@ -7163,21 +7013,20 @@ done
+@@ -7163,21 +6999,20 @@
for ac_header in dlfcn.h
do
@@ -15416,7 +18006,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7193,33 +7042,32 @@ case "(($ac_try" in
+@@ -7193,33 +7028,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15457,7 +18047,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7233,52 +7081,51 @@ case "(($ac_try" in
+@@ -7233,52 +7067,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15531,7 +18121,7 @@
( cat <<\_ASBOX
## -------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ##
-@@ -7287,23 +7134,21 @@ _ASBOX
+@@ -7287,23 +7120,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -15563,7 +18153,7 @@
_ACEOF
fi
-@@ -7324,10 +7169,10 @@ if test -z "$CXX"; then
+@@ -7324,10 +7155,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -15577,7 +18167,7 @@
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -7340,7 +7185,7 @@ do
+@@ -7340,7 +7171,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
@@ -15586,7 +18176,7 @@
break 2
fi
done
-@@ -7351,11 +7196,11 @@ fi
+@@ -7351,11 +7182,11 @@
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
@@ -15602,7 +18192,7 @@
fi
-@@ -7368,10 +7213,10 @@ if test -z "$CXX"; then
+@@ -7368,10 +7199,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -15616,7 +18206,7 @@
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-@@ -7384,7 +7229,7 @@ do
+@@ -7384,7 +7215,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
@@ -15625,7 +18215,7 @@
break 2
fi
done
-@@ -7395,11 +7240,11 @@ fi
+@@ -7395,11 +7226,11 @@
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
@@ -15641,7 +18231,7 @@
fi
-@@ -7411,10 +7256,10 @@ done
+@@ -7411,10 +7242,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -15654,7 +18244,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -7426,47 +7271,43 @@ fi
+@@ -7426,47 +7257,43 @@
fi
fi
# Provide some information about the compiler.
@@ -15713,7 +18303,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -7492,21 +7333,20 @@ case "(($ac_try" in
+@@ -7492,21 +7319,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15738,7 +18328,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -7516,19 +7356,15 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -7516,19 +7342,15 @@
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -15764,7 +18354,7 @@
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
-@@ -7555,21 +7391,20 @@ case "(($ac_try" in
+@@ -7555,21 +7377,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15789,7 +18379,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
CXXFLAGS=""
-@@ -7594,21 +7429,20 @@ case "(($ac_try" in
+@@ -7594,21 +7415,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15814,7 +18404,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -7634,21 +7468,20 @@ case "(($ac_try" in
+@@ -7634,21 +7454,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15839,7 +18429,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -7663,8 +7496,8 @@ fi
+@@ -7663,8 +7482,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
@@ -15850,7 +18440,7 @@
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
-@@ -7688,10 +7521,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -7688,10 +7507,10 @@
depcc="$CXX" am_compiler_list=
@@ -15864,7 +18454,15 @@
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
-@@ -7779,8 +7612,8 @@ else
+@@ -7753,7 +7572,6 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -7779,11 +7597,13 @@
fi
fi
@@ -15874,8 +18472,14 @@
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- if
-@@ -7804,11 +7637,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
+- if
++
++
++if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+@@ -7804,11 +7624,11 @@
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -15890,7 +18494,7 @@
else
# Double quotes because CXXCPP needs to be expanded
for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -7840,21 +7673,20 @@ case "(($ac_try" in
+@@ -7840,21 +7660,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15915,7 +18519,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -7878,14 +7710,13 @@ case "(($ac_try" in
+@@ -7878,14 +7697,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15932,7 +18536,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
-@@ -7893,7 +7724,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -7893,7 +7711,7 @@
# Broken: success on invalid input.
continue
else
@@ -15941,7 +18545,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -7918,8 +7749,8 @@ fi
+@@ -7918,8 +7736,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -15952,7 +18556,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -7947,21 +7778,20 @@ case "(($ac_try" in
+@@ -7947,21 +7765,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15977,7 +18581,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
-@@ -7985,14 +7815,13 @@ case "(($ac_try" in
+@@ -7985,14 +7802,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -15994,7 +18598,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
-@@ -8000,7 +7829,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -8000,7 +7816,7 @@
# Broken: success on invalid input.
continue
else
@@ -16003,7 +18607,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
-@@ -8016,9 +7845,9 @@ rm -f conftest.err conftest.$ac_ext
+@@ -8016,9 +7832,9 @@
if $ac_preproc_ok; then
:
else
@@ -16015,7 +18619,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -8041,10 +7870,10 @@ if test -n "$ac_tool_prefix"; then
+@@ -8041,10 +7857,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -16029,7 +18633,7 @@
else
if test -n "$F77"; then
ac_cv_prog_F77="$F77" # Let the user override the test.
-@@ -8057,7 +7886,7 @@ do
+@@ -8057,7 +7873,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
@@ -16038,7 +18642,7 @@
break 2
fi
done
-@@ -8068,11 +7897,11 @@ fi
+@@ -8068,11 +7884,11 @@
fi
F77=$ac_cv_prog_F77
if test -n "$F77"; then
@@ -16054,7 +18658,7 @@
fi
-@@ -8085,10 +7914,10 @@ if test -z "$F77"; then
+@@ -8085,10 +7901,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -16068,7 +18672,7 @@
else
if test -n "$ac_ct_F77"; then
ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-@@ -8101,7 +7930,7 @@ do
+@@ -8101,7 +7917,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_F77="$ac_prog"
@@ -16077,7 +18681,7 @@
break 2
fi
done
-@@ -8112,11 +7941,11 @@ fi
+@@ -8112,11 +7928,11 @@
fi
ac_ct_F77=$ac_cv_prog_ac_ct_F77
if test -n "$ac_ct_F77"; then
@@ -16093,7 +18697,7 @@
fi
-@@ -8128,10 +7957,10 @@ done
+@@ -8128,10 +7944,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -16106,7 +18710,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8142,41 +7971,37 @@ fi
+@@ -8142,41 +7958,37 @@
# Provide some information about the compiler.
@@ -16156,7 +18760,7 @@
(exit $ac_status); }
rm -f a.out
-@@ -8184,10 +8009,10 @@ rm -f a.out
+@@ -8184,10 +7996,10 @@
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
@@ -16170,7 +18774,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
program main
-@@ -8203,21 +8028,20 @@ case "(($ac_try" in
+@@ -8203,21 +8015,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16195,7 +18799,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
-@@ -8227,16 +8051,16 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -8227,16 +8038,16 @@
ac_cv_f77_compiler_gnu=$ac_compiler_gnu
fi
@@ -16217,7 +18821,7 @@
else
FFLAGS=-g
cat >conftest.$ac_ext <<_ACEOF
-@@ -8250,21 +8074,20 @@ case "(($ac_try" in
+@@ -8250,21 +8061,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16242,7 +18846,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_prog_f77_g=no
-@@ -8273,8 +8096,8 @@ fi
+@@ -8273,8 +8083,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -16253,7 +18857,7 @@
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
-@@ -8291,11 +8114,7 @@ else
+@@ -8291,11 +8101,7 @@
fi
fi
@@ -16266,7 +18870,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -8306,10 +8125,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -8306,10 +8112,10 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -16280,7 +18884,7 @@
else
i=0
teststring="ABCD"
-@@ -8418,11 +8237,11 @@ else
+@@ -8418,11 +8224,11 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -16296,7 +18900,7 @@
fi
-@@ -8430,10 +8249,10 @@ fi
+@@ -8430,10 +8236,10 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -16310,7 +18914,7 @@
else
# These are sane defaults that work on at least a few old systems.
-@@ -8538,14 +8357,14 @@ EOF
+@@ -8538,14 +8344,14 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16327,7 +18931,7 @@
(exit $ac_status); } && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
-@@ -8600,7 +8419,7 @@ EOF
+@@ -8600,7 +8406,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
@@ -16336,7 +18940,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
-@@ -8635,17 +8454,17 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -8635,17 +8441,17 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -16361,7 +18965,7 @@
else
rm -f .libs 2>/dev/null
mkdir .libs 2>/dev/null
-@@ -8657,8 +8476,8 @@ else
+@@ -8657,8 +8463,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -16372,7 +18976,7 @@
objdir=$lt_cv_objdir
-@@ -8709,10 +8528,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
+@@ -8709,10 +8515,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -16386,7 +18990,7 @@
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -8725,7 +8544,7 @@ do
+@@ -8725,7 +8531,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
@@ -16395,7 +18999,7 @@
break 2
fi
done
-@@ -8736,11 +8555,11 @@ fi
+@@ -8736,11 +8542,11 @@
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
@@ -16411,7 +19015,7 @@
fi
-@@ -8749,10 +8568,10 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -8749,10 +8555,10 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -16425,7 +19029,7 @@
else
if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-@@ -8765,7 +8584,7 @@ do
+@@ -8765,7 +8571,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
@@ -16434,7 +19038,7 @@
break 2
fi
done
-@@ -8776,11 +8595,11 @@ fi
+@@ -8776,11 +8582,11 @@
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
@@ -16450,7 +19054,7 @@
fi
if test "x$ac_ct_AR" = x; then
-@@ -8788,10 +8607,10 @@ fi
+@@ -8788,10 +8594,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -16463,7 +19067,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8805,10 +8624,10 @@ fi
+@@ -8805,10 +8611,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -16477,7 +19081,7 @@
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -8821,7 +8640,7 @@ do
+@@ -8821,7 +8627,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
@@ -16486,7 +19090,7 @@
break 2
fi
done
-@@ -8832,11 +8651,11 @@ fi
+@@ -8832,11 +8638,11 @@
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
@@ -16502,7 +19106,7 @@
fi
-@@ -8845,10 +8664,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -8845,10 +8651,10 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -16516,7 +19120,7 @@
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -8861,7 +8680,7 @@ do
+@@ -8861,7 +8667,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
@@ -16525,7 +19129,7 @@
break 2
fi
done
-@@ -8872,11 +8691,11 @@ fi
+@@ -8872,11 +8678,11 @@
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
@@ -16541,7 +19145,7 @@
fi
if test "x$ac_ct_RANLIB" = x; then
-@@ -8884,10 +8703,10 @@ fi
+@@ -8884,10 +8690,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -16554,7 +19158,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -8901,10 +8720,10 @@ fi
+@@ -8901,10 +8707,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -16568,7 +19172,7 @@
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -8917,7 +8736,7 @@ do
+@@ -8917,7 +8723,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
@@ -16577,7 +19181,7 @@
break 2
fi
done
-@@ -8928,11 +8747,11 @@ fi
+@@ -8928,11 +8734,11 @@
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
@@ -16593,7 +19197,7 @@
fi
-@@ -8941,10 +8760,10 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -8941,10 +8747,10 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -16607,7 +19211,7 @@
else
if test -n "$ac_ct_STRIP"; then
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-@@ -8957,7 +8776,7 @@ do
+@@ -8957,7 +8763,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
@@ -16616,7 +19220,7 @@
break 2
fi
done
-@@ -8968,11 +8787,11 @@ fi
+@@ -8968,11 +8774,11 @@
fi
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
if test -n "$ac_ct_STRIP"; then
@@ -16632,7 +19236,7 @@
fi
if test "x$ac_ct_STRIP" = x; then
-@@ -8980,10 +8799,10 @@ fi
+@@ -8980,10 +8786,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -16645,7 +19249,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -9048,10 +8867,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
+@@ -9048,10 +8854,10 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -16659,7 +19263,7 @@
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
-@@ -9101,19 +8920,19 @@ fi
+@@ -9101,19 +8907,19 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -16686,7 +19290,7 @@
else
case $MAGIC_CMD in
[\\/*] | ?:[\\/]*)
-@@ -9163,11 +8982,11 @@ fi
+@@ -9163,11 +8969,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -16702,7 +19306,7 @@
fi
else
-@@ -9185,10 +9004,10 @@ esac
+@@ -9185,10 +8991,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -16716,7 +19320,7 @@
else
if test -n "$DSYMUTIL"; then
ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -9201,7 +9020,7 @@ do
+@@ -9201,7 +9007,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
@@ -16725,7 +19329,7 @@
break 2
fi
done
-@@ -9212,11 +9031,11 @@ fi
+@@ -9212,11 +9018,11 @@
fi
DSYMUTIL=$ac_cv_prog_DSYMUTIL
if test -n "$DSYMUTIL"; then
@@ -16741,7 +19345,7 @@
fi
-@@ -9225,10 +9044,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -9225,10 +9031,10 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -16755,7 +19359,7 @@
else
if test -n "$ac_ct_DSYMUTIL"; then
ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-@@ -9241,7 +9060,7 @@ do
+@@ -9241,7 +9047,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
@@ -16764,7 +19368,7 @@
break 2
fi
done
-@@ -9252,11 +9071,11 @@ fi
+@@ -9252,11 +9058,11 @@
fi
ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
if test -n "$ac_ct_DSYMUTIL"; then
@@ -16780,7 +19384,7 @@
fi
if test "x$ac_ct_DSYMUTIL" = x; then
-@@ -9264,10 +9083,10 @@ fi
+@@ -9264,10 +9070,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -16793,7 +19397,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -9281,10 +9100,10 @@ fi
+@@ -9281,10 +9087,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -16807,7 +19411,7 @@
else
if test -n "$NMEDIT"; then
ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -9297,7 +9116,7 @@ do
+@@ -9297,7 +9103,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
@@ -16816,7 +19420,7 @@
break 2
fi
done
-@@ -9308,11 +9127,11 @@ fi
+@@ -9308,11 +9114,11 @@
fi
NMEDIT=$ac_cv_prog_NMEDIT
if test -n "$NMEDIT"; then
@@ -16832,7 +19436,7 @@
fi
-@@ -9321,10 +9140,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -9321,10 +9127,10 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -16846,7 +19450,7 @@
else
if test -n "$ac_ct_NMEDIT"; then
ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-@@ -9337,7 +9156,7 @@ do
+@@ -9337,7 +9143,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_NMEDIT="nmedit"
@@ -16855,7 +19459,7 @@
break 2
fi
done
-@@ -9348,11 +9167,11 @@ fi
+@@ -9348,11 +9154,11 @@
fi
ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
if test -n "$ac_ct_NMEDIT"; then
@@ -16871,7 +19475,7 @@
fi
if test "x$ac_ct_NMEDIT" = x; then
-@@ -9360,10 +9179,10 @@ fi
+@@ -9360,10 +9166,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -16884,7 +19488,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -9375,10 +9194,10 @@ else
+@@ -9375,10 +9181,10 @@
fi
@@ -16898,7 +19502,7 @@
else
lt_cv_apple_cc_single_mod=no
if test -z "${LT_MULTI_MODULE}"; then
-@@ -9396,12 +9215,12 @@ else
+@@ -9396,12 +9202,12 @@
rm conftest.c
fi
fi
@@ -16916,7 +19520,7 @@
else
lt_cv_ld_exported_symbols_list=no
save_LDFLAGS=$LDFLAGS
-@@ -9428,37 +9247,33 @@ case "(($ac_try" in
+@@ -9428,37 +9234,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -16961,7 +19565,7 @@
case $host_os in
rhapsody* | darwin1.[0123])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -9570,10 +9385,10 @@ if test "$GCC" = yes; then
+@@ -9570,10 +9372,10 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -16975,21 +19579,21 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
-@@ -9588,11 +9403,11 @@ else
+@@ -9588,11 +9390,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:9591: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9406: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9393: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9595: \$? = $ac_status" >&5
-+ echo "$as_me:9410: \$? = $ac_status" >&5
++ echo "$as_me:9397: \$? = $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.
-@@ -9605,8 +9420,8 @@ else
+@@ -9605,8 +9407,8 @@
$rm conftest*
fi
@@ -17000,7 +19604,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9620,8 +9435,8 @@ lt_prog_compiler_wl=
+@@ -9620,8 +9422,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -17011,7 +19615,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -9852,18 +9667,18 @@ $as_echo_n "checking for $compiler optio
+@@ -9852,18 +9654,18 @@
esac
fi
@@ -17035,21 +19639,21 @@
else
lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
-@@ -9878,11 +9693,11 @@ else
+@@ -9878,11 +9680,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:9881: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9696: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9683: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9885: \$? = $ac_status" >&5
-+ echo "$as_me:9700: \$? = $ac_status" >&5
++ echo "$as_me:9687: \$? = $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.
-@@ -9895,8 +9710,8 @@ else
+@@ -9895,8 +9697,8 @@
$rm conftest*
fi
@@ -17060,7 +19664,7 @@
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -9923,10 +9738,10 @@ esac
+@@ -9923,10 +9725,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -17074,7 +19678,7 @@
else
lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
-@@ -9951,8 +9766,8 @@ else
+@@ -9951,8 +9753,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -17085,7 +19689,7 @@
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
:
-@@ -9961,10 +9776,10 @@ else
+@@ -9961,10 +9763,10 @@
fi
@@ -17099,21 +19703,21 @@
else
lt_cv_prog_compiler_c_o=no
$rm -r conftest 2>/dev/null
-@@ -9982,11 +9797,11 @@ else
+@@ -9982,11 +9784,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:9985: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9800: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9787: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9989: \$? = $ac_status" >&5
-+ echo "$as_me:9804: \$? = $ac_status" >&5
++ echo "$as_me:9791: \$? = $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
-@@ -10008,34 +9823,34 @@ else
+@@ -10008,34 +9810,34 @@
$rm conftest*
fi
@@ -17158,7 +19762,7 @@
runpath_var=
allow_undefined_flag=
-@@ -10247,12 +10062,13 @@ EOF
+@@ -10247,12 +10049,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -17173,7 +19777,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10465,21 +10281,18 @@ case "(($ac_try" in
+@@ -10465,21 +10268,18 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17199,7 +19803,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10494,13 +10307,12 @@ if test -z "$aix_libpath"; then
+@@ -10494,13 +10294,12 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -17214,7 +19818,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10535,21 +10347,18 @@ case "(($ac_try" in
+@@ -10535,21 +10334,18 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17240,7 +19844,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10564,13 +10373,12 @@ if test -z "$aix_libpath"; then
+@@ -10564,13 +10360,12 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -17255,7 +19859,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10803,7 +10611,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10803,7 +10598,7 @@
link_all_deplibs=yes
;;
@@ -17264,7 +19868,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11022,8 +10830,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11022,8 +10817,8 @@
esac
fi
@@ -17275,7 +19879,7 @@
test "$ld_shlibs" = no && can_build_shared=no
#
-@@ -11043,15 +10851,15 @@ x|xyes)
+@@ -11043,15 +10838,15 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -17294,7 +19898,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11069,7 +10877,7 @@ $as_echo_n "checking whether -lc should
+@@ -11069,7 +10864,7 @@
if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -17303,7 +19907,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc=no
-@@ -11081,16 +10889,16 @@ $as_echo_n "checking whether -lc should
+@@ -11081,16 +10876,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -17324,7 +19928,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -11498,13 +11306,11 @@ linux* | k*bsd*-gnu)
+@@ -11498,13 +11293,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -17339,7 +19943,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11516,6 +11322,18 @@ linux* | k*bsd*-gnu)
+@@ -11516,6 +11309,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -17358,7 +19962,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11693,19 +11511,19 @@ uts4*)
+@@ -11693,19 +11498,19 @@
dynamic_linker=no
;;
esac
@@ -17382,7 +19986,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -11717,8 +11535,8 @@ if test "$GCC" = yes; then
+@@ -11717,8 +11522,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -17393,7 +19997,7 @@
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var" || \
-@@ -11742,8 +11560,8 @@ else
+@@ -11742,8 +11547,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -17404,7 +20008,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -11756,13 +11574,13 @@ fi
+@@ -11756,13 +11561,13 @@
striplib=
old_striplib=
@@ -17422,7 +20026,7 @@
else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
-@@ -11770,16 +11588,16 @@ else
+@@ -11770,16 +11575,16 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -17445,7 +20049,7 @@
;;
esac
fi
-@@ -11811,10 +11629,10 @@ else
+@@ -11811,10 +11616,10 @@
darwin*)
# if libdl is installed we need to link against it
@@ -17459,7 +20063,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-@@ -11846,36 +11664,32 @@ case "(($ac_try" in
+@@ -11846,36 +11651,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17503,7 +20107,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11889,10 +11703,10 @@ fi
+@@ -11889,10 +11690,10 @@
;;
*)
@@ -17517,7 +20121,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -11945,42 +11759,38 @@ case "(($ac_try" in
+@@ -11945,42 +11746,38 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17570,7 +20174,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-@@ -12012,43 +11822,39 @@ case "(($ac_try" in
+@@ -12012,43 +11809,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17624,7 +20228,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -12101,42 +11907,38 @@ case "(($ac_try" in
+@@ -12101,42 +11894,38 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17677,7 +20281,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-@@ -12168,43 +11970,39 @@ case "(($ac_try" in
+@@ -12168,43 +11957,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17731,7 +20335,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
-@@ -12236,43 +12034,39 @@ case "(($ac_try" in
+@@ -12236,43 +12021,39 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17785,7 +20389,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
-@@ -12304,36 +12098,32 @@ case "(($ac_try" in
+@@ -12304,36 +12085,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -17829,7 +20433,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12373,10 +12163,10 @@ fi
+@@ -12373,10 +12150,10 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -17843,16 +20447,16 @@
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self=cross
-@@ -12384,7 +12174,7 @@ else
+@@ -12384,7 +12161,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12387 "configure"
-+#line 12177 "configure"
++#line 12164 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12450,7 +12240,7 @@ EOF
+@@ -12450,7 +12227,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
@@ -17861,7 +20465,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
-@@ -12468,15 +12258,15 @@ rm -fr conftest*
+@@ -12468,15 +12245,15 @@
fi
@@ -17882,16 +20486,16 @@
else
if test "$cross_compiling" = yes; then :
lt_cv_dlopen_self_static=cross
-@@ -12484,7 +12274,7 @@ else
+@@ -12484,7 +12261,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12487 "configure"
-+#line 12277 "configure"
++#line 12264 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12550,7 +12340,7 @@ EOF
+@@ -12550,7 +12327,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
@@ -17900,7 +20504,7 @@
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
-@@ -12568,8 +12358,8 @@ rm -fr conftest*
+@@ -12568,8 +12345,8 @@
fi
@@ -17911,7 +20515,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -12591,13 +12381,13 @@ fi
+@@ -12591,13 +12368,13 @@
# Report which library types will actually be built
@@ -17931,7 +20535,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -12617,15 +12407,15 @@ aix[4-9]*)
+@@ -12617,15 +12394,15 @@
fi
;;
esac
@@ -17953,7 +20557,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12718,8 +12508,8 @@ if test -f "$ltmain"; then
+@@ -12718,8 +12495,8 @@
cfgfile="${ofile}T"
trap "$rm \"$cfgfile\"; exit 1" 1 2 15
$rm -f "$cfgfile"
@@ -17964,7 +20568,7 @@
cat <<__EOF__ >> "$cfgfile"
#! $SHELL
-@@ -13131,18 +12921,18 @@ fi
+@@ -13131,18 +12908,18 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
@@ -17989,7 +20593,7 @@
fi
fi
if test -z "$LTCFLAGS"; then
-@@ -13159,16 +12949,16 @@ $as_echo "$as_me: WARNING: using \`LTCC=
+@@ -13159,16 +12936,16 @@
# Check whether tagname contains only valid characters
case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
"") ;;
@@ -18010,7 +20614,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -13311,8 +13101,8 @@ fi
+@@ -13311,8 +13088,8 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -18021,7 +20625,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -13341,14 +13131,14 @@ $as_echo_n "checking for ld used by $CC.
+@@ -13341,14 +13118,14 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -18041,7 +20645,7 @@
else
if test -z "$LD"; then
lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -13378,19 +13168,19 @@ fi
+@@ -13378,19 +13155,19 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -18070,7 +20674,7 @@
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
case `$LD -v 2>&1 </dev/null` in
-@@ -13402,8 +13192,8 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -13402,8 +13179,8 @@
;;
esac
fi
@@ -18081,7 +20685,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -13453,8 +13243,8 @@ else
+@@ -13453,8 +13230,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -18092,7 +20696,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -13571,21 +13361,18 @@ case "(($ac_try" in
+@@ -13571,21 +13348,18 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18118,7 +20722,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13600,13 +13387,12 @@ if test -z "$aix_libpath"; then
+@@ -13600,13 +13374,12 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -18133,7 +20737,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13642,21 +13428,18 @@ case "(($ac_try" in
+@@ -13642,21 +13415,18 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18159,7 +20763,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -13671,13 +13454,12 @@ if test -z "$aix_libpath"; then
+@@ -13671,13 +13441,12 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -18174,7 +20778,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -14080,7 +13862,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14080,7 +13849,7 @@
;;
esac
;;
@@ -18183,7 +20787,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=
-@@ -14407,8 +14189,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14407,8 +14176,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -18194,7 +20798,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -14427,7 +14209,7 @@ EOF
+@@ -14427,7 +14196,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -18203,7 +20807,7 @@
(exit $ac_status); }; then
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -14583,8 +14365,8 @@ lt_prog_compiler_wl_CXX=
+@@ -14583,8 +14352,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -18214,7 +20818,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -14784,7 +14566,7 @@ $as_echo_n "checking for $compiler optio
+@@ -14784,7 +14553,7 @@
;;
esac
;;
@@ -18223,7 +20827,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14867,18 +14649,18 @@ $as_echo_n "checking for $compiler optio
+@@ -14867,18 +14636,18 @@
esac
fi
@@ -18247,21 +20851,21 @@
else
lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
-@@ -14893,11 +14675,11 @@ else
+@@ -14893,11 +14662,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:14896: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14678: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14665: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14900: \$? = $ac_status" >&5
-+ echo "$as_me:14682: \$? = $ac_status" >&5
++ echo "$as_me:14669: \$? = $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.
-@@ -14910,8 +14692,8 @@ else
+@@ -14910,8 +14679,8 @@
$rm conftest*
fi
@@ -18272,7 +20876,7 @@
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -14938,10 +14720,10 @@ esac
+@@ -14938,10 +14707,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -18286,7 +20890,7 @@
else
lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
-@@ -14966,8 +14748,8 @@ else
+@@ -14966,8 +14735,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -18297,7 +20901,7 @@
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
:
-@@ -14976,10 +14758,10 @@ else
+@@ -14976,10 +14745,10 @@
fi
@@ -18311,21 +20915,21 @@
else
lt_cv_prog_compiler_c_o_CXX=no
$rm -r conftest 2>/dev/null
-@@ -14997,11 +14779,11 @@ else
+@@ -14997,11 +14766,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:15000: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14782: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14769: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15004: \$? = $ac_status" >&5
-+ echo "$as_me:14786: \$? = $ac_status" >&5
++ echo "$as_me:14773: \$? = $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
-@@ -15023,34 +14805,34 @@ else
+@@ -15023,34 +14792,34 @@
$rm conftest*
fi
@@ -18370,7 +20974,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -15069,14 +14851,17 @@ $as_echo_n "checking whether the $compil
+@@ -15069,14 +14838,17 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
@@ -18390,7 +20994,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
#
-@@ -15096,15 +14881,15 @@ x|xyes)
+@@ -15096,15 +14868,15 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -18409,7 +21013,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -15122,7 +14907,7 @@ $as_echo_n "checking whether -lc should
+@@ -15122,7 +14894,7 @@
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -18418,7 +21022,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc_CXX=no
-@@ -15134,16 +14919,16 @@ $as_echo_n "checking whether -lc should
+@@ -15134,16 +14906,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18439,7 +21043,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -15499,13 +15284,11 @@ linux* | k*bsd*-gnu)
+@@ -15499,13 +15271,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -18454,7 +21058,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15517,6 +15300,18 @@ linux* | k*bsd*-gnu)
+@@ -15517,6 +15287,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18473,7 +21077,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -15694,19 +15489,19 @@ uts4*)
+@@ -15694,19 +15476,19 @@
dynamic_linker=no
;;
esac
@@ -18497,7 +21101,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -15718,8 +15513,8 @@ if test "$GCC" = yes; then
+@@ -15718,8 +15500,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -18508,7 +21112,7 @@
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
test -n "$runpath_var_CXX" || \
-@@ -15743,8 +15538,8 @@ else
+@@ -15743,8 +15525,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -18519,7 +21123,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -16282,13 +16077,13 @@ done
+@@ -16282,13 +16064,13 @@
cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
@@ -18539,7 +21143,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -16307,15 +16102,15 @@ aix[4-9]*)
+@@ -16307,15 +16089,15 @@
fi
;;
esac
@@ -18561,7 +21165,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -16324,8 +16119,8 @@ lt_prog_compiler_wl_F77=
+@@ -16324,8 +16106,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -18572,7 +21176,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -16556,18 +16351,18 @@ $as_echo_n "checking for $compiler optio
+@@ -16556,18 +16338,18 @@
esac
fi
@@ -18596,21 +21200,21 @@
else
lt_cv_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
-@@ -16582,11 +16377,11 @@ else
+@@ -16582,11 +16364,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:16585: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16380: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16367: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16589: \$? = $ac_status" >&5
-+ echo "$as_me:16384: \$? = $ac_status" >&5
++ echo "$as_me:16371: \$? = $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.
-@@ -16599,8 +16394,8 @@ else
+@@ -16599,8 +16381,8 @@
$rm conftest*
fi
@@ -18621,7 +21225,7 @@
if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -16627,10 +16422,10 @@ esac
+@@ -16627,10 +16409,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
@@ -18635,7 +21239,7 @@
else
lt_cv_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
-@@ -16655,8 +16450,8 @@ else
+@@ -16655,8 +16437,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -18646,7 +21250,7 @@
if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
:
-@@ -16665,10 +16460,10 @@ else
+@@ -16665,10 +16447,10 @@
fi
@@ -18660,21 +21264,21 @@
else
lt_cv_prog_compiler_c_o_F77=no
$rm -r conftest 2>/dev/null
-@@ -16686,11 +16481,11 @@ else
+@@ -16686,11 +16468,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:16689: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16484: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16471: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16693: \$? = $ac_status" >&5
-+ echo "$as_me:16488: \$? = $ac_status" >&5
++ echo "$as_me:16475: \$? = $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
-@@ -16712,34 +16507,34 @@ else
+@@ -16712,34 +16494,34 @@
$rm conftest*
fi
@@ -18719,7 +21323,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -16951,12 +16746,13 @@ EOF
+@@ -16951,12 +16733,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -18734,7 +21338,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -17159,21 +16955,18 @@ case "(($ac_try" in
+@@ -17159,21 +16942,18 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18760,7 +21364,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -17188,13 +16981,12 @@ if test -z "$aix_libpath"; then
+@@ -17188,13 +16968,12 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -18775,7 +21379,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -17219,21 +17011,18 @@ case "(($ac_try" in
+@@ -17219,21 +16998,18 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -18801,7 +21405,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -17248,13 +17037,12 @@ if test -z "$aix_libpath"; then
+@@ -17248,13 +17024,12 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -18816,7 +21420,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -17487,7 +17275,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17487,7 +17262,7 @@
link_all_deplibs_F77=yes
;;
@@ -18825,7 +21429,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
-@@ -17706,8 +17494,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17706,8 +17481,8 @@
esac
fi
@@ -18836,7 +21440,7 @@
test "$ld_shlibs_F77" = no && can_build_shared=no
#
-@@ -17727,15 +17515,15 @@ x|xyes)
+@@ -17727,15 +17502,15 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -18855,7 +21459,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -17753,7 +17541,7 @@ $as_echo_n "checking whether -lc should
+@@ -17753,7 +17528,7 @@
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -18864,7 +21468,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc_F77=no
-@@ -17765,16 +17553,16 @@ $as_echo_n "checking whether -lc should
+@@ -17765,16 +17540,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -18885,7 +21489,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -18130,13 +17918,11 @@ linux* | k*bsd*-gnu)
+@@ -18130,13 +17905,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -18900,7 +21504,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18148,6 +17934,18 @@ linux* | k*bsd*-gnu)
+@@ -18148,6 +17921,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -18919,7 +21523,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -18325,19 +18123,19 @@ uts4*)
+@@ -18325,19 +18110,19 @@
dynamic_linker=no
;;
esac
@@ -18943,7 +21547,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -18349,8 +18147,8 @@ if test "$GCC" = yes; then
+@@ -18349,8 +18134,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -18954,7 +21558,7 @@
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
test -n "$runpath_var_F77" || \
-@@ -18374,8 +18172,8 @@ else
+@@ -18374,8 +18159,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -18965,7 +21569,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -18885,10 +18683,10 @@ if test "$GCC" = yes; then
+@@ -18885,10 +18670,10 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -18979,21 +21583,21 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
-@@ -18903,11 +18701,11 @@ else
+@@ -18903,11 +18688,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:18906: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18704: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18691: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18910: \$? = $ac_status" >&5
-+ echo "$as_me:18708: \$? = $ac_status" >&5
++ echo "$as_me:18695: \$? = $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.
-@@ -18920,8 +18718,8 @@ else
+@@ -18920,8 +18705,8 @@
$rm conftest*
fi
@@ -19004,7 +21608,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18935,8 +18733,8 @@ lt_prog_compiler_wl_GCJ=
+@@ -18935,8 +18720,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -19015,7 +21619,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -19167,18 +18965,18 @@ $as_echo_n "checking for $compiler optio
+@@ -19167,18 +18952,18 @@
esac
fi
@@ -19039,21 +21643,21 @@
else
lt_cv_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
-@@ -19193,11 +18991,11 @@ else
+@@ -19193,11 +18978,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:19196: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18994: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18981: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19200: \$? = $ac_status" >&5
-+ echo "$as_me:18998: \$? = $ac_status" >&5
++ echo "$as_me:18985: \$? = $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.
-@@ -19210,8 +19008,8 @@ else
+@@ -19210,8 +18995,8 @@
$rm conftest*
fi
@@ -19064,7 +21668,7 @@
if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -19238,10 +19036,10 @@ esac
+@@ -19238,10 +19023,10 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
@@ -19078,7 +21682,7 @@
else
lt_cv_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
-@@ -19266,8 +19064,8 @@ else
+@@ -19266,8 +19051,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -19089,7 +21693,7 @@
if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
:
-@@ -19276,10 +19074,10 @@ else
+@@ -19276,10 +19061,10 @@
fi
@@ -19103,21 +21707,21 @@
else
lt_cv_prog_compiler_c_o_GCJ=no
$rm -r conftest 2>/dev/null
-@@ -19297,11 +19095,11 @@ else
+@@ -19297,11 +19082,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:19300: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19098: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19085: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19304: \$? = $ac_status" >&5
-+ echo "$as_me:19102: \$? = $ac_status" >&5
++ echo "$as_me:19089: \$? = $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
-@@ -19323,34 +19121,34 @@ else
+@@ -19323,34 +19108,34 @@
$rm conftest*
fi
@@ -19162,7 +21766,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -19562,12 +19360,13 @@ EOF
+@@ -19562,12 +19347,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -19177,7 +21781,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -19780,21 +19579,18 @@ case "(($ac_try" in
+@@ -19780,21 +19566,18 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19203,7 +21807,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -19809,13 +19605,12 @@ if test -z "$aix_libpath"; then
+@@ -19809,13 +19592,12 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -19218,7 +21822,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19850,21 +19645,18 @@ case "(($ac_try" in
+@@ -19850,21 +19632,18 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19244,7 +21848,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -19879,13 +19671,12 @@ if test -z "$aix_libpath"; then
+@@ -19879,13 +19658,12 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
else
@@ -19259,7 +21863,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -20118,7 +19909,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -20118,7 +19896,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -19268,7 +21872,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
-@@ -20337,8 +20128,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -20337,8 +20115,8 @@
esac
fi
@@ -19279,7 +21883,7 @@
test "$ld_shlibs_GCJ" = no && can_build_shared=no
#
-@@ -20358,15 +20149,15 @@ x|xyes)
+@@ -20358,15 +20136,15 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -19298,7 +21902,7 @@
(exit $ac_status); } 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -20384,7 +20175,7 @@ $as_echo_n "checking whether -lc should
+@@ -20384,7 +20162,7 @@
if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
(eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
ac_status=$?
@@ -19307,7 +21911,7 @@
(exit $ac_status); }
then
archive_cmds_need_lc_GCJ=no
-@@ -20396,16 +20187,16 @@ $as_echo_n "checking whether -lc should
+@@ -20396,16 +20174,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -19328,7 +21932,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -20761,13 +20552,11 @@ linux* | k*bsd*-gnu)
+@@ -20761,13 +20539,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -19343,7 +21947,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -20779,6 +20568,18 @@ linux* | k*bsd*-gnu)
+@@ -20779,6 +20555,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -19362,7 +21966,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -20956,19 +20757,19 @@ uts4*)
+@@ -20956,19 +20744,19 @@
dynamic_linker=no
;;
esac
@@ -19386,7 +21990,7 @@
else
lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
fi
-@@ -20980,8 +20781,8 @@ if test "$GCC" = yes; then
+@@ -20980,8 +20768,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -19397,7 +22001,7 @@
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
test -n "$runpath_var_GCJ" || \
-@@ -21005,8 +20806,8 @@ else
+@@ -21005,8 +20793,8 @@
# directories.
hardcode_action_GCJ=unsupported
fi
@@ -19408,7 +22012,7 @@
if test "$hardcode_action_GCJ" = relink; then
# Fast installation is not supported
-@@ -21929,8 +21730,8 @@ CC="$lt_save_CC"
+@@ -21929,8 +21717,8 @@
;;
*)
@@ -19419,7 +22023,7 @@
{ (exit 1); exit 1; }; }
;;
esac
-@@ -21949,8 +21750,8 @@ $as_echo "$as_me: error: Unsupported tag
+@@ -21949,8 +21737,8 @@
chmod +x "$ofile"
else
rm -f "${ofile}T"
@@ -19430,7 +22034,7 @@
{ (exit 1); exit 1; }; }
fi
fi
-@@ -21986,16 +21787,16 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+@@ -21986,16 +21774,16 @@
#AC_PROG_SED available in 2.59b
if test "x$CC" != xcc; then
@@ -19453,7 +22057,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22021,21 +21822,19 @@ if { (case "(($ac_try" in
+@@ -22021,21 +21809,19 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19479,7 +22083,7 @@
(exit $ac_status); };
then
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-@@ -22046,11 +21845,10 @@ then
+@@ -22046,11 +21832,10 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19493,7 +22097,7 @@
(exit $ac_status); }; }; then
ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
-@@ -22058,21 +21856,19 @@ $as_echo "$ac_try_echo") >&5
+@@ -22058,21 +21843,19 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19519,7 +22123,7 @@
(exit $ac_status); };
then
# cc works too.
-@@ -22090,11 +21886,11 @@ rm -f core conftest*
+@@ -22090,11 +21873,11 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -19535,8 +22139,11 @@
cat >>confdefs.h <<\_ACEOF
#define NO_MINUS_C_MINUS_O 1
-@@ -22119,10 +21915,10 @@ fi
+@@ -22116,13 +21899,12 @@
+ fi
+
+-
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -19549,7 +22156,7 @@
else
case $GLIB_GENMARSHAL in
[\\/]* | ?:[\\/]*)
-@@ -22137,7 +21933,7 @@ do
+@@ -22137,7 +21919,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"
@@ -19558,7 +22165,7 @@
break 2
fi
done
-@@ -22149,20 +21945,20 @@ esac
+@@ -22149,20 +21931,20 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -19586,7 +22193,7 @@
else
case $GCONFTOOL in
[\\/]* | ?:[\\/]*)
-@@ -22177,7 +21973,7 @@ do
+@@ -22177,7 +21959,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
@@ -19595,7 +22202,7 @@
break 2
fi
done
-@@ -22189,11 +21985,11 @@ esac
+@@ -22189,11 +21971,11 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -19611,7 +22218,7 @@
fi
-@@ -22232,8 +22028,8 @@ fi
+@@ -22232,8 +22014,8 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -19622,7 +22229,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22255,21 +22051,20 @@ case "(($ac_try" in
+@@ -22255,21 +22037,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19647,7 +22254,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
has_option=no
-@@ -22277,8 +22072,8 @@ fi
+@@ -22277,8 +22058,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$SAVE_CFLAGS"
@@ -19658,7 +22265,7 @@
if test $has_option = yes; then
warning_flags="$warning_flags $option"
fi
-@@ -22291,16 +22086,16 @@ $as_echo "$has_option" >&6; }
+@@ -22291,16 +22072,16 @@
fi
;;
*)
@@ -19681,7 +22288,7 @@
# Check whether --enable-iso-c was given.
if test "${enable_iso_c+set}" = set; then
-@@ -22310,8 +22105,8 @@ else
+@@ -22310,8 +22091,8 @@
fi
@@ -19692,7 +22299,7 @@
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
if test "x$GCC" = "xyes"; then
-@@ -22325,8 +22120,8 @@ $as_echo_n "checking what language compl
+@@ -22325,8 +22106,8 @@
esac
fi
fi
@@ -19703,7 +22310,7 @@
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -22348,21 +22143,20 @@ fi
+@@ -22348,21 +22129,20 @@
for ac_header in crt_externs.h
do
@@ -19734,7 +22341,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22378,33 +22172,32 @@ case "(($ac_try" in
+@@ -22378,33 +22158,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19775,7 +22382,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22418,52 +22211,51 @@ case "(($ac_try" in
+@@ -22418,52 +22197,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19849,7 +22456,7 @@
( cat <<\_ASBOX
## -------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ##
-@@ -22472,23 +22264,21 @@ _ASBOX
+@@ -22472,23 +22250,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -19881,7 +22488,7 @@
_ACEOF
fi
-@@ -22498,11 +22288,11 @@ done
+@@ -22498,11 +22274,11 @@
for ac_func in _NSGetEnviron
do
@@ -19897,7 +22504,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22555,41 +22345,35 @@ case "(($ac_try" in
+@@ -22555,41 +22331,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -19949,7 +22556,16 @@
_ACEOF
fi
-@@ -22623,10 +22407,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
+@@ -22600,7 +22370,7 @@
+ GDK_PIXBUF_REQUIRED=2.7.1
+ PANGO_REQUIRED=1.15.4
+ GLIB_REQUIRED=2.15.6
+-GTK_REQUIRED=2.13.1
++GTK_REQUIRED=2.15.1
+ LIBGLADE_REQUIRED=2.5.0
+ LIBGNOME_REQUIRED=2.13.0
+ LIBGNOMEUI_REQUIRED=2.5.4
+@@ -22623,10 +22393,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -19963,7 +22579,7 @@
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -22641,7 +22425,7 @@ do
+@@ -22641,7 +22411,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -19972,7 +22588,7 @@
break 2
fi
done
-@@ -22653,11 +22437,11 @@ esac
+@@ -22653,11 +22423,11 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -19988,7 +22604,7 @@
fi
-@@ -22666,10 +22450,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
+@@ -22666,10 +22436,10 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -20002,7 +22618,7 @@
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -22684,7 +22468,7 @@ do
+@@ -22684,7 +22454,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -20011,7 +22627,7 @@
break 2
fi
done
-@@ -22696,11 +22480,11 @@ esac
+@@ -22696,11 +22466,11 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -20027,7 +22643,7 @@
fi
if test "x$ac_pt_PKG_CONFIG" = x; then
-@@ -22708,10 +22492,10 @@ fi
+@@ -22708,10 +22478,10 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -20040,7 +22656,7 @@
whose name does not start with the host triplet. If you think this
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
-@@ -22725,54 +22509,58 @@ fi
+@@ -22725,54 +22495,58 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -20123,7 +22739,7 @@
fi
-@@ -22785,14 +22573,14 @@ else
+@@ -22785,14 +22559,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -20141,7 +22757,7 @@
$PANEL_PKG_ERRORS
-@@ -22803,7 +22591,7 @@ Alternatively, you may set the environme
+@@ -22803,7 +22577,7 @@
and PANEL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -20150,7 +22766,7 @@
$PANEL_PKG_ERRORS
-@@ -22816,7 +22604,7 @@ See the pkg-config man page for more det
+@@ -22816,7 +22590,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -20159,7 +22775,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22826,7 +22614,7 @@ See the pkg-config man page for more det
+@@ -22826,7 +22600,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -20168,7 +22784,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22840,8 +22628,8 @@ See \`config.log' for more details." >&2
+@@ -22840,8 +22614,8 @@
else
PANEL_CFLAGS=$pkg_cv_PANEL_CFLAGS
PANEL_LIBS=$pkg_cv_PANEL_LIBS
@@ -20179,7 +22795,7 @@
:
fi
-@@ -22849,40 +22637,158 @@ fi
+@@ -22849,40 +22623,44 @@
pkg_failed=no
@@ -20193,6 +22809,7 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"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\"") >&5
+- ($PKG_CONFIG --exists --print-errors "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") 2>&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LOGOUT_CFLAGS"; then
+ pkg_cv_LOGOUT_CFLAGS="$LOGOUT_CFLAGS"
@@ -20200,17 +22817,27 @@
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"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\"") >&5
+ ($PKG_CONFIG --exists --print-errors "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") 2>&5
-+ ac_status=$?
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
+ (exit $ac_status); }; then
+- pkg_cv_LIBPANEL_APPLET_CFLAGS=`$PKG_CONFIG --cflags "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" 2>/dev/null`
+ pkg_cv_LOGOUT_CFLAGS=`$PKG_CONFIG --cflags "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" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
-+fi
+ fi
+-if test -n "$LIBPANEL_APPLET_LIBS"; then
+- pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"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\"") >&5
+- ($PKG_CONFIG --exists --print-errors "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") 2>&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LOGOUT_LIBS"; then
+ pkg_cv_LOGOUT_LIBS="$LOGOUT_LIBS"
@@ -20218,107 +22845,136 @@
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"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\"") >&5
+ ($PKG_CONFIG --exists --print-errors "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") 2>&5
-+ ac_status=$?
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
+ (exit $ac_status); }; then
+- pkg_cv_LIBPANEL_APPLET_LIBS=`$PKG_CONFIG --libs "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" 2>/dev/null`
+ pkg_cv_LOGOUT_LIBS=`$PKG_CONFIG --libs "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" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
+ fi
+
+
+@@ -22895,63 +22673,63 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "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" 2>&1`
+ LOGOUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "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"`
-+ else
+ else
+- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "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" 2>&1`
+ LOGOUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "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"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5
+ echo "$LOGOUT_PKG_ERRORS" >&5
-+
+
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (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) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements (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) were not met:
-+
+
+-$LIBPANEL_APPLET_PKG_ERRORS
+$LOGOUT_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
+-and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LOGOUT_CFLAGS
+and LOGOUT_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
+ See the pkg-config man page for more details.
+ " >&5
+-$as_echo "$as_me: error: Package requirements (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) were not met:
+echo "$as_me: error: Package requirements (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) were not met:
-+
+
+-$LIBPANEL_APPLET_PKG_ERRORS
+$LOGOUT_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
+-and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LOGOUT_CFLAGS
+and LOGOUT_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
+ See the pkg-config man page for more details.
+ " >&2;}
+ { (exit 1); exit 1; }; }
+ elif test $pkg_failed = untried; then
+- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+ { { 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.
-+
+ 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 LIBPANEL_APPLET_CFLAGS
+-and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LOGOUT_CFLAGS
+and LOGOUT_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
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+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.
-+
+ 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 LIBPANEL_APPLET_CFLAGS
+-and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LOGOUT_CFLAGS
+and LOGOUT_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+else
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+- LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS
+- LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+ LOGOUT_CFLAGS=$pkg_cv_LOGOUT_CFLAGS
+ LOGOUT_LIBS=$pkg_cv_LOGOUT_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
-+ :
-+fi
-+
-+
-+
-+
-+pkg_failed=no
+ :
+ fi
+
+@@ -22959,40 +22737,44 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for WNCKLET" >&5
+-$as_echo_n "checking for WNCKLET... " >&6; }
+{ echo "$as_me:$LINENO: checking for LIBPANEL_APPLET" >&5
+echo $ECHO_N "checking for LIBPANEL_APPLET... $ECHO_C" >&6; }
-+
+
+-if test -n "$WNCKLET_CFLAGS"; then
+- pkg_cv_WNCKLET_CFLAGS="$WNCKLET_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBPANEL_APPLET_CFLAGS"; then
+ pkg_cv_LIBPANEL_APPLET_CFLAGS="$LIBPANEL_APPLET_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"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\"") >&5
- ($PKG_CONFIG --exists --print-errors "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") 2>&5
++ ($PKG_CONFIG --exists --print-errors "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") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_LIBPANEL_APPLET_CFLAGS=`$PKG_CONFIG --cflags "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" 2>/dev/null`
+- pkg_cv_WNCKLET_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null`
++ pkg_cv_LIBPANEL_APPLET_CFLAGS=`$PKG_CONFIG --cflags "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" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20328,23 +22984,25 @@
+else
+ pkg_failed=untried
fi
--if test -n "$LIBPANEL_APPLET_LIBS"; then
-- pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_LIBS"
+-if test -n "$WNCKLET_LIBS"; then
+- pkg_cv_WNCKLET_LIBS="$WNCKLET_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"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\"") >&5
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBPANEL_APPLET_LIBS"; then
+ pkg_cv_LIBPANEL_APPLET_LIBS="$LIBPANEL_APPLET_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"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\"") >&5
- ($PKG_CONFIG --exists --print-errors "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") 2>&5
++ ($PKG_CONFIG --exists --print-errors "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") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_LIBPANEL_APPLET_LIBS=`$PKG_CONFIG --libs "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" 2>/dev/null`
+- pkg_cv_WNCKLET_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null`
++ pkg_cv_LIBPANEL_APPLET_LIBS=`$PKG_CONFIG --libs "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" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20356,153 +23014,158 @@
fi
-@@ -22895,14 +22801,14 @@ else
+@@ -23005,27 +22787,141 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
-- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "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" 2>&1`
+- WNCKLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>&1`
+ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "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"`
else
-- LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "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" 2>&1`
+- WNCKLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>&1`
+ LIBPANEL_APPLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "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"`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5
+- echo "$WNCKLET_PKG_ERRORS" >&5
++ echo "$LIBPANEL_APPLET_PKG_ERRORS" >&5
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (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) were not met:
+- { { $as_echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements (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) were not met:
- $LIBPANEL_APPLET_PKG_ERRORS
+-$WNCKLET_PKG_ERRORS
++$LIBPANEL_APPLET_PKG_ERRORS
-@@ -22913,7 +22819,7 @@ Alternatively, you may set the environme
- and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables WNCKLET_CFLAGS
+-and WNCKLET_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
++and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--$as_echo "$as_me: error: Package requirements (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) were not met:
+-$as_echo "$as_me: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met:
+echo "$as_me: error: Package requirements (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) were not met:
- $LIBPANEL_APPLET_PKG_ERRORS
-
-@@ -22926,7 +22832,7 @@ See the pkg-config man page for more det
- " >&2;}
- { (exit 1); exit 1; }; }
- elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+-$WNCKLET_PKG_ERRORS
++$LIBPANEL_APPLET_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 LIBPANEL_APPLET_CFLAGS
++and LIBPANEL_APPLET_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.
-
-@@ -22936,7 +22842,7 @@ See the pkg-config man page for more det
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
- See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables LIBPANEL_APPLET_CFLAGS
++and LIBPANEL_APPLET_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
- path to pkg-config.
-
-@@ -22950,8 +22856,8 @@ See \`config.log' for more details." >&2
- else
- LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS
- LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
++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 LIBPANEL_APPLET_CFLAGS
++and LIBPANEL_APPLET_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ LIBPANEL_APPLET_CFLAGS=$pkg_cv_LIBPANEL_APPLET_CFLAGS
++ LIBPANEL_APPLET_LIBS=$pkg_cv_LIBPANEL_APPLET_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
- :
- fi
-
-@@ -22959,40 +22865,44 @@ fi
-
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for WNCKLET" >&5
--$as_echo_n "checking for WNCKLET... " >&6; }
++ :
++fi
++
++
++
++
++pkg_failed=no
+{ echo "$as_me:$LINENO: checking for WNCKLET" >&5
+echo $ECHO_N "checking for WNCKLET... $ECHO_C" >&6; }
-
--if test -n "$WNCKLET_CFLAGS"; then
-- pkg_cv_WNCKLET_CFLAGS="$WNCKLET_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
++
+if test -n "$PKG_CONFIG"; then
+ if test -n "$WNCKLET_CFLAGS"; then
+ pkg_cv_WNCKLET_CFLAGS="$WNCKLET_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_WNCKLET_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
++ ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_WNCKLET_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
+ fi
+else
+ pkg_failed=untried
- fi
--if test -n "$WNCKLET_LIBS"; then
-- pkg_cv_WNCKLET_LIBS="$WNCKLET_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
++fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$WNCKLET_LIBS"; then
+ pkg_cv_WNCKLET_LIBS="$WNCKLET_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED libwnck-1.0 >= \$LIBWNCK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
- ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
++ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_WNCKLET_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
++ (exit $ac_status); }; then
++ pkg_cv_WNCKLET_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
+ fi
+else
+ pkg_failed=untried
- fi
-
-
-@@ -23005,14 +22915,14 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- WNCKLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>&1`
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
+ WNCKLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"`
- else
-- WNCKLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED" 2>&1`
++ else
+ WNCKLET_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$WNCKLET_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met:
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$WNCKLET_PKG_ERRORS" >&5
++
+ { { echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met:
-
- $WNCKLET_PKG_ERRORS
-
-@@ -23023,7 +22933,7 @@ Alternatively, you may set the environme
- and WNCKLET_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met:
++
++$WNCKLET_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 WNCKLET_CFLAGS
++and WNCKLET_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 (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED) were not met:
++
++$WNCKLET_PKG_ERRORS
- $WNCKLET_PKG_ERRORS
-
-@@ -23036,7 +22946,7 @@ See the pkg-config man page for more det
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+@@ -23036,7 +22932,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -20511,7 +23174,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23046,7 +22956,7 @@ See the pkg-config man page for more det
+@@ -23046,7 +22942,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -20520,7 +23183,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23060,8 +22970,8 @@ See \`config.log' for more details." >&2
+@@ -23060,8 +22956,8 @@
else
WNCKLET_CFLAGS=$pkg_cv_WNCKLET_CFLAGS
WNCKLET_LIBS=$pkg_cv_WNCKLET_LIBS
@@ -20531,7 +23194,7 @@
:
fi
-@@ -23070,21 +22980,20 @@ fi
+@@ -23070,21 +22966,20 @@
for ac_header in langinfo.h
do
@@ -20562,7 +23225,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23100,33 +23009,32 @@ case "(($ac_try" in
+@@ -23100,33 +22995,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20603,7 +23266,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23140,52 +23048,51 @@ case "(($ac_try" in
+@@ -23140,52 +23034,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20677,7 +23340,7 @@
( cat <<\_ASBOX
## -------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ##
-@@ -23194,23 +23101,21 @@ _ASBOX
+@@ -23194,23 +23087,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -20709,7 +23372,7 @@
_ACEOF
fi
-@@ -23220,11 +23125,11 @@ done
+@@ -23220,11 +23111,11 @@
for ac_func in nl_langinfo
do
@@ -20725,7 +23388,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -23277,41 +23182,35 @@ case "(($ac_try" in
+@@ -23277,41 +23168,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -20777,7 +23440,7 @@
_ACEOF
fi
-@@ -23331,16 +23230,16 @@ if test "x$enable_eds" = "xyes"; then
+@@ -23331,16 +23216,16 @@
CLOCK_EDS_ICONDIR=`$PKG_CONFIG --variable=datadir evolution-data-server-1.2`/pixmaps/evolution-data-server
else
if test "x$enable_eds" != "xno"; then
@@ -20800,7 +23463,18 @@
fi
fi
fi
-@@ -23363,40 +23262,44 @@ fi
+@@ -23351,7 +23236,9 @@
+ _ACEOF
+
+ fi
+- if test -n "$LIBECAL_REQUIREMENT"; then
++
++
++if test -n "$LIBECAL_REQUIREMENT"; then
+ HAVE_LIBECAL_TRUE=
+ HAVE_LIBECAL_FALSE='#'
+ else
+@@ -23363,40 +23250,44 @@
pkg_failed=no
@@ -20863,7 +23537,7 @@
fi
-@@ -23409,14 +23312,14 @@ else
+@@ -23409,14 +23300,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -20881,7 +23555,7 @@
$CLOCK_PKG_ERRORS
-@@ -23427,7 +23330,7 @@ Alternatively, you may set the environme
+@@ -23427,7 +23318,7 @@
and CLOCK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -20890,7 +23564,7 @@
$CLOCK_PKG_ERRORS
-@@ -23440,7 +23343,7 @@ See the pkg-config man page for more det
+@@ -23440,7 +23331,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -20899,7 +23573,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23450,7 +23353,7 @@ See the pkg-config man page for more det
+@@ -23450,7 +23341,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -20908,7 +23582,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23464,8 +23367,8 @@ See \`config.log' for more details." >&2
+@@ -23464,8 +23355,8 @@
else
CLOCK_CFLAGS=$pkg_cv_CLOCK_CFLAGS
CLOCK_LIBS=$pkg_cv_CLOCK_LIBS
@@ -20919,7 +23593,7 @@
:
fi
-@@ -23473,40 +23376,44 @@ fi
+@@ -23473,40 +23364,44 @@
pkg_failed=no
@@ -20982,7 +23656,7 @@
fi
-@@ -23519,14 +23426,14 @@ else
+@@ -23519,14 +23414,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -21000,7 +23674,7 @@
$CLOCK_MECHANISM_PKG_ERRORS
-@@ -23537,7 +23444,7 @@ Alternatively, you may set the environme
+@@ -23537,7 +23432,7 @@
and CLOCK_MECHANISM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -21009,7 +23683,7 @@
$CLOCK_MECHANISM_PKG_ERRORS
-@@ -23550,7 +23457,7 @@ See the pkg-config man page for more det
+@@ -23550,7 +23445,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -21018,7 +23692,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23560,7 +23467,7 @@ See the pkg-config man page for more det
+@@ -23560,7 +23455,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -21027,7 +23701,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23574,8 +23481,8 @@ See \`config.log' for more details." >&2
+@@ -23574,8 +23469,8 @@
else
CLOCK_MECHANISM_CFLAGS=$pkg_cv_CLOCK_MECHANISM_CFLAGS
CLOCK_MECHANISM_LIBS=$pkg_cv_CLOCK_MECHANISM_LIBS
@@ -21038,7 +23712,7 @@
:
fi
-@@ -23606,40 +23513,44 @@ else
+@@ -23606,40 +23501,44 @@
HAVE_POLKIT=no
pkg_failed=no
@@ -21101,7 +23775,7 @@
fi
-@@ -23652,29 +23563,29 @@ else
+@@ -23652,29 +23551,29 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -21139,7 +23813,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -23686,40 +23597,44 @@ _ACEOF
+@@ -23686,40 +23585,44 @@
pkg_failed=no
@@ -21202,7 +23876,7 @@
fi
-@@ -23732,14 +23647,14 @@ else
+@@ -23732,14 +23635,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -21220,7 +23894,7 @@
$POLKIT_DBUS_PKG_ERRORS
-@@ -23750,7 +23665,7 @@ Alternatively, you may set the environme
+@@ -23750,7 +23653,7 @@
and POLKIT_DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -21229,7 +23903,7 @@
$POLKIT_DBUS_PKG_ERRORS
-@@ -23763,7 +23678,7 @@ See the pkg-config man page for more det
+@@ -23763,7 +23666,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -21238,7 +23912,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23773,7 +23688,7 @@ See the pkg-config man page for more det
+@@ -23773,7 +23676,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -21247,7 +23921,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -23787,16 +23702,16 @@ See \`config.log' for more details." >&2
+@@ -23787,16 +23690,16 @@
else
POLKIT_DBUS_CFLAGS=$pkg_cv_POLKIT_DBUS_CFLAGS
POLKIT_DBUS_LIBS=$pkg_cv_POLKIT_DBUS_LIBS
@@ -21269,7 +23943,7 @@
else
if test -n "$POLKIT_POLICY_FILE_VALIDATE"; then
ac_cv_prog_POLKIT_POLICY_FILE_VALIDATE="$POLKIT_POLICY_FILE_VALIDATE" # Let the user override the test.
-@@ -23809,7 +23724,7 @@ do
+@@ -23809,7 +23712,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_POLKIT_POLICY_FILE_VALIDATE="polkit-policy-file-validate"
@@ -21278,7 +23952,7 @@
break 2
fi
done
-@@ -23820,11 +23735,11 @@ fi
+@@ -23820,17 +23723,19 @@
fi
POLKIT_POLICY_FILE_VALIDATE=$ac_cv_prog_POLKIT_POLICY_FILE_VALIDATE
if test -n "$POLKIT_POLICY_FILE_VALIDATE"; then
@@ -21294,7 +23968,16 @@
fi
-@@ -23855,40 +23770,44 @@ if test "x$enable_network_manager" = "xn
+ fi
+ fi
+- if test "x$HAVE_POLKIT" = "xyes"; then
++
++
++if test "x$HAVE_POLKIT" = "xyes"; then
+ HAVE_POLKIT_TRUE=
+ HAVE_POLKIT_FALSE='#'
+ else
+@@ -23855,40 +23760,44 @@
else
pkg_failed=no
@@ -21357,7 +24040,7 @@
fi
-@@ -23901,23 +23820,23 @@ else
+@@ -23901,23 +23810,23 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -21387,7 +24070,7 @@
HAVE_NETWORK_MANAGER=yes
fi
fi
-@@ -23931,40 +23850,44 @@ fi
+@@ -23931,40 +23840,44 @@
pkg_failed=no
@@ -21450,7 +24133,7 @@
fi
-@@ -23977,14 +23900,14 @@ else
+@@ -23977,14 +23890,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -21468,7 +24151,7 @@
$FISH_PKG_ERRORS
-@@ -23995,7 +23918,7 @@ Alternatively, you may set the environme
+@@ -23995,7 +23908,7 @@
and FISH_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
@@ -21477,7 +24160,7 @@
$FISH_PKG_ERRORS
-@@ -24008,7 +23931,7 @@ See the pkg-config man page for more det
+@@ -24008,7 +23921,7 @@
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -21486,7 +24169,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24018,7 +23941,7 @@ See the pkg-config man page for more det
+@@ -24018,7 +23931,7 @@
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
@@ -21495,7 +24178,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -24032,8 +23955,8 @@ See \`config.log' for more details." >&2
+@@ -24032,8 +23945,8 @@
else
FISH_CFLAGS=$pkg_cv_FISH_CFLAGS
FISH_LIBS=$pkg_cv_FISH_LIBS
@@ -21506,7 +24189,51 @@
:
fi
-@@ -24159,11 +24082,11 @@ fi
+@@ -24118,7 +24031,9 @@
+ fi; fi; fi; fi
+ done
+
+- if test -n "$CLOCK_COMPILE_INPROCESS"; then
++
++
++if test -n "$CLOCK_COMPILE_INPROCESS"; then
+ CLOCK_INPROCESS_TRUE=
+ CLOCK_INPROCESS_FALSE='#'
+ else
+@@ -24126,7 +24041,9 @@
+ CLOCK_INPROCESS_FALSE=
+ fi
+
+- if test -n "$FISH_COMPILE_INPROCESS"; then
++
++
++if test -n "$FISH_COMPILE_INPROCESS"; then
+ FISH_INPROCESS_TRUE=
+ FISH_INPROCESS_FALSE='#'
+ else
+@@ -24134,7 +24051,9 @@
+ FISH_INPROCESS_FALSE=
+ fi
+
+- if test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS"; then
++
++
++if test -n "$NOTIFICATION_AREA_COMPILE_INPROCESS"; then
+ NOTIFICATION_AREA_INPROCESS_TRUE=
+ NOTIFICATION_AREA_INPROCESS_FALSE='#'
+ else
+@@ -24142,7 +24061,9 @@
+ NOTIFICATION_AREA_INPROCESS_FALSE=
+ fi
+
+- if test -n "$WNCKLET_COMPILE_INPROCESS"; then
++
++
++if test -n "$WNCKLET_COMPILE_INPROCESS"; then
+ WNCKLET_INPROCESS_TRUE=
+ WNCKLET_INPROCESS_FALSE='#'
+ else
+@@ -24159,11 +24080,11 @@
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
@@ -21522,7 +24249,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24189,21 +24112,20 @@ case "(($ac_try" in
+@@ -24189,21 +24110,20 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21547,7 +24274,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
-@@ -24211,14 +24133,12 @@ fi
+@@ -24211,14 +24131,12 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -21567,7 +24294,7 @@
_ACEOF
ac_header_dirent=$ac_hdr; break
-@@ -24227,10 +24147,10 @@ fi
+@@ -24227,10 +24145,10 @@
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -21581,7 +24308,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -24268,30 +24188,26 @@ case "(($ac_try" in
+@@ -24268,30 +24186,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21617,7 +24344,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_opendir+set}" = set; then
-@@ -24306,8 +24222,8 @@ fi
+@@ -24306,8 +24220,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -21628,7 +24355,7 @@
ac_res=$ac_cv_search_opendir
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -24315,10 +24231,10 @@ if test "$ac_res" != no; then
+@@ -24315,10 +24229,10 @@
fi
else
@@ -21642,7 +24369,7 @@
else
ac_func_search_save_LIBS=$LIBS
cat >conftest.$ac_ext <<_ACEOF
-@@ -24356,30 +24272,26 @@ case "(($ac_try" in
+@@ -24356,30 +24270,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21678,7 +24405,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_opendir+set}" = set; then
-@@ -24394,8 +24306,8 @@ fi
+@@ -24394,8 +24304,8 @@
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
@@ -21689,7 +24416,7 @@
ac_res=$ac_cv_search_opendir
if test "$ac_res" != no; then
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -24404,10 +24316,10 @@ fi
+@@ -24404,10 +24314,10 @@
fi
@@ -21703,7 +24430,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24446,37 +24358,33 @@ case "(($ac_try" in
+@@ -24446,37 +24356,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21748,7 +24475,7 @@
if test $jm_cv_struct_dirent_d_type = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -24488,8 +24396,8 @@ _ACEOF
+@@ -24488,8 +24394,8 @@
@@ -21759,7 +24486,7 @@
# Check whether --with-x was given.
-@@ -24503,11 +24411,11 @@ if test "x$with_x" = xno; then
+@@ -24503,11 +24409,11 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -21774,7 +24501,7 @@
else
# One or both of the vars are not set, and there is no cached value.
ac_x_includes=no ac_x_libraries=no
-@@ -24528,7 +24436,7 @@ _ACEOF
+@@ -24528,7 +24434,7 @@
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
@@ -21783,7 +24510,7 @@
if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
test -f "$ac_im_libdir/libX11.$ac_extension"; then
ac_im_usrlibdir=$ac_im_libdir; break
-@@ -24603,14 +24511,13 @@ case "(($ac_try" in
+@@ -24603,14 +24509,13 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21800,7 +24527,7 @@
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
-@@ -24618,7 +24525,7 @@ $as_echo "$ac_try_echo") >&5
+@@ -24618,7 +24523,7 @@
# We can compile using X headers with no special include directory.
ac_x_includes=
else
@@ -21809,7 +24536,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
-@@ -24659,33 +24566,30 @@ case "(($ac_try" in
+@@ -24659,33 +24564,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -21850,7 +24577,7 @@
if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
-@@ -24694,7 +24598,6 @@ do
+@@ -24694,7 +24596,6 @@
done
fi
@@ -21858,7 +24585,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-@@ -24717,8 +24620,8 @@ fi
+@@ -24717,8 +24618,8 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -21869,7 +24596,7 @@
no_x=yes
else
# If each of the values was on the command line, it overrides each guess.
-@@ -24728,46 +24631,50 @@ else
+@@ -24728,46 +24629,50 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -21940,7 +24667,7 @@
fi
-@@ -24780,15 +24687,15 @@ else
+@@ -24780,15 +24685,15 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -21960,7 +24687,7 @@
# pkg-config modules not found (only present since X11R7 aka Xorg); use
# old-style detection
-@@ -24810,8 +24717,8 @@ else
+@@ -24810,8 +24715,8 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -21971,7 +24698,7 @@
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
ac_xsave_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -24836,26 +24743,23 @@ case "(($ac_try" in
+@@ -24836,26 +24741,23 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22005,7 +24732,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -24880,38 +24784,33 @@ case "(($ac_try" in
+@@ -24880,38 +24782,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22053,7 +24780,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_c_werror_flag=$ac_xsave_c_werror_flag
-@@ -24957,30 +24856,27 @@ case "(($ac_try" in
+@@ -24957,30 +24854,27 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22092,7 +24819,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
-@@ -25012,45 +24908,41 @@ case "(($ac_try" in
+@@ -25012,45 +24906,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22148,7 +24875,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
-@@ -25082,36 +24974,32 @@ case "(($ac_try" in
+@@ -25082,36 +24972,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22192,7 +24919,7 @@
if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
-@@ -25119,7 +25007,6 @@ fi
+@@ -25119,7 +25005,6 @@
fi
fi
@@ -22200,7 +24927,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -25132,10 +25019,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25132,10 +25017,10 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -22214,7 +24941,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25188,41 +25075,37 @@ case "(($ac_try" in
+@@ -25188,41 +25073,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22266,7 +24993,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-@@ -25254,45 +25137,41 @@ case "(($ac_try" in
+@@ -25254,45 +25135,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22322,7 +25049,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
-@@ -25324,36 +25203,32 @@ case "(($ac_try" in
+@@ -25324,36 +25201,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22366,7 +25093,7 @@
if test $ac_cv_lib_bsd_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -25368,10 +25243,10 @@ fi
+@@ -25368,10 +25241,10 @@
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
@@ -22380,7 +25107,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25424,41 +25299,37 @@ case "(($ac_try" in
+@@ -25424,41 +25297,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22432,7 +25159,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -25490,36 +25361,32 @@ case "(($ac_try" in
+@@ -25490,36 +25359,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22476,7 +25203,7 @@
if test $ac_cv_lib_socket_connect = yes; then
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
-@@ -25527,10 +25394,10 @@ fi
+@@ -25527,10 +25392,10 @@
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
@@ -22490,7 +25217,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25583,41 +25450,37 @@ case "(($ac_try" in
+@@ -25583,41 +25448,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22542,7 +25269,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
-@@ -25649,36 +25512,32 @@ case "(($ac_try" in
+@@ -25649,36 +25510,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22586,7 +25313,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -25686,10 +25545,10 @@ fi
+@@ -25686,10 +25543,10 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -22600,7 +25327,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25742,41 +25601,37 @@ case "(($ac_try" in
+@@ -25742,41 +25599,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22652,7 +25379,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
-@@ -25808,36 +25663,32 @@ case "(($ac_try" in
+@@ -25808,36 +25661,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22696,7 +25423,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -25854,10 +25705,10 @@ fi
+@@ -25854,10 +25703,10 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -22710,7 +25437,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -25889,36 +25740,32 @@ case "(($ac_try" in
+@@ -25889,36 +25738,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22754,7 +25481,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -25929,8 +25776,8 @@ fi
+@@ -25929,8 +25774,8 @@
# X not found
if test x$no_x = xyes ; then
@@ -22765,7 +25492,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -25939,10 +25786,10 @@ $as_echo "$as_me: error: X development l
+@@ -25939,10 +25784,10 @@
CFLAGS="$X_CFLAGS"
LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
@@ -22779,7 +25506,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
-@@ -25974,36 +25821,32 @@ case "(($ac_try" in
+@@ -25974,36 +25819,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22823,7 +25550,7 @@
if test $ac_cv_lib_X11_XFree = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBX11 1
-@@ -26012,16 +25855,16 @@ _ACEOF
+@@ -26012,16 +25853,16 @@
LIBS="-lX11 $LIBS"
else
@@ -22845,7 +25572,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXau $LIBS"
-@@ -26053,36 +25896,32 @@ case "(($ac_try" in
+@@ -26053,36 +25894,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22889,7 +25616,7 @@
if test $ac_cv_lib_Xau_XauFileName = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXAU 1
-@@ -26091,8 +25930,8 @@ _ACEOF
+@@ -26091,8 +25928,8 @@
LIBS="-lXau $LIBS"
else
@@ -22900,7 +25627,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -26123,8 +25962,8 @@ else
+@@ -26123,8 +25960,8 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -22911,7 +25638,7 @@
ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
ac_xsave_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
-@@ -26149,26 +25988,23 @@ case "(($ac_try" in
+@@ -26149,26 +25986,23 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22945,7 +25672,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -26193,38 +26029,33 @@ case "(($ac_try" in
+@@ -26193,38 +26027,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -22993,7 +25720,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_c_werror_flag=$ac_xsave_c_werror_flag
-@@ -26270,30 +26101,27 @@ case "(($ac_try" in
+@@ -26270,30 +26099,27 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23032,7 +25759,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
-@@ -26325,45 +26153,41 @@ case "(($ac_try" in
+@@ -26325,45 +26151,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23088,7 +25815,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
-@@ -26395,36 +26219,32 @@ case "(($ac_try" in
+@@ -26395,36 +26217,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23132,7 +25859,7 @@
if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
-@@ -26432,7 +26252,6 @@ fi
+@@ -26432,7 +26250,6 @@
fi
fi
@@ -23140,7 +25867,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -26445,10 +26264,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -26445,10 +26262,10 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -23154,7 +25881,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26501,41 +26320,37 @@ case "(($ac_try" in
+@@ -26501,41 +26318,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23206,7 +25933,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-@@ -26567,45 +26382,41 @@ case "(($ac_try" in
+@@ -26567,45 +26380,41 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23262,7 +25989,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
-@@ -26637,36 +26448,32 @@ case "(($ac_try" in
+@@ -26637,36 +26446,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23306,7 +26033,7 @@
if test $ac_cv_lib_bsd_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -26681,10 +26488,10 @@ fi
+@@ -26681,10 +26486,10 @@
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
@@ -23320,7 +26047,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26737,41 +26544,37 @@ case "(($ac_try" in
+@@ -26737,41 +26542,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23372,7 +26099,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-@@ -26803,36 +26606,32 @@ case "(($ac_try" in
+@@ -26803,36 +26604,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23416,7 +26143,7 @@
if test $ac_cv_lib_socket_connect = yes; then
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
-@@ -26840,10 +26639,10 @@ fi
+@@ -26840,10 +26637,10 @@
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
@@ -23430,7 +26157,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -26896,41 +26695,37 @@ case "(($ac_try" in
+@@ -26896,41 +26693,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23482,7 +26209,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
-@@ -26962,36 +26757,32 @@ case "(($ac_try" in
+@@ -26962,36 +26755,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23526,7 +26253,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -26999,10 +26790,10 @@ fi
+@@ -26999,10 +26788,10 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -23540,7 +26267,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27055,41 +26846,37 @@ case "(($ac_try" in
+@@ -27055,41 +26844,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23592,7 +26319,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
-@@ -27121,36 +26908,32 @@ case "(($ac_try" in
+@@ -27121,36 +26906,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23636,7 +26363,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -27167,10 +26950,10 @@ fi
+@@ -27167,10 +26948,10 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -23650,7 +26377,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-@@ -27202,36 +26985,32 @@ case "(($ac_try" in
+@@ -27202,36 +26983,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23694,7 +26421,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -27242,8 +27021,8 @@ fi
+@@ -27242,8 +27019,8 @@
# X not found
if test x$no_x = xyes ; then
@@ -23705,7 +26432,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -27252,10 +27031,10 @@ $as_echo "$as_me: error: X development l
+@@ -27252,10 +27029,10 @@
CFLAGS="$X_CFLAGS"
LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
@@ -23719,7 +26446,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
-@@ -27287,36 +27066,32 @@ case "(($ac_try" in
+@@ -27287,36 +27064,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23763,7 +26490,7 @@
if test $ac_cv_lib_X11_XFree = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBX11 1
-@@ -27325,16 +27100,16 @@ _ACEOF
+@@ -27325,16 +27098,16 @@
LIBS="-lX11 $LIBS"
else
@@ -23785,7 +26512,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXau $LIBS"
-@@ -27366,36 +27141,32 @@ case "(($ac_try" in
+@@ -27366,36 +27139,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23829,7 +26556,7 @@
if test $ac_cv_lib_Xau_XauFileName = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBXAU 1
-@@ -27404,8 +27175,8 @@ _ACEOF
+@@ -27404,8 +27173,8 @@
LIBS="-lXau $LIBS"
else
@@ -23840,7 +26567,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -27417,8 +27188,8 @@ fi
+@@ -27417,8 +27186,8 @@
else
X_CFLAGS=$pkg_cv_X_CFLAGS
X_LIBS=$pkg_cv_X_LIBS
@@ -23851,7 +26578,7 @@
:
fi
-@@ -27447,21 +27218,20 @@ _ACEOF
+@@ -27447,21 +27216,20 @@
for ac_header in locale.h
do
@@ -23882,7 +26609,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27477,33 +27247,32 @@ case "(($ac_try" in
+@@ -27477,33 +27245,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23923,7 +26650,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27517,52 +27286,51 @@ case "(($ac_try" in
+@@ -27517,52 +27284,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -23997,7 +26724,7 @@
( cat <<\_ASBOX
## -------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ##
-@@ -27571,23 +27339,21 @@ _ASBOX
+@@ -27571,23 +27337,21 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -24029,7 +26756,7 @@
_ACEOF
fi
-@@ -27595,10 +27361,10 @@ fi
+@@ -27595,10 +27359,10 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -24043,7 +26770,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27621,35 +27387,31 @@ case "(($ac_try" in
+@@ -27621,35 +27385,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24086,7 +26813,7 @@
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -27668,17 +27430,17 @@ _ACEOF
+@@ -27668,17 +27428,17 @@
INTLLIBS=
if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -24111,7 +26838,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27694,33 +27456,32 @@ case "(($ac_try" in
+@@ -27694,33 +27454,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24152,7 +26879,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27734,52 +27495,51 @@ case "(($ac_try" in
+@@ -27734,52 +27493,51 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24226,7 +26953,7 @@
( cat <<\_ASBOX
## -------------------------------------------------------------------------- ##
## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel ##
-@@ -27788,15 +27548,15 @@ _ASBOX
+@@ -27788,15 +27546,15 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
@@ -24247,7 +26974,7 @@
fi
if test $ac_cv_header_libintl_h = yes; then
-@@ -27806,10 +27566,10 @@ if test $ac_cv_header_libintl_h = yes; t
+@@ -27806,10 +27564,10 @@
#
# First check in libc
#
@@ -24261,7 +26988,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27834,42 +27594,38 @@ case "(($ac_try" in
+@@ -27834,42 +27592,38 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24314,7 +27041,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27894,47 +27650,43 @@ case "(($ac_try" in
+@@ -27894,47 +27648,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24373,7 +27100,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27987,41 +27739,35 @@ case "(($ac_try" in
+@@ -27987,41 +27737,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24425,7 +27152,7 @@
_ACEOF
fi
-@@ -28036,10 +27782,10 @@ done
+@@ -28036,10 +27780,10 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -24439,7 +27166,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -28071,41 +27817,37 @@ case "(($ac_try" in
+@@ -28071,41 +27815,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24491,7 +27218,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -28137,41 +27879,37 @@ case "(($ac_try" in
+@@ -28137,41 +27877,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24543,7 +27270,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-@@ -28203,36 +27941,32 @@ case "(($ac_try" in
+@@ -28203,36 +27939,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24587,7 +27314,7 @@
if test $ac_cv_lib_intl_dgettext = yes; then
gt_cv_func_dgettext_libintl=yes
fi
-@@ -28243,14 +27977,14 @@ fi
+@@ -28243,14 +27975,14 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -24609,7 +27336,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-@@ -28282,41 +28016,37 @@ case "(($ac_try" in
+@@ -28282,41 +28014,37 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24661,7 +27388,7 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl -liconv $LIBS"
-@@ -28348,36 +28078,32 @@ case "(($ac_try" in
+@@ -28348,36 +28076,32 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24705,7 +27432,7 @@
if test $ac_cv_lib_intl_dcgettext = yes; then
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
-@@ -28403,11 +28129,11 @@ fi
+@@ -28403,11 +28127,11 @@
for ac_func in bind_textdomain_codeset
do
@@ -24721,7 +27448,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28460,41 +28186,35 @@ case "(($ac_try" in
+@@ -28460,41 +28184,35 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24773,7 +27500,7 @@
_ACEOF
fi
-@@ -28530,10 +28250,10 @@ _ACEOF
+@@ -28530,10 +28248,10 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -24787,7 +27514,7 @@
else
case "$MSGFMT" in
/*)
-@@ -28557,11 +28277,11 @@ esac
+@@ -28557,11 +28275,11 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -24803,7 +27530,7 @@
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
-@@ -28569,11 +28289,11 @@ fi
+@@ -28569,11 +28287,11 @@
for ac_func in dcgettext
do
@@ -24819,7 +27546,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28626,49 +28346,43 @@ case "(($ac_try" in
+@@ -28626,49 +28344,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -24881,7 +27608,7 @@
cat >conftest.foo <<_ACEOF
msgid ""
-@@ -28682,25 +28396,25 @@ msgstr ""
+@@ -28682,25 +28394,25 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -24916,7 +27643,7 @@
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
-@@ -28715,7 +28429,7 @@ do
+@@ -28715,7 +28427,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
@@ -24925,7 +27652,7 @@
break 2
fi
done
-@@ -28728,20 +28442,20 @@ esac
+@@ -28728,20 +28440,20 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -24953,7 +27680,7 @@
else
case "$XGETTEXT" in
/*)
-@@ -28765,11 +28479,11 @@ esac
+@@ -28765,11 +28477,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -24969,7 +27696,7 @@
fi
cat >conftest.$ac_ext <<_ACEOF
-@@ -28794,33 +28508,30 @@ case "(($ac_try" in
+@@ -28794,33 +28506,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25011,7 +27738,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28873,35 +28584,31 @@ case "(($ac_try" in
+@@ -28873,35 +28582,31 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
@@ -25054,7 +27781,7 @@
if test $ac_cv_func_bind_textdomain_codeset = yes; then
CATOBJEXT=.gmo
DATADIRNAME=share
-@@ -28918,7 +28625,6 @@ fi
+@@ -28918,7 +28623,6 @@
esac
fi
@@ -25062,7 +27789,7 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
-@@ -28944,8 +28650,8 @@ _ACEOF
+@@ -28944,8 +28648,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -25073,7 +27800,7 @@
XGETTEXT=":"
fi
fi
-@@ -28977,8 +28683,8 @@ $as_echo "found xgettext program is not
+@@ -28977,8 +28681,8 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -25084,7 +27811,7 @@
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
-@@ -29002,8 +28708,8 @@ $as_echo_n "checking for catalogs to be
+@@ -29002,8 +28706,8 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -25095,7 +27822,7 @@
fi
if test -n "$LINGUAS"; then
-@@ -29058,32 +28764,32 @@ fi
+@@ -29058,32 +28762,32 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -25139,7 +27866,7 @@
else
case $GTKDOC_CHECK in
[\\/]* | ?:[\\/]*)
-@@ -29098,7 +28804,7 @@ do
+@@ -29098,7 +28802,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
@@ -25148,7 +27875,7 @@
break 2
fi
done
-@@ -29110,11 +28816,11 @@ esac
+@@ -29110,11 +28814,11 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -25164,7 +27891,29 @@
fi
-@@ -29145,10 +28851,10 @@ fi
+@@ -29122,7 +28826,9 @@
+ done
+
+
+- if test x$enable_gtk_doc = xyes; then
++
++
++if test x$enable_gtk_doc = xyes; then
+ ENABLE_GTK_DOC_TRUE=
+ ENABLE_GTK_DOC_FALSE='#'
+ else
+@@ -29130,7 +28836,9 @@
+ ENABLE_GTK_DOC_FALSE=
+ fi
+
+- if test -n "$LIBTOOL"; then
++
++
++if test -n "$LIBTOOL"; then
+ GTK_DOC_USE_LIBTOOL_TRUE=
+ GTK_DOC_USE_LIBTOOL_FALSE='#'
+ else
+@@ -29145,10 +28853,10 @@
gdu_cv_version_required=0.3.2
if test -n "$PKG_CONFIG" && \
@@ -25177,7 +27926,7 @@
(exit $ac_status); }; then
gdu_cv_have_gdu=yes
else
-@@ -29158,8 +28864,8 @@ fi
+@@ -29158,8 +28866,8 @@
if test "$gdu_cv_have_gdu" = "yes"; then
:
else
@@ -25188,7 +27937,29 @@
{ (exit 1); exit 1; }; }
fi
-@@ -29230,10 +28936,10 @@ fi
+@@ -29204,7 +28912,9 @@
+ enable_scrollkeeper=yes
+ fi
+
+- if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
++
++
++if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+ ENABLE_SK_TRUE=
+ ENABLE_SK_FALSE='#'
+ else
+@@ -29216,7 +28926,9 @@
+ DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+
+
+- if test "$gdu_cv_have_gdu" = "yes"; then
++
++
++if test "$gdu_cv_have_gdu" = "yes"; then
+ HAVE_GNOME_DOC_UTILS_TRUE=
+ HAVE_GNOME_DOC_UTILS_FALSE='#'
+ else
+@@ -29230,10 +28942,10 @@
# Extract the first word of "scrollkeeper-config", so it can be a program name with args.
set dummy scrollkeeper-config; ac_word=$2
@@ -25202,7 +27973,7 @@
else
case $SCROLLKEEPER_CONFIG in
[\\/]* | ?:[\\/]*)
-@@ -29248,7 +28954,7 @@ do
+@@ -29248,7 +28960,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext"
@@ -25211,7 +27982,7 @@
break 2
fi
done
-@@ -29261,17 +28967,17 @@ esac
+@@ -29261,17 +28973,17 @@
fi
SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG
if test -n "$SCROLLKEEPER_CONFIG"; then
@@ -25235,7 +28006,7 @@
{ (exit 1); exit 1; }; }
fi
-@@ -29290,8 +28996,8 @@ fi
+@@ -29290,8 +29002,8 @@
@@ -25246,7 +28017,7 @@
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-@@ -29305,15 +29011,15 @@ fi
+@@ -29305,20 +29017,22 @@
@@ -25266,7 +28037,15 @@
{ (exit 1); exit 1; }; } ;;
esac
fi
-@@ -29343,10 +29049,10 @@ for ac_prog in mawk gawk nawk awk
+
+- if test "$enable_schemas_install" != no; then
++
++
++if test "$enable_schemas_install" != no; then
+ GCONF_SCHEMAS_INSTALL_TRUE=
+ GCONF_SCHEMAS_INSTALL_FALSE='#'
+ else
+@@ -29343,10 +29057,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -25280,7 +28059,7 @@
else
case $AWK in
[\\/]* | ?:[\\/]*)
-@@ -29361,7 +29067,7 @@ do
+@@ -29361,7 +29075,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
@@ -25289,7 +28068,7 @@
break 2
fi
done
-@@ -29373,11 +29079,11 @@ esac
+@@ -29373,11 +29087,11 @@
fi
AWK=$ac_cv_path_AWK
if test -n "$AWK"; then
@@ -25305,7 +28084,7 @@
fi
-@@ -29388,10 +29094,10 @@ for ac_prog in perl5 perl
+@@ -29388,10 +29102,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -25319,7 +28098,7 @@
else
case $PERL in
[\\/]* | ?:[\\/]*)
-@@ -29406,7 +29112,7 @@ do
+@@ -29406,7 +29120,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
@@ -25328,7 +28107,7 @@
break 2
fi
done
-@@ -29418,11 +29124,11 @@ esac
+@@ -29418,11 +29132,11 @@
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
@@ -25344,7 +28123,7 @@
fi
-@@ -29475,12 +29181,11 @@ _ACEOF
+@@ -29475,12 +29189,11 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -25359,7 +28138,7 @@
*) $as_unset $ac_var ;;
esac ;;
esac
-@@ -29513,12 +29218,12 @@ $as_echo "$as_me: WARNING: Cache variabl
+@@ -29513,12 +29226,12 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -25376,7 +28155,7 @@
fi
fi
rm -f confcache
-@@ -29534,7 +29239,7 @@ ac_ltlibobjs=
+@@ -29534,7 +29247,7 @@
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -25385,7 +28164,7 @@
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -29546,23 +29251,23 @@ LTLIBOBJS=$ac_ltlibobjs
+@@ -29546,23 +29259,23 @@
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -25415,7 +28194,7 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-@@ -29571,104 +29276,103 @@ fi
+@@ -29571,104 +29284,103 @@
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
@@ -25549,7 +28328,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -29681,7 +29385,7 @@ ac_cs_silent=false
+@@ -29681,7 +29393,7 @@
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
@@ -25558,7 +28337,7 @@
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-@@ -29691,7 +29395,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
+@@ -29691,7 +29403,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -25567,7 +28346,7 @@
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
-@@ -29713,45 +29417,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
+@@ -29713,45 +29425,17 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
@@ -25622,7 +28401,7 @@
fi
# Support unset when possible.
-@@ -29767,6 +29443,8 @@ fi
+@@ -29767,6 +29451,8 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
@@ -25631,7 +28410,7 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-@@ -29789,7 +29467,7 @@ if test "x$as_myself" = x; then
+@@ -29789,7 +29475,7 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
@@ -25640,7 +28419,7 @@
{ (exit 1); exit 1; }
fi
-@@ -29802,10 +29480,17 @@ PS2='> '
+@@ -29802,10 +29488,17 @@
PS4='+ '
# NLS nuisances.
@@ -25662,7 +28441,7 @@
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -29827,7 +29512,7 @@ as_me=`$as_basename -- "$0" ||
+@@ -29827,7 +29520,7 @@
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
@@ -25671,7 +28450,7 @@
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
-@@ -29878,7 +29563,7 @@ $as_unset CDPATH
+@@ -29878,7 +29571,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -25680,7 +28459,7 @@
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
-@@ -29906,6 +29591,7 @@ case `echo -n x` in
+@@ -29906,6 +29599,7 @@
*)
ECHO_N='-n';;
esac
@@ -25688,7 +28467,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -29918,22 +29604,19 @@ if test -d conf$$.dir; then
+@@ -29918,22 +29612,19 @@
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
@@ -25722,7 +28501,7 @@
else
as_ln_s='cp -p'
fi
-@@ -29958,10 +29641,10 @@ else
+@@ -29958,10 +29649,10 @@
as_test_x='
eval sh -c '\''
if test -d "$1"; then
@@ -25735,7 +28514,7 @@
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
-@@ -29984,7 +29667,7 @@ exec 6>&1
+@@ -29984,7 +29675,7 @@
# values after options handling.
ac_log="
This file was extended by gnome-panel $as_me 2.24.2, which was
@@ -25744,7 +28523,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -29997,7 +29680,7 @@ on `(hostname || uname -n) 2>/dev/null |
+@@ -29997,7 +29688,7 @@
_ACEOF
@@ -25753,7 +28532,7 @@
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
-@@ -30005,7 +29688,7 @@ config_commands="$ac_config_commands"
+@@ -30005,7 +29696,7 @@
_ACEOF
@@ -25762,7 +28541,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -30018,9 +29701,9 @@ Usage: $0 [OPTIONS] [FILE]...
+@@ -30018,9 +29709,9 @@
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
@@ -25774,7 +28553,7 @@
Configuration files:
$config_files
-@@ -30034,13 +29717,13 @@ $config_commands
+@@ -30034,26 +29725,24 @@
Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
@@ -25792,10 +28571,10 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -30048,12 +29731,11 @@ ac_pwd='$ac_pwd'
+ ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
- MKDIR_P='$MKDIR_P'
+-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
_ACEOF
@@ -25808,7 +28587,7 @@
ac_need_defaults=:
while test $# != 0
do
-@@ -30075,36 +29757,30 @@ do
+@@ -30075,36 +29764,30 @@
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
@@ -25851,7 +28630,7 @@
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
-@@ -30123,29 +29799,27 @@ if $ac_cs_silent; then
+@@ -30123,29 +29806,27 @@
fi
_ACEOF
@@ -25888,7 +28667,7 @@
#
# INIT-COMMANDS
#
-@@ -30154,7 +29828,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac
+@@ -30154,7 +29835,7 @@
_ACEOF
@@ -25897,7 +28676,7 @@
# Handling of arguments.
for ac_config_target in $ac_config_targets
-@@ -30211,8 +29885,8 @@ do
+@@ -30211,8 +29892,8 @@
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -25908,7 +28687,7 @@
{ (exit 1); exit 1; }; };;
esac
done
-@@ -30253,143 +29927,373 @@ $debug ||
+@@ -30253,143 +29934,372 @@
(umask 077 && mkdir "$tmp")
} ||
{
@@ -25929,7 +28708,6 @@
if test -n "$CONFIG_FILES"; then
+_ACEOF
-+
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
@@ -25938,6 +28716,7 @@
-else
- ac_cs_awk_cr=$ac_cr
+
++
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
@@ -25981,7 +28760,6 @@
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+am__isrc!$am__isrc$ac_delim
+CYGPATH_W!$CYGPATH_W$ac_delim
+PACKAGE!$PACKAGE$ac_delim
+VERSION!$VERSION$ac_delim
@@ -26038,6 +28816,7 @@
+CC!$CC$ac_delim
+CFLAGS!$CFLAGS$ac_delim
+LDFLAGS!$LDFLAGS$ac_delim
++CPPFLAGS!$CPPFLAGS$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -26093,7 +28872,6 @@
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ cat >conf$$subs.sed <<_ACEOF
-+CPPFLAGS!$CPPFLAGS$ac_delim
+ac_ct_CC!$ac_ct_CC$ac_delim
+EXEEXT!$EXEEXT$ac_delim
+OBJEXT!$OBJEXT$ac_delim
@@ -26190,6 +28968,7 @@
+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
+CATALOGS!$CATALOGS$ac_delim
++CATOBJEXT!$CATOBJEXT$ac_delim
+_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
@@ -26307,7 +29086,6 @@
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
-+CATOBJEXT!$CATOBJEXT$ac_delim
+GMOFILES!$GMOFILES$ac_delim
+INSTOBJEXT!$INSTOBJEXT$ac_delim
+INTLLIBS!$INTLLIBS$ac_delim
@@ -26349,7 +29127,7 @@
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -26390,7 +29168,7 @@
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
-@@ -30405,133 +30309,19 @@ s/^[^=]*=[ ]*$//
+@@ -30405,133 +30315,19 @@
}'
fi
@@ -26528,7 +29306,7 @@
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -30560,38 +30350,26 @@ $as_echo "$as_me: error: Invalid tag $ac
+@@ -30560,38 +30356,26 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -26575,7 +29353,7 @@
esac
;;
esac
-@@ -30601,7 +30379,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^
+@@ -30601,7 +30385,7 @@
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26584,7 +29362,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -30627,7 +30405,7 @@ $as_echo X"$ac_file" |
+@@ -30627,7 +30411,7 @@
as_dirs=
while :; do
case $as_dir in #(
@@ -26593,7 +29371,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -30636,7 +30414,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
+@@ -30636,7 +30420,7 @@
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26602,7 +29380,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -30657,17 +30435,17 @@ $as_echo X"$as_dir" |
+@@ -30657,17 +30441,17 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -26624,8 +29402,15 @@
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -30712,13 +30490,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+@@ -30705,20 +30489,14 @@
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+- ac_MKDIR_P=$MKDIR_P
+- case $MKDIR_P in
+- [\\/$]* | ?:[\\/]* ) ;;
+- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+- esac
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -26640,7 +29425,7 @@
p
q
}
-@@ -30727,14 +30504,13 @@ ac_sed_dataroot='
+@@ -30727,14 +30505,13 @@
/@infodir@/p
/@localedir@/p
/@mandir@/p
@@ -26659,7 +29444,7 @@
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
-@@ -30748,16 +30524,15 @@ _ACEOF
+@@ -30748,16 +30525,15 @@
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
@@ -26680,9 +29465,11 @@
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -30768,60 +30543,121 @@ s&@abs_top_builddir@&$ac_abs_top_builddi
+@@ -30766,77 +30542,136 @@
+ s&@abs_builddir@&$ac_abs_builddir&;t t
+ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
- s&@MKDIR_P@&$ac_MKDIR_P&;t t
+-s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -26833,20 +29620,32 @@
-_am_arg="$ac_file"
+ rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
-+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
-@@ -30836,7 +30672,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^
- X"$_am_arg" : 'X\(//\)[^/]' \| \
- X"$_am_arg" : 'X\(//\)$' \| \
- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+- $_am_arg | $_am_arg:* )
++ $ac_file | $ac_file:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+ done
+-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+- X"$_am_arg" : 'X\(//\)[^/]' \| \
+- X"$_am_arg" : 'X\(//\)$' \| \
+- X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-+echo X"$_am_arg" |
++echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
++$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X$ac_file : 'X\(//\)[^/]' \| \
++ X$ac_file : 'X\(//\)$' \| \
++ X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
++echo X$ac_file |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -30856,8 +30692,8 @@ $as_echo X"$_am_arg" |
+@@ -30856,8 +30691,8 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -26857,7 +29656,17 @@
;;
esac
-@@ -30879,7 +30715,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
+@@ -30871,15 +30706,14 @@
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ # So let's grep whole file.
++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26866,7 +29675,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -30923,7 +30759,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
+@@ -30923,7 +30757,7 @@
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26875,7 +29684,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -30949,7 +30785,7 @@ $as_echo X"$file" |
+@@ -30949,7 +30783,7 @@
as_dirs=
while :; do
case $as_dir in #(
@@ -26884,7 +29693,7 @@
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
-@@ -30958,7 +30794,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/
+@@ -30958,7 +30792,7 @@
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -26893,7 +29702,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -30979,8 +30815,8 @@ $as_echo X"$as_dir" |
+@@ -30979,8 +30813,8 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -26904,7 +29713,7 @@
{ (exit 1); exit 1; }; }; }
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
-@@ -31017,11 +30853,6 @@ _ACEOF
+@@ -31017,11 +30851,6 @@
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
@@ -26916,7 +29725,7 @@
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
-@@ -31043,10 +30874,6 @@ if test "$no_create" != yes; then
+@@ -31043,10 +30872,6 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
@@ -26927,11 +29736,111 @@
if echo foo | xgettext --from-code=UTF-8 -LC -o - - 2>/dev/null ; then
-Index: gnome-panel-2.24.2/doc/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/doc/Makefile.in 2008-12-27 18:41:52.611986509 +0100
-+++ gnome-panel-2.24.2/doc/Makefile.in 2008-12-28 02:39:36.279481540 +0100
-@@ -156,6 +156,8 @@ LIBS = @LIBS@
+--- gnome-panel-2.24.2.orig/doc/Makefile.in
++++ gnome-panel-2.24.2/doc/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -47,13 +51,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -61,6 +62,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -77,6 +80,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -102,12 +107,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -116,9 +129,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +176,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -26939,20 +29848,356 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -167,6 +190,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -202,6 +227,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -209,13 +236,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -227,7 +254,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -255,12 +281,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
SUBDIRS = reference
-Index: gnome-panel-2.24.2/doc/reference/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/doc/reference/Makefile.in 2008-12-27 18:41:52.571986593 +0100
-+++ gnome-panel-2.24.2/doc/reference/Makefile.in 2008-12-28 02:39:36.367481551 +0100
-@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ EXTRA_DIST = \
+ panel-session-handling.txt \
+@@ -305,6 +327,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -336,7 +362,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -380,8 +407,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -406,8 +433,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -417,12 +444,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -436,21 +464,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -464,7 +493,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -472,8 +501,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -513,7 +540,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -527,20 +555,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -559,24 +579,22 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/doc/reference/Makefile.in
++++ gnome-panel-2.24.2/doc/reference/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -47,13 +51,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -61,6 +62,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -77,6 +80,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -102,12 +107,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -116,9 +129,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +176,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -26960,20 +30205,338 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -167,6 +190,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -202,6 +227,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -209,13 +236,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -227,7 +254,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -255,12 +281,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
SUBDIRS = panel-applet
-Index: gnome-panel-2.24.2/doc/reference/panel-applet/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/doc/reference/panel-applet/Makefile.in 2008-12-27 18:41:52.523989431 +0100
-+++ gnome-panel-2.24.2/doc/reference/panel-applet/Makefile.in 2008-12-28 02:39:36.471481431 +0100
-@@ -151,6 +151,8 @@ LIBS = @LIBS@
+ all: all-recursive
+
+@@ -301,6 +323,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -332,7 +358,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -376,8 +403,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -402,8 +429,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -413,12 +440,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -432,21 +460,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -460,7 +489,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -468,8 +497,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -509,7 +536,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -523,20 +551,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -555,24 +575,22 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/doc/reference/panel-applet/Makefile.in
++++ gnome-panel-2.24.2/doc/reference/panel-applet/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -19,11 +19,15 @@
+ ####################################
+ # Everything below here is generic #
+ ####################################
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -56,6 +60,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -72,6 +78,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -97,12 +105,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -111,9 +127,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -151,10 +174,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -26981,20 +30544,207 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -253,7 +255,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -162,6 +188,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -197,6 +225,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -204,13 +234,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -222,7 +252,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -250,12 +279,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.6
-Index: gnome-panel-2.24.2/gnome-panel/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/gnome-panel/Makefile.in 2008-12-27 18:41:52.499989872 +0100
-+++ gnome-panel-2.24.2/gnome-panel/Makefile.in 2008-12-28 02:39:36.679481190 +0100
-@@ -33,7 +33,8 @@ PRE_UNINSTALL = :
+
+ # The name of the module, e.g. 'glib'.
+@@ -389,6 +414,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -397,21 +426,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -460,7 +491,8 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-local
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-local
+
+ dvi: dvi-am
+
+@@ -474,20 +506,12 @@
+
+ install-data-am: install-data-local
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -507,23 +531,19 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am all-local check check-am clean clean-generic \
+ clean-libtool clean-local dist-hook distclean \
+ distclean-generic distclean-libtool distclean-local distdir \
+ dvi dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data install-data-am install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-local mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-local
++ uninstall-info-am uninstall-local
+
+
+ @ENABLE_GTK_DOC_TRUE at all-local: html-build.stamp
+--- gnome-panel-2.24.2.orig/gnome-panel/Makefile.in
++++ gnome-panel-2.24.2/gnome-panel/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -15,11 +15,15 @@
+ @SET_MAKE@
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -33,7 +37,8 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@@ -27004,7 +30754,17 @@
subdir = gnome-panel
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/gnome-panel.desktop.in.in ChangeLog
-@@ -88,7 +89,8 @@ am__objects_3 = panel-typebuiltins.$(OBJ
+@@ -62,9 +67,6 @@
+ gnome_desktop_item_edit_DEPENDENCIES = \
+ $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-gnome_desktop_item_edit_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(gnome_desktop_item_edit_LDFLAGS) $(LDFLAGS) -o $@
+ am__objects_1 =
+ am__objects_2 = GNOME_Panel-stubs.$(OBJEXT) \
+ GNOME_Panel-skels.$(OBJEXT) GNOME_Panel-common.$(OBJEXT) \
+@@ -88,7 +90,8 @@
panel-multiscreen.$(OBJEXT) panel-a11y.$(OBJEXT) \
panel-bindings.$(OBJEXT) panel-profile.$(OBJEXT) \
panel-force-quit.$(OBJEXT) panel-lockdown.$(OBJEXT) \
@@ -27014,10 +30774,14 @@
$(am__objects_1)
am__objects_4 = $(am__objects_1)
am_gnome_panel_OBJECTS = $(am__objects_2) $(am__objects_3) \
-@@ -100,6 +102,21 @@ gnome_panel_DEPENDENCIES = \
- gnome_panel_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(gnome_panel_LDFLAGS) $(LDFLAGS) -o $@
+@@ -97,31 +100,38 @@
+ gnome_panel_DEPENDENCIES = \
+ $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-gnome_panel_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(gnome_panel_LDFLAGS) $(LDFLAGS) -o $@
+-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+am_gnome_panel_logout_OBJECTS = \
+ gnome_panel_logout-gnome-panel-logout.$(OBJEXT) \
+ gnome_panel_logout-panel-logout.$(OBJEXT) \
@@ -27029,18 +30793,24 @@
+gnome_panel_logout_DEPENDENCIES = \
+ $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+gnome_panel_logout_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-+ $(gnome_panel_logout_CFLAGS) $(CFLAGS) \
-+ $(gnome_panel_logout_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -112,9 +129,10 @@ CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
-SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(gnome_desktop_item_edit_SOURCES) $(gnome_panel_SOURCES) \
+ $(gnome_panel_logout_SOURCES)
DIST_SOURCES = $(gnome_desktop_item_edit_SOURCES) \
@@ -27048,8 +30818,85 @@
+ $(gnome_panel_SOURCES) $(gnome_panel_logout_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
-@@ -241,6 +259,8 @@ LIBS = @LIBS@
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -137,8 +147,6 @@
+ uiDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(desktop_DATA) $(entries_DATA) $(glade_DATA) $(rc_DATA) \
+ $(schemas_DATA) $(server_DATA) $(ui_DATA)
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -146,6 +154,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -162,6 +172,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -187,12 +199,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -201,9 +221,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -241,10 +268,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27057,16 +30904,71 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -343,7 +363,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -252,6 +282,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -287,6 +319,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -294,13 +328,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -312,7 +346,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -340,12 +373,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.3
-@@ -434,6 +453,8 @@ panel_sources = \
+ SUBDIRS = libpanel-util
+ NULL =
+@@ -434,6 +463,8 @@
panel-force-quit.c \
panel-lockdown.c \
panel-addto.c \
@@ -27075,7 +30977,7 @@
panel-ditem-editor.c \
$(NULL)
-@@ -480,6 +501,8 @@ panel_headers = \
+@@ -480,6 +511,8 @@
panel-force-quit.h \
panel-lockdown.h \
panel-addto.h \
@@ -27084,7 +30986,7 @@
panel-ditem-editor.h \
panel-icon-names.h \
$(NULL)
-@@ -496,6 +519,21 @@ gnome_panel_LDADD = \
+@@ -496,6 +529,21 @@
$(X_LIBS)
gnome_panel_LDFLAGS = -export-dynamic
@@ -27106,17 +31008,42 @@
gnome_desktop_item_edit_SOURCES = \
gnome-desktop-item-edit.c \
panel-ditem-editor.c \
-@@ -630,6 +668,9 @@ gnome-desktop-item-edit$(EXEEXT): $(gnom
+@@ -598,15 +646,15 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+@@ -626,10 +674,13 @@
+ done
+ gnome-desktop-item-edit$(EXEEXT): $(gnome_desktop_item_edit_OBJECTS) $(gnome_desktop_item_edit_DEPENDENCIES)
+ @rm -f gnome-desktop-item-edit$(EXEEXT)
+- $(gnome_desktop_item_edit_LINK) $(gnome_desktop_item_edit_OBJECTS) $(gnome_desktop_item_edit_LDADD) $(LIBS)
++ $(LINK) $(gnome_desktop_item_edit_LDFLAGS) $(gnome_desktop_item_edit_OBJECTS) $(gnome_desktop_item_edit_LDADD) $(LIBS)
gnome-panel$(EXEEXT): $(gnome_panel_OBJECTS) $(gnome_panel_DEPENDENCIES)
@rm -f gnome-panel$(EXEEXT)
- $(gnome_panel_LINK) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS)
+- $(gnome_panel_LINK) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS)
++ $(LINK) $(gnome_panel_LDFLAGS) $(gnome_panel_OBJECTS) $(gnome_panel_LDADD) $(LIBS)
+gnome-panel-logout$(EXEEXT): $(gnome_panel_logout_OBJECTS) $(gnome_panel_logout_DEPENDENCIES)
+ @rm -f gnome-panel-logout$(EXEEXT)
-+ $(gnome_panel_logout_LINK) $(gnome_panel_logout_OBJECTS) $(gnome_panel_logout_LDADD) $(LIBS)
++ $(LINK) $(gnome_panel_logout_LDFLAGS) $(gnome_panel_logout_OBJECTS) $(gnome_panel_logout_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -644,6 +685,12 @@ distclean-compile:
+@@ -644,6 +695,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@
@@ -27129,7 +31056,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@
-@@ -662,7 +709,9 @@ distclean-compile:
+@@ -662,7 +719,9 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-force-quit.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-frame.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-gconf.Po at am__quote@
@@ -27139,90 +31066,116 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-marshal.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-menu-bar.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-menu-button.Po at am__quote@
-@@ -706,6 +755,90 @@ distclean-compile:
+@@ -686,34 +745,122 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xstuff.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+gnome_panel_logout-gnome-panel-logout.o: gnome-panel-logout.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-gnome-panel-logout.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo -c -o gnome_panel_logout-gnome-panel-logout.o `test -f 'gnome-panel-logout.c' || echo '$(srcdir)/'`gnome-panel-logout.c
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-gnome-panel-logout.o -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo" -c -o gnome_panel_logout-gnome-panel-logout.o `test -f 'gnome-panel-logout.c' || echo '$(srcdir)/'`gnome-panel-logout.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo" "$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-panel-logout.c' object='gnome_panel_logout-gnome-panel-logout.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-gnome-panel-logout.o `test -f 'gnome-panel-logout.c' || echo '$(srcdir)/'`gnome-panel-logout.c
+
+gnome_panel_logout-gnome-panel-logout.obj: gnome-panel-logout.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-gnome-panel-logout.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo -c -o gnome_panel_logout-gnome-panel-logout.obj `if test -f 'gnome-panel-logout.c'; then $(CYGPATH_W) 'gnome-panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/gnome-panel-logout.c'; fi`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-gnome-panel-logout.obj -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo" -c -o gnome_panel_logout-gnome-panel-logout.obj `if test -f 'gnome-panel-logout.c'; then $(CYGPATH_W) 'gnome-panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/gnome-panel-logout.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo" "$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-gnome-panel-logout.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-panel-logout.c' object='gnome_panel_logout-gnome-panel-logout.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-gnome-panel-logout.obj `if test -f 'gnome-panel-logout.c'; then $(CYGPATH_W) 'gnome-panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/gnome-panel-logout.c'; fi`
+
+gnome_panel_logout-panel-logout.o: panel-logout.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-logout.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo -c -o gnome_panel_logout-panel-logout.o `test -f 'panel-logout.c' || echo '$(srcdir)/'`panel-logout.c
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-panel-logout.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-logout.o -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-panel-logout.Tpo" -c -o gnome_panel_logout-panel-logout.o `test -f 'panel-logout.c' || echo '$(srcdir)/'`panel-logout.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-panel-logout.Tpo" "$(DEPDIR)/gnome_panel_logout-panel-logout.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-panel-logout.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-logout.c' object='gnome_panel_logout-panel-logout.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-logout.o `test -f 'panel-logout.c' || echo '$(srcdir)/'`panel-logout.c
+
+gnome_panel_logout-panel-logout.obj: panel-logout.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-logout.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo -c -o gnome_panel_logout-panel-logout.obj `if test -f 'panel-logout.c'; then $(CYGPATH_W) 'panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/panel-logout.c'; fi`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-logout.Tpo $(DEPDIR)/gnome_panel_logout-panel-logout.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-logout.obj -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-panel-logout.Tpo" -c -o gnome_panel_logout-panel-logout.obj `if test -f 'panel-logout.c'; then $(CYGPATH_W) 'panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/panel-logout.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-panel-logout.Tpo" "$(DEPDIR)/gnome_panel_logout-panel-logout.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-panel-logout.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-logout.c' object='gnome_panel_logout-panel-logout.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-logout.obj `if test -f 'panel-logout.c'; then $(CYGPATH_W) 'panel-logout.c'; else $(CYGPATH_W) '$(srcdir)/panel-logout.c'; fi`
+
+gnome_panel_logout-panel-lockdown.o: panel-lockdown.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-lockdown.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo -c -o gnome_panel_logout-panel-lockdown.o `test -f 'panel-lockdown.c' || echo '$(srcdir)/'`panel-lockdown.c
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo $(DEPDIR)/gnome_panel_logout-panel-lockdown.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-lockdown.o -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo" -c -o gnome_panel_logout-panel-lockdown.o `test -f 'panel-lockdown.c' || echo '$(srcdir)/'`panel-lockdown.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo" "$(DEPDIR)/gnome_panel_logout-panel-lockdown.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-lockdown.c' object='gnome_panel_logout-panel-lockdown.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-lockdown.o `test -f 'panel-lockdown.c' || echo '$(srcdir)/'`panel-lockdown.c
+
+gnome_panel_logout-panel-lockdown.obj: panel-lockdown.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-lockdown.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo -c -o gnome_panel_logout-panel-lockdown.obj `if test -f 'panel-lockdown.c'; then $(CYGPATH_W) 'panel-lockdown.c'; else $(CYGPATH_W) '$(srcdir)/panel-lockdown.c'; fi`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo $(DEPDIR)/gnome_panel_logout-panel-lockdown.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-lockdown.obj -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo" -c -o gnome_panel_logout-panel-lockdown.obj `if test -f 'panel-lockdown.c'; then $(CYGPATH_W) 'panel-lockdown.c'; else $(CYGPATH_W) '$(srcdir)/panel-lockdown.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo" "$(DEPDIR)/gnome_panel_logout-panel-lockdown.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-panel-lockdown.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-lockdown.c' object='gnome_panel_logout-panel-lockdown.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-lockdown.obj `if test -f 'panel-lockdown.c'; then $(CYGPATH_W) 'panel-lockdown.c'; else $(CYGPATH_W) '$(srcdir)/panel-lockdown.c'; fi`
+
+gnome_panel_logout-panel-gdm.o: panel-gdm.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-gdm.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo -c -o gnome_panel_logout-panel-gdm.o `test -f 'panel-gdm.c' || echo '$(srcdir)/'`panel-gdm.c
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo $(DEPDIR)/gnome_panel_logout-panel-gdm.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-gdm.o -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo" -c -o gnome_panel_logout-panel-gdm.o `test -f 'panel-gdm.c' || echo '$(srcdir)/'`panel-gdm.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo" "$(DEPDIR)/gnome_panel_logout-panel-gdm.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-gdm.c' object='gnome_panel_logout-panel-gdm.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-gdm.o `test -f 'panel-gdm.c' || echo '$(srcdir)/'`panel-gdm.c
+
+gnome_panel_logout-panel-gdm.obj: panel-gdm.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-gdm.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo -c -o gnome_panel_logout-panel-gdm.obj `if test -f 'panel-gdm.c'; then $(CYGPATH_W) 'panel-gdm.c'; else $(CYGPATH_W) '$(srcdir)/panel-gdm.c'; fi`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo $(DEPDIR)/gnome_panel_logout-panel-gdm.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-gdm.obj -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo" -c -o gnome_panel_logout-panel-gdm.obj `if test -f 'panel-gdm.c'; then $(CYGPATH_W) 'panel-gdm.c'; else $(CYGPATH_W) '$(srcdir)/panel-gdm.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo" "$(DEPDIR)/gnome_panel_logout-panel-gdm.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-panel-gdm.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-gdm.c' object='gnome_panel_logout-panel-gdm.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-gdm.obj `if test -f 'panel-gdm.c'; then $(CYGPATH_W) 'panel-gdm.c'; else $(CYGPATH_W) '$(srcdir)/panel-gdm.c'; fi`
+
+gnome_panel_logout-panel-session.o: panel-session.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-session.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-session.Tpo -c -o gnome_panel_logout-panel-session.o `test -f 'panel-session.c' || echo '$(srcdir)/'`panel-session.c
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-session.Tpo $(DEPDIR)/gnome_panel_logout-panel-session.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-session.o -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-panel-session.Tpo" -c -o gnome_panel_logout-panel-session.o `test -f 'panel-session.c' || echo '$(srcdir)/'`panel-session.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-panel-session.Tpo" "$(DEPDIR)/gnome_panel_logout-panel-session.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-panel-session.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-session.c' object='gnome_panel_logout-panel-session.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-session.o `test -f 'panel-session.c' || echo '$(srcdir)/'`panel-session.c
+
+gnome_panel_logout-panel-session.obj: panel-session.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-session.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-session.Tpo -c -o gnome_panel_logout-panel-session.obj `if test -f 'panel-session.c'; then $(CYGPATH_W) 'panel-session.c'; else $(CYGPATH_W) '$(srcdir)/panel-session.c'; fi`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-session.Tpo $(DEPDIR)/gnome_panel_logout-panel-session.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-session.obj -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-panel-session.Tpo" -c -o gnome_panel_logout-panel-session.obj `if test -f 'panel-session.c'; then $(CYGPATH_W) 'panel-session.c'; else $(CYGPATH_W) '$(srcdir)/panel-session.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-panel-session.Tpo" "$(DEPDIR)/gnome_panel_logout-panel-session.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-panel-session.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-session.c' object='gnome_panel_logout-panel-session.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-session.obj `if test -f 'panel-session.c'; then $(CYGPATH_W) 'panel-session.c'; else $(CYGPATH_W) '$(srcdir)/panel-session.c'; fi`
+
+gnome_panel_logout-panel-util.o: panel-util.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-util.o -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-util.Tpo -c -o gnome_panel_logout-panel-util.o `test -f 'panel-util.c' || echo '$(srcdir)/'`panel-util.c
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-util.Tpo $(DEPDIR)/gnome_panel_logout-panel-util.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-util.o -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-panel-util.Tpo" -c -o gnome_panel_logout-panel-util.o `test -f 'panel-util.c' || echo '$(srcdir)/'`panel-util.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-panel-util.Tpo" "$(DEPDIR)/gnome_panel_logout-panel-util.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-panel-util.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-util.c' object='gnome_panel_logout-panel-util.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-util.o `test -f 'panel-util.c' || echo '$(srcdir)/'`panel-util.c
+
+gnome_panel_logout-panel-util.obj: panel-util.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-util.obj -MD -MP -MF $(DEPDIR)/gnome_panel_logout-panel-util.Tpo -c -o gnome_panel_logout-panel-util.obj `if test -f 'panel-util.c'; then $(CYGPATH_W) 'panel-util.c'; else $(CYGPATH_W) '$(srcdir)/panel-util.c'; fi`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gnome_panel_logout-panel-util.Tpo $(DEPDIR)/gnome_panel_logout-panel-util.Po
++ at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -MT gnome_panel_logout-panel-util.obj -MD -MP -MF "$(DEPDIR)/gnome_panel_logout-panel-util.Tpo" -c -o gnome_panel_logout-panel-util.obj `if test -f 'panel-util.c'; then $(CYGPATH_W) 'panel-util.c'; else $(CYGPATH_W) '$(srcdir)/panel-util.c'; fi`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gnome_panel_logout-panel-util.Tpo" "$(DEPDIR)/gnome_panel_logout-panel-util.Po"; else rm -f "$(DEPDIR)/gnome_panel_logout-panel-util.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='panel-util.c' object='gnome_panel_logout-panel-util.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_panel_logout_CFLAGS) $(CFLAGS) -c -o gnome_panel_logout-panel-util.obj `if test -f 'panel-util.c'; then $(CYGPATH_W) 'panel-util.c'; else $(CYGPATH_W) '$(srcdir)/panel-util.c'; fi`
@@ -27230,11 +31183,354 @@
mostlyclean-libtool:
-rm -f *.lo
-Index: gnome-panel-2.24.2/help/clock/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/clock/Makefile.in 2008-12-27 18:41:52.419990040 +0100
-+++ gnome-panel-2.24.2/help/clock/Makefile.in 2008-12-28 02:39:37.015981989 +0100
-@@ -169,6 +169,8 @@ LIBS = @LIBS@
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-desktopDATA: $(desktop_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
++ test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
+ @list='$(desktop_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -730,7 +877,7 @@
+ done
+ install-entriesDATA: $(entries_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(entriesdir)" || $(MKDIR_P) "$(DESTDIR)$(entriesdir)"
++ test -z "$(entriesdir)" || $(mkdir_p) "$(DESTDIR)$(entriesdir)"
+ @list='$(entries_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -747,7 +894,7 @@
+ done
+ install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
++ test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -764,7 +911,7 @@
+ done
+ install-rcDATA: $(rc_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
++ test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+ @list='$(rc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -781,7 +928,7 @@
+ done
+ install-schemasDATA: $(schemas_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
++ test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
+ @list='$(schemas_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -798,7 +945,7 @@
+ done
+ install-serverDATA: $(server_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
++ test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
+ @list='$(server_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -815,7 +962,7 @@
+ done
+ install-uiDATA: $(ui_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
++ test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)"
+ @list='$(ui_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -862,7 +1009,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -906,8 +1054,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -932,8 +1080,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -943,12 +1091,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -962,21 +1111,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -990,7 +1140,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -998,8 +1148,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1014,7 +1162,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(entriesdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+@@ -1051,7 +1199,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -1067,20 +1215,12 @@
+ install-entriesDATA install-gladeDATA install-rcDATA \
+ install-schemasDATA install-serverDATA install-uiDATA
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am: install-binPROGRAMS
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -1102,32 +1242,32 @@
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
+- uninstall-entriesDATA uninstall-gladeDATA uninstall-rcDATA \
+- uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA
+-
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
+-
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-binPROGRAMS \
+- clean-generic clean-libtool ctags ctags-recursive dist-hook \
+- distclean distclean-compile distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++ uninstall-entriesDATA uninstall-gladeDATA uninstall-info-am \
++ uninstall-rcDATA uninstall-schemasDATA uninstall-serverDATA \
++ uninstall-uiDATA
++
++uninstall-info: uninstall-info-recursive
++
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-binPROGRAMS clean-generic clean-libtool \
++ clean-recursive ctags ctags-recursive dist-hook distclean \
++ distclean-compile distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-data-local \
+- install-desktopDATA install-dvi install-dvi-am \
+- install-entriesDATA install-exec install-exec-am \
+- install-gladeDATA install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-rcDATA install-schemasDATA \
++ install-desktopDATA install-entriesDATA install-exec \
++ install-exec-am install-gladeDATA install-info install-info-am \
++ install-man install-rcDATA install-schemasDATA \
+ install-serverDATA install-strip install-uiDATA installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-desktopDATA \
+- uninstall-entriesDATA uninstall-gladeDATA uninstall-rcDATA \
+- uninstall-schemasDATA uninstall-serverDATA uninstall-uiDATA
++ uninstall-entriesDATA uninstall-gladeDATA uninstall-info-am \
++ uninstall-rcDATA uninstall-schemasDATA uninstall-serverDATA \
++ uninstall-uiDATA
+
+
+ $(gnome_panel_OBJECTS): $(BUILT_SOURCES)
+--- gnome-panel-2.24.2.orig/help/clock/Makefile.in
++++ gnome-panel-2.24.2/help/clock/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -37,11 +37,15 @@
+ # the same distribution terms that you use for the rest of that program.
+
+ ################################################################################
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -74,6 +78,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -90,6 +96,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -115,12 +123,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -129,9 +145,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -169,10 +192,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27242,20 +31538,267 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -271,7 +273,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -180,6 +206,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -215,6 +243,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -222,13 +252,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -240,7 +270,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -268,12 +297,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-Index: gnome-panel-2.24.2/help/de/fish/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/de/fish/Makefile.in 2008-12-27 18:41:52.387986392 +0100
-+++ gnome-panel-2.24.2/help/de/fish/Makefile.in 2008-12-28 02:39:37.203981791 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
+ _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \
+@@ -416,6 +441,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -424,21 +453,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -486,7 +517,8 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-local
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-local
+
+ dvi: dvi-am
+
+@@ -500,20 +532,12 @@
+
+ install-data-am: install-data-local
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -534,22 +558,19 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distclean-local distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-data-local install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic maintainer-clean-local mostlyclean \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+- pdf-am ps ps-am uninstall uninstall-am uninstall-local
++ install-data-am install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-local mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ DOC_H_FILE ?=
+--- gnome-panel-2.24.2.orig/help/de/fish/Makefile.in
++++ gnome-panel-2.24.2/help/de/fish/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27263,20 +31806,280 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/help/de/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/de/Makefile.in 2008-12-27 18:41:52.359989188 +0100
-+++ gnome-panel-2.24.2/help/de/Makefile.in 2008-12-28 02:39:37.115984713 +0100
-@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ docname = fish-applet-2
+ lang = de
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/help/de/Makefile.in
++++ gnome-panel-2.24.2/help/de/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -47,13 +51,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -61,6 +62,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -77,6 +80,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -102,12 +107,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -116,9 +129,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +176,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27284,20 +32087,338 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -167,6 +190,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -202,6 +227,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -209,13 +236,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -227,7 +254,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -255,12 +281,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
SUBDIRS = fish window-list workspace-switcher
-Index: gnome-panel-2.24.2/help/de/window-list/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/de/window-list/Makefile.in 2008-12-27 18:41:52.319988294 +0100
-+++ gnome-panel-2.24.2/help/de/window-list/Makefile.in 2008-12-28 02:39:37.295982381 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ all: all-recursive
+
+@@ -301,6 +323,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -332,7 +358,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -376,8 +403,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -402,8 +429,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -413,12 +440,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -432,21 +460,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -460,7 +489,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -468,8 +497,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -509,7 +536,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -523,20 +551,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -555,24 +575,22 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/help/de/window-list/Makefile.in
++++ gnome-panel-2.24.2/help/de/window-list/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27305,20 +32426,262 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/help/de/workspace-switcher/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/de/workspace-switcher/Makefile.in 2008-12-27 18:41:52.295988736 +0100
-+++ gnome-panel-2.24.2/help/de/workspace-switcher/Makefile.in 2008-12-28 02:39:37.391981593 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ docname = window-list
+ lang = de
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/help/de/workspace-switcher/Makefile.in
++++ gnome-panel-2.24.2/help/de/workspace-switcher/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27326,20 +32689,262 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/help/fish/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/fish/Makefile.in 2008-12-27 18:41:52.267986644 +0100
-+++ gnome-panel-2.24.2/help/fish/Makefile.in 2008-12-28 02:39:37.527481566 +0100
-@@ -169,6 +169,8 @@ LIBS = @LIBS@
+ docname = workspace-switcher
+ lang = de
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/help/fish/Makefile.in
++++ gnome-panel-2.24.2/help/fish/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -37,11 +37,15 @@
+ # the same distribution terms that you use for the rest of that program.
+
+ ################################################################################
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -74,6 +78,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -90,6 +96,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -115,12 +123,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -129,9 +145,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -169,10 +192,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27347,20 +32952,267 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -271,7 +273,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -180,6 +206,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -215,6 +243,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -222,13 +252,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -240,7 +270,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -268,12 +297,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-Index: gnome-panel-2.24.2/help/ja/fish/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/ja/fish/Makefile.in 2008-12-27 18:41:52.223985172 +0100
-+++ gnome-panel-2.24.2/help/ja/fish/Makefile.in 2008-12-28 02:39:37.707484611 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
+ _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \
+@@ -416,6 +441,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -424,21 +453,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -486,7 +517,8 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-local
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-local
+
+ dvi: dvi-am
+
+@@ -500,20 +532,12 @@
+
+ install-data-am: install-data-local
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -534,22 +558,19 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distclean-local distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-data-local install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic maintainer-clean-local mostlyclean \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+- pdf-am ps ps-am uninstall uninstall-am uninstall-local
++ install-data-am install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-local mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ DOC_H_FILE ?=
+--- gnome-panel-2.24.2.orig/help/ja/fish/Makefile.in
++++ gnome-panel-2.24.2/help/ja/fish/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27368,20 +33220,280 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/help/ja/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/ja/Makefile.in 2008-12-27 18:41:52.179982722 +0100
-+++ gnome-panel-2.24.2/help/ja/Makefile.in 2008-12-28 02:39:37.615481088 +0100
-@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ docname = fish-applet-2
+ lang = ja
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/help/ja/Makefile.in
++++ gnome-panel-2.24.2/help/ja/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -47,13 +51,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -61,6 +62,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -77,6 +80,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -102,12 +107,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -116,9 +129,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +176,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27389,20 +33501,338 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -167,6 +190,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -202,6 +227,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -209,13 +236,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -227,7 +254,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -255,12 +281,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
SUBDIRS = fish window-list workspace-switcher
-Index: gnome-panel-2.24.2/help/ja/window-list/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/ja/window-list/Makefile.in 2008-12-27 18:41:52.127990360 +0100
-+++ gnome-panel-2.24.2/help/ja/window-list/Makefile.in 2008-12-28 02:39:37.807481468 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ all: all-recursive
+
+@@ -301,6 +323,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -332,7 +358,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -376,8 +403,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -402,8 +429,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -413,12 +440,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -432,21 +460,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -460,7 +489,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -468,8 +497,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -509,7 +536,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -523,20 +551,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -555,24 +575,22 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/help/ja/window-list/Makefile.in
++++ gnome-panel-2.24.2/help/ja/window-list/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27410,20 +33840,262 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/help/ja/workspace-switcher/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/ja/workspace-switcher/Makefile.in 2008-12-27 18:41:52.099990712 +0100
-+++ gnome-panel-2.24.2/help/ja/workspace-switcher/Makefile.in 2008-12-28 02:39:37.911481836 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ docname = window-list
+ lang = ja
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/help/ja/workspace-switcher/Makefile.in
++++ gnome-panel-2.24.2/help/ja/workspace-switcher/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27431,20 +34103,280 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/help/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/Makefile.in 2008-12-27 18:41:52.071988130 +0100
-+++ gnome-panel-2.24.2/help/Makefile.in 2008-12-28 02:39:36.879485171 +0100
-@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ docname = workspace-switcher
+ lang = ja
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/help/Makefile.in
++++ gnome-panel-2.24.2/help/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -47,13 +51,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -61,6 +62,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -77,6 +80,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -102,12 +107,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -116,9 +129,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +176,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27452,20 +34384,338 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -167,6 +190,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -202,6 +227,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -209,13 +236,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -227,7 +254,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -255,12 +281,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
SUBDIRS = clock fish window-list workspace-switcher ja de zh_CN zh_TW
-Index: gnome-panel-2.24.2/help/window-list/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/window-list/Makefile.in 2008-12-27 18:41:52.031982836 +0100
-+++ gnome-panel-2.24.2/help/window-list/Makefile.in 2008-12-28 02:39:38.059481721 +0100
-@@ -169,6 +169,8 @@ LIBS = @LIBS@
+ all: all-recursive
+
+@@ -301,6 +323,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -332,7 +358,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -376,8 +403,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -402,8 +429,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -413,12 +440,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -432,21 +460,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -460,7 +489,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -468,8 +497,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -509,7 +536,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -523,20 +551,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -555,24 +575,22 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/help/window-list/Makefile.in
++++ gnome-panel-2.24.2/help/window-list/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -37,11 +37,15 @@
+ # the same distribution terms that you use for the rest of that program.
+
+ ################################################################################
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -74,6 +78,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -90,6 +96,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -115,12 +123,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -129,9 +145,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -169,10 +192,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27473,20 +34723,267 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -271,7 +273,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -180,6 +206,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -215,6 +243,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -222,13 +252,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -240,7 +270,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -268,12 +297,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-Index: gnome-panel-2.24.2/help/workspace-switcher/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/workspace-switcher/Makefile.in 2008-12-27 18:41:52.003983188 +0100
-+++ gnome-panel-2.24.2/help/workspace-switcher/Makefile.in 2008-12-28 02:39:38.211482185 +0100
-@@ -169,6 +169,8 @@ LIBS = @LIBS@
+ _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
+ _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \
+@@ -416,6 +441,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -424,21 +453,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -486,7 +517,8 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-local
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-local
+
+ dvi: dvi-am
+
+@@ -500,20 +532,12 @@
+
+ install-data-am: install-data-local
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -534,22 +558,19 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distclean-local distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-data-local install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic maintainer-clean-local mostlyclean \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+- pdf-am ps ps-am uninstall uninstall-am uninstall-local
++ install-data-am install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-local mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ DOC_H_FILE ?=
+--- gnome-panel-2.24.2.orig/help/workspace-switcher/Makefile.in
++++ gnome-panel-2.24.2/help/workspace-switcher/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -37,11 +37,15 @@
+ # the same distribution terms that you use for the rest of that program.
+
+ ################################################################################
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -74,6 +78,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -90,6 +96,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -115,12 +123,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -129,9 +145,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -169,10 +192,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27494,20 +34991,267 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -271,7 +273,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -180,6 +206,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -215,6 +243,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -222,13 +252,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -240,7 +270,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -268,12 +297,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
-Index: gnome-panel-2.24.2/help/zh_CN/fish/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/zh_CN/fish/Makefile.in 2008-12-27 18:41:51.963983272 +0100
-+++ gnome-panel-2.24.2/help/zh_CN/fish/Makefile.in 2008-12-28 02:39:38.415481366 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
+ _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \
+@@ -416,6 +441,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -424,21 +453,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -486,7 +517,8 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-local
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-local
+
+ dvi: dvi-am
+
+@@ -500,20 +532,12 @@
+
+ install-data-am: install-data-local
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -534,22 +558,19 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distclean-local distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-data-local install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic maintainer-clean-local mostlyclean \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+- pdf-am ps ps-am uninstall uninstall-am uninstall-local
++ install-data-am install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-local mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ DOC_H_FILE ?=
+--- gnome-panel-2.24.2.orig/help/zh_CN/fish/Makefile.in
++++ gnome-panel-2.24.2/help/zh_CN/fish/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27515,20 +35259,280 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/help/zh_CN/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/zh_CN/Makefile.in 2008-12-27 18:41:51.923987756 +0100
-+++ gnome-panel-2.24.2/help/zh_CN/Makefile.in 2008-12-28 02:39:38.311481486 +0100
-@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ docname = fish-applet-2
+ lang = zh_CN
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/help/zh_CN/Makefile.in
++++ gnome-panel-2.24.2/help/zh_CN/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -47,13 +51,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -61,6 +62,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -77,6 +80,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -102,12 +107,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -116,9 +129,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +176,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27536,20 +35540,338 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -167,6 +190,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -202,6 +227,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -209,13 +236,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -227,7 +254,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -255,12 +281,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
SUBDIRS = fish workspace-switcher
-Index: gnome-panel-2.24.2/help/zh_CN/workspace-switcher/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/zh_CN/workspace-switcher/Makefile.in 2008-12-27 18:41:51.903987798 +0100
-+++ gnome-panel-2.24.2/help/zh_CN/workspace-switcher/Makefile.in 2008-12-28 02:39:38.519482224 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ all: all-recursive
+
+@@ -301,6 +323,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -332,7 +358,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -376,8 +403,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -402,8 +429,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -413,12 +440,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -432,21 +460,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -460,7 +489,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -468,8 +497,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -509,7 +536,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -523,20 +551,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -555,24 +575,22 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/help/zh_CN/workspace-switcher/Makefile.in
++++ gnome-panel-2.24.2/help/zh_CN/workspace-switcher/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27557,20 +35879,262 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/help/zh_TW/fish/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/zh_TW/fish/Makefile.in 2008-12-27 18:41:51.871987571 +0100
-+++ gnome-panel-2.24.2/help/zh_TW/fish/Makefile.in 2008-12-28 02:39:38.723481895 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ docname = workspace-switcher
+ lang = zh_CN
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/help/zh_TW/fish/Makefile.in
++++ gnome-panel-2.24.2/help/zh_TW/fish/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27578,20 +36142,280 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/help/zh_TW/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/zh_TW/Makefile.in 2008-12-27 18:41:51.835987256 +0100
-+++ gnome-panel-2.24.2/help/zh_TW/Makefile.in 2008-12-28 02:39:38.619482015 +0100
-@@ -156,6 +156,8 @@ LIBS = @LIBS@
+ docname = fish-applet-2
+ lang = zh_TW
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/help/zh_TW/Makefile.in
++++ gnome-panel-2.24.2/help/zh_TW/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -47,13 +51,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -61,6 +62,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -77,6 +80,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -102,12 +107,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -116,9 +129,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +176,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27599,20 +36423,338 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -258,7 +260,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -167,6 +190,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -202,6 +227,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -209,13 +236,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -227,7 +254,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -255,12 +281,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
SUBDIRS = fish window-list workspace-switcher
-Index: gnome-panel-2.24.2/help/zh_TW/window-list/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/zh_TW/window-list/Makefile.in 2008-12-27 18:41:51.807987608 +0100
-+++ gnome-panel-2.24.2/help/zh_TW/window-list/Makefile.in 2008-12-28 02:39:38.851481334 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ all: all-recursive
+
+@@ -301,6 +323,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -332,7 +358,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -376,8 +403,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -402,8 +429,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -413,12 +440,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -432,21 +460,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -460,7 +489,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -468,8 +497,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -509,7 +536,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -523,20 +551,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -555,24 +575,22 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/help/zh_TW/window-list/Makefile.in
++++ gnome-panel-2.24.2/help/zh_TW/window-list/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27620,20 +36762,262 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/help/zh_TW/workspace-switcher/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/help/zh_TW/workspace-switcher/Makefile.in 2008-12-27 18:41:51.763982713 +0100
-+++ gnome-panel-2.24.2/help/zh_TW/workspace-switcher/Makefile.in 2008-12-28 02:39:38.967481482 +0100
-@@ -207,6 +207,8 @@ LIBS = @LIBS@
+ docname = window-list
+ lang = zh_TW
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/help/zh_TW/workspace-switcher/Makefile.in
++++ gnome-panel-2.24.2/help/zh_TW/workspace-switcher/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -75,11 +75,15 @@
+ # http://scrollkeeper.sourceforge.net/
+ # Version: 0.1.3 (last updated: March 20, 2002)
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -112,6 +116,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -128,6 +134,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -153,12 +161,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -167,9 +183,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,10 +230,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27641,20 +37025,262 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -218,6 +244,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -253,6 +281,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -260,13 +290,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -278,7 +308,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+
+@@ -310,12 +339,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
figdir = figures
-Index: gnome-panel-2.24.2/icons/16x16/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/icons/16x16/Makefile.in 2008-12-27 18:41:51.735986487 +0100
-+++ gnome-panel-2.24.2/icons/16x16/Makefile.in 2008-12-28 02:39:39.083483586 +0100
-@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ docname = workspace-switcher
+ lang = zh_TW
+@@ -366,6 +391,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -374,21 +403,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/../../..
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -437,7 +468,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -453,20 +484,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -485,22 +508,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-data-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-hook install-data-local install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-hook install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-local
++ uninstall uninstall-am uninstall-info-am uninstall-local
+
+
+ # At some point, it may be wise to change to something like this:
+--- gnome-panel-2.24.2.orig/icons/16x16/Makefile.in
++++ gnome-panel-2.24.2/icons/16x16/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -14,11 +14,15 @@
+
+ @SET_MAKE@
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,6 +63,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -75,6 +81,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -100,12 +108,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -114,9 +130,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -154,10 +177,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27662,20 +37288,277 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -165,6 +191,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -200,6 +228,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -207,13 +237,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -225,7 +255,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -253,12 +282,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
NULL =
-Index: gnome-panel-2.24.2/icons/22x22/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/icons/22x22/Makefile.in 2008-12-27 18:41:51.671989456 +0100
-+++ gnome-panel-2.24.2/icons/22x22/Makefile.in 2008-12-28 02:39:39.195481689 +0100
-@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ size = 16x16
+ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
+@@ -333,9 +358,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-iconsDATA: $(icons_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -358,21 +387,22 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -388,7 +418,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(iconsdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -420,7 +450,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -436,20 +466,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -468,24 +490,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-iconsDATA
++uninstall-am: uninstall-iconsDATA uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.MAKE: install-am install-data-am install-strip uninstall-am
+-
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-iconsDATA install-info install-info-am \
+- install-man install-pdf install-pdf-am install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
++ install-data install-data-am install-data-hook install-exec \
++ install-exec-am install-iconsDATA install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-hook \
+- uninstall-iconsDATA
++ uninstall-iconsDATA uninstall-info-am
+
+
+ install-data-hook: update-icon-cache
+--- gnome-panel-2.24.2.orig/icons/22x22/Makefile.in
++++ gnome-panel-2.24.2/icons/22x22/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -14,11 +14,15 @@
+
+ @SET_MAKE@
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,6 +63,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -75,6 +81,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -100,12 +108,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -114,9 +130,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -154,10 +177,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27683,20 +37566,277 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -165,6 +191,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -200,6 +228,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -207,13 +237,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -225,7 +255,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -253,12 +282,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
NULL =
-Index: gnome-panel-2.24.2/icons/24x24/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/icons/24x24/Makefile.in 2008-12-27 18:41:51.643987853 +0100
-+++ gnome-panel-2.24.2/icons/24x24/Makefile.in 2008-12-28 02:39:39.311481836 +0100
-@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ size = 22x22
+ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
+@@ -333,9 +358,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-iconsDATA: $(icons_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -358,21 +387,22 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -388,7 +418,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(iconsdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -420,7 +450,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -436,20 +466,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -468,24 +490,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-iconsDATA
++uninstall-am: uninstall-iconsDATA uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.MAKE: install-am install-data-am install-strip uninstall-am
+-
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-iconsDATA install-info install-info-am \
+- install-man install-pdf install-pdf-am install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
++ install-data install-data-am install-data-hook install-exec \
++ install-exec-am install-iconsDATA install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-hook \
+- uninstall-iconsDATA
++ uninstall-iconsDATA uninstall-info-am
+
+
+ install-data-hook: update-icon-cache
+--- gnome-panel-2.24.2.orig/icons/24x24/Makefile.in
++++ gnome-panel-2.24.2/icons/24x24/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -14,11 +14,15 @@
+
+ @SET_MAKE@
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,6 +63,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -75,6 +81,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -100,12 +108,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -114,9 +130,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -154,10 +177,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27704,20 +37844,277 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -165,6 +191,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -200,6 +228,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -207,13 +237,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -225,7 +255,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -253,12 +282,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
NULL =
-Index: gnome-panel-2.24.2/icons/32x32/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/icons/32x32/Makefile.in 2008-12-27 18:41:51.619987805 +0100
-+++ gnome-panel-2.24.2/icons/32x32/Makefile.in 2008-12-28 02:39:39.423481895 +0100
-@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ size = 24x24
+ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
+@@ -318,9 +343,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-iconsDATA: $(icons_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -343,21 +372,22 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -373,7 +403,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(iconsdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -405,7 +435,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -421,20 +451,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -453,24 +475,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-iconsDATA
++uninstall-am: uninstall-iconsDATA uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.MAKE: install-am install-data-am install-strip uninstall-am
+-
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-iconsDATA install-info install-info-am \
+- install-man install-pdf install-pdf-am install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
++ install-data install-data-am install-data-hook install-exec \
++ install-exec-am install-iconsDATA install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-hook \
+- uninstall-iconsDATA
++ uninstall-iconsDATA uninstall-info-am
+
+
+ install-data-hook: update-icon-cache
+--- gnome-panel-2.24.2.orig/icons/32x32/Makefile.in
++++ gnome-panel-2.24.2/icons/32x32/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -14,11 +14,15 @@
+
+ @SET_MAKE@
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,6 +63,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -75,6 +81,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -100,12 +108,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -114,9 +130,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -154,10 +177,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27725,20 +38122,277 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -165,6 +191,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -200,6 +228,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -207,13 +237,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -225,7 +255,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -253,12 +282,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
NULL =
-Index: gnome-panel-2.24.2/icons/48x48/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/icons/48x48/Makefile.in 2008-12-27 18:41:51.571988688 +0100
-+++ gnome-panel-2.24.2/icons/48x48/Makefile.in 2008-12-28 02:39:39.539482042 +0100
-@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ size = 32x32
+ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
+@@ -333,9 +358,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-iconsDATA: $(icons_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -358,21 +387,22 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -388,7 +418,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(iconsdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -420,7 +450,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -436,20 +466,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -468,24 +490,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-iconsDATA
++uninstall-am: uninstall-iconsDATA uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.MAKE: install-am install-data-am install-strip uninstall-am
+-
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-iconsDATA install-info install-info-am \
+- install-man install-pdf install-pdf-am install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
++ install-data install-data-am install-data-hook install-exec \
++ install-exec-am install-iconsDATA install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-hook \
+- uninstall-iconsDATA
++ uninstall-iconsDATA uninstall-info-am
+
+
+ install-data-hook: update-icon-cache
+--- gnome-panel-2.24.2.orig/icons/48x48/Makefile.in
++++ gnome-panel-2.24.2/icons/48x48/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -14,11 +14,15 @@
+
+ @SET_MAKE@
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,6 +63,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -75,6 +81,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -100,12 +108,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -114,9 +130,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -154,10 +177,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27746,20 +38400,302 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -165,6 +191,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -200,6 +228,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -207,13 +237,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -225,7 +255,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -253,12 +282,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
NULL =
-Index: gnome-panel-2.24.2/icons/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/icons/Makefile.in 2008-12-27 18:41:51.547988640 +0100
-+++ gnome-panel-2.24.2/icons/Makefile.in 2008-12-28 02:39:39.659481302 +0100
-@@ -166,6 +166,8 @@ LIBS = @LIBS@
+ size = 48x48
+ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
+@@ -313,9 +338,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-iconsDATA: $(icons_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -338,21 +367,22 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -368,7 +398,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(iconsdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -400,7 +430,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -416,20 +446,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -448,24 +470,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-iconsDATA
++uninstall-am: uninstall-iconsDATA uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.MAKE: install-am install-data-am install-strip uninstall-am
+-
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-iconsDATA install-info install-info-am \
+- install-man install-pdf install-pdf-am install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
++ install-data install-data-am install-data-hook install-exec \
++ install-exec-am install-iconsDATA install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-hook \
+- uninstall-iconsDATA
++ uninstall-iconsDATA uninstall-info-am
+
+
+ install-data-hook: update-icon-cache
+--- gnome-panel-2.24.2.orig/icons/Makefile.in
++++ gnome-panel-2.24.2/icons/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -14,11 +14,15 @@
+
+ @SET_MAKE@
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -48,11 +52,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -62,8 +65,6 @@
+ am__installdirs = "$(DESTDIR)$(gegldir)"
+ geglDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(gegl_DATA)
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -71,6 +72,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -87,6 +90,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -112,12 +117,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -126,9 +139,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -166,10 +186,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27767,20 +38703,352 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -268,7 +270,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -177,6 +200,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -212,6 +237,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -219,13 +246,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -237,7 +264,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -265,12 +291,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
-Index: gnome-panel-2.24.2/icons/scalable/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/icons/scalable/Makefile.in 2008-12-27 18:41:51.519983615 +0100
-+++ gnome-panel-2.24.2/icons/scalable/Makefile.in 2008-12-28 02:39:39.771481361 +0100
-@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ NULL =
+ gegldir = $(datadir)/gnome-panel/pixmaps
+@@ -319,9 +341,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-geglDATA: $(gegl_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gegldir)" || $(MKDIR_P) "$(DESTDIR)$(gegldir)"
++ test -z "$(gegldir)" || $(mkdir_p) "$(DESTDIR)$(gegldir)"
+ @list='$(gegl_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -368,7 +394,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -412,8 +439,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -438,8 +465,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -449,12 +476,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -468,21 +496,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -496,7 +525,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -504,8 +533,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -516,7 +543,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(gegldir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -548,7 +575,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -562,20 +590,12 @@
+
+ install-data-am: install-geglDATA
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -594,24 +614,23 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-geglDATA
++uninstall-am: uninstall-geglDATA uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-geglDATA install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
++ install-data-am install-exec install-exec-am install-geglDATA \
++ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-geglDATA
++ maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am uninstall-geglDATA \
++ uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/icons/scalable/Makefile.in
++++ gnome-panel-2.24.2/icons/scalable/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -14,11 +14,15 @@
+
+ @SET_MAKE@
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,6 +63,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -75,6 +81,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -100,12 +108,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -114,9 +130,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -154,10 +177,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27788,20 +39056,277 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -165,6 +191,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -200,6 +228,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -207,13 +237,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -225,7 +255,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -253,12 +282,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
NULL =
-Index: gnome-panel-2.24.2/idl/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/idl/Makefile.in 2008-12-27 18:41:51.495987967 +0100
-+++ gnome-panel-2.24.2/idl/Makefile.in 2008-12-28 02:39:39.879481330 +0100
-@@ -154,6 +154,8 @@ LIBS = @LIBS@
+ size = scalable
+ iconsdir = $(datadir)/icons/hicolor/$(size)/apps
+@@ -322,9 +347,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-iconsDATA: $(icons_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
++ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -347,21 +376,22 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -377,7 +407,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(iconsdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -409,7 +439,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -425,20 +455,12 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -457,24 +479,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-iconsDATA
++uninstall-am: uninstall-iconsDATA uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+-.MAKE: install-am install-data-am install-strip uninstall-am
+-
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-hook install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-iconsDATA install-info install-info-am \
+- install-man install-pdf install-pdf-am install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
++ install-data install-data-am install-data-hook install-exec \
++ install-exec-am install-iconsDATA install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-hook \
+- uninstall-iconsDATA
++ uninstall-iconsDATA uninstall-info-am
+
+
+ install-data-hook: update-icon-cache
+--- gnome-panel-2.24.2.orig/idl/Makefile.in
++++ gnome-panel-2.24.2/idl/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -14,11 +14,15 @@
+
+ @SET_MAKE@
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,6 +63,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -75,6 +81,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -100,12 +108,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -114,9 +130,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -154,10 +177,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27809,20 +39334,313 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -256,7 +258,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -165,6 +191,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -200,6 +228,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -207,13 +237,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -225,7 +255,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -253,12 +282,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
idldir = $(datadir)/idl/gnome-panel-2.0
-Index: gnome-panel-2.24.2/libpanel-applet/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/libpanel-applet/Makefile.in 2008-12-27 18:41:51.447482361 +0100
-+++ gnome-panel-2.24.2/libpanel-applet/Makefile.in 2008-12-28 02:39:40.063482998 +0100
-@@ -211,6 +211,8 @@ LIBS = @LIBS@
+ idl_DATA = GNOME_Panel.idl
+ EXTRA_DIST = $(idl_DATA)
+@@ -300,9 +325,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-idlDATA: $(idl_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(idldir)" || $(MKDIR_P) "$(DESTDIR)$(idldir)"
++ test -z "$(idldir)" || $(mkdir_p) "$(DESTDIR)$(idldir)"
+ @list='$(idl_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -325,21 +354,22 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -355,7 +385,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(idldir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -387,7 +417,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -401,20 +431,12 @@
+
+ install-data-am: install-idlDATA
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -433,21 +455,17 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-idlDATA
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-idlDATA uninstall-info-am
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
++ install-data install-data-am install-exec install-exec-am \
+ install-idlDATA install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-idlDATA
++ uninstall uninstall-am uninstall-idlDATA uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/libpanel-applet/Makefile.in
++++ gnome-panel-2.24.2/libpanel-applet/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -17,11 +17,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -73,34 +77,27 @@
+ panel-applet-gconf.lo panel-applet-shell.lo \
+ panel-applet-marshal.lo panel-applet-enums.lo $(am__objects_1)
+ libpanel_applet_2_la_OBJECTS = $(am_libpanel_applet_2_la_OBJECTS)
+-libpanel_applet_2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(libpanel_applet_2_la_LDFLAGS) $(LDFLAGS) -o $@
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ panel_test_applets_SOURCES = panel-test-applets.c
+ panel_test_applets_OBJECTS = panel-test-applets.$(OBJEXT)
+ panel_test_applets_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ libpanel-applet-2.la
+-panel_test_applets_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(panel_test_applets_LDFLAGS) $(LDFLAGS) -o $@
+ test_bonobo_applet_SOURCES = test-bonobo-applet.c
+ test_bonobo_applet_OBJECTS = test-bonobo-applet.$(OBJEXT)
+ test_bonobo_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ libpanel-applet-2.la
+-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libpanel_applet_2_la_SOURCES) panel-test-applets.c \
+ test-bonobo-applet.c
+ DIST_SOURCES = $(libpanel_applet_2_la_SOURCES) panel-test-applets.c \
+@@ -116,6 +113,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -132,6 +131,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -157,12 +158,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -171,9 +180,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -211,10 +227,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27830,20 +39648,351 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -313,7 +315,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -222,6 +241,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -257,6 +278,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -264,13 +287,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -282,7 +305,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -310,12 +332,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
INCLUDES = \
-Index: gnome-panel-2.24.2/ltmain.sh
-===================================================================
---- gnome-panel-2.24.2.orig/ltmain.sh 2008-12-27 18:41:51.419486624 +0100
-+++ gnome-panel-2.24.2/ltmain.sh 2008-04-29 22:21:21.000000000 +0200
-@@ -43,8 +43,8 @@ EXIT_FAILURE=1
+ -I$(top_builddir)/libpanel-applet \
+ -DPANEL_APPLET_DATADIR=\""$(datadir)"\" \
+@@ -433,21 +451,21 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+ done
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+
+ clean-libLTLIBRARIES:
+@@ -459,18 +477,18 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libpanel-applet-2.la: $(libpanel_applet_2_la_OBJECTS) $(libpanel_applet_2_la_DEPENDENCIES)
+- $(libpanel_applet_2_la_LINK) -rpath $(libdir) $(libpanel_applet_2_la_OBJECTS) $(libpanel_applet_2_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(libpanel_applet_2_la_LDFLAGS) $(libpanel_applet_2_la_OBJECTS) $(libpanel_applet_2_la_LIBADD) $(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+@@ -497,10 +515,10 @@
+ done
+ panel-test-applets$(EXEEXT): $(panel_test_applets_OBJECTS) $(panel_test_applets_DEPENDENCIES)
+ @rm -f panel-test-applets$(EXEEXT)
+- $(panel_test_applets_LINK) $(panel_test_applets_OBJECTS) $(panel_test_applets_LDADD) $(LIBS)
++ $(LINK) $(panel_test_applets_LDFLAGS) $(panel_test_applets_OBJECTS) $(panel_test_applets_LDADD) $(LIBS)
+ test-bonobo-applet$(EXEEXT): $(test_bonobo_applet_OBJECTS) $(test_bonobo_applet_DEPENDENCIES)
+ @rm -f test-bonobo-applet$(EXEEXT)
+- $(LINK) $(test_bonobo_applet_OBJECTS) $(test_bonobo_applet_LDADD) $(LIBS)
++ $(LINK) $(test_bonobo_applet_LDFLAGS) $(test_bonobo_applet_OBJECTS) $(test_bonobo_applet_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -520,22 +538,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test-bonobo-applet.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -545,9 +563,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
++ test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -564,7 +586,7 @@
+ done
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
++ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -581,7 +603,7 @@
+ done
+ install-libpanel_appletincludeHEADERS: $(libpanel_appletinclude_HEADERS)
+ @$(NORMAL_INSTALL)
+- test -z "$(libpanel_appletincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libpanel_appletincludedir)"
++ test -z "$(libpanel_appletincludedir)" || $(mkdir_p) "$(DESTDIR)$(libpanel_appletincludedir)"
+ @list='$(libpanel_appletinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -602,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; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -615,8 +637,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -626,12 +648,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -645,21 +668,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -681,7 +705,7 @@
+
+ installdirs:
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libpanel_appletincludedir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+@@ -719,7 +743,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -734,20 +758,12 @@
+ install-data-am: install-gladeDATA \
+ install-libpanel_appletincludeHEADERS install-pkgconfigDATA
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -769,29 +785,25 @@
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
+- uninstall-libLTLIBRARIES \
++ uninstall-info-am uninstall-libLTLIBRARIES \
+ uninstall-libpanel_appletincludeHEADERS \
+ uninstall-pkgconfigDATA
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libLTLIBRARIES clean-libtool \
+ clean-noinstPROGRAMS ctags dist-hook distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-binPROGRAMS install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-gladeDATA install-html install-html-am \
++ install-data-am install-exec install-exec-am install-gladeDATA \
+ install-info install-info-am install-libLTLIBRARIES \
+- install-libpanel_appletincludeHEADERS install-man install-pdf \
+- install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-gladeDATA \
+- uninstall-libLTLIBRARIES \
++ install-libpanel_appletincludeHEADERS install-man \
++ install-pkgconfigDATA install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-binPROGRAMS \
++ uninstall-gladeDATA uninstall-info-am uninstall-libLTLIBRARIES \
+ uninstall-libpanel_appletincludeHEADERS \
+ uninstall-pkgconfigDATA
+
+--- gnome-panel-2.24.2.orig/ltmain.sh
++++ gnome-panel-2.24.2/ltmain.sh
+@@ -43,8 +43,8 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
@@ -27854,7 +40003,7 @@
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -2135,7 +2135,10 @@ EOF
+@@ -2135,7 +2135,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -27866,7 +40015,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -3269,6 +3272,11 @@ EOF
+@@ -3269,6 +3272,11 @@
revision="$number_minor"
lt_irix_increment=no
;;
@@ -27878,11 +40027,134 @@
esac
;;
no)
-Index: gnome-panel-2.24.2/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/Makefile.in 2008-12-27 18:41:51.371484085 +0100
-+++ gnome-panel-2.24.2/Makefile.in 2008-12-28 02:39:40.351481613 +0100
-@@ -171,6 +171,8 @@ LIBS = @LIBS@
+--- gnome-panel-2.24.2.orig/Makefile.in
++++ gnome-panel-2.24.2/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = .
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -31,12 +35,12 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \
+ INSTALL NEWS compile config.guess config.sub depcomp \
+ install-sh ltmain.sh missing mkinstalldirs
++subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+@@ -45,7 +49,7 @@
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno config.status.lineno
++ configure.lineno configure.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES =
+@@ -53,13 +57,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -76,6 +77,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -92,6 +95,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -117,12 +122,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -131,9 +144,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -171,10 +191,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27890,20 +40162,381 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -273,7 +275,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -182,6 +205,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -217,6 +242,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -224,13 +251,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -242,7 +269,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -270,12 +296,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
distcleancheck_listfiles = find . -type f -print | grep -v 'omf\.out' | grep -v 'legal.xml'
-Index: gnome-panel-2.24.2/man/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/man/Makefile.in 2008-12-27 18:41:51.311487632 +0100
-+++ gnome-panel-2.24.2/man/Makefile.in 2008-12-28 02:39:40.187481858 +0100
-@@ -148,6 +148,8 @@ LIBS = @LIBS@
+ SUBDIRS = \
+ po \
+@@ -339,7 +361,7 @@
+ config.h: stamp-h1
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
++ $(MAKE) stamp-h1; \
+ else :; fi
+
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+@@ -361,6 +383,7 @@
+
+ distclean-libtool:
+ -rm -f libtool
++uninstall-info-am:
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -393,7 +416,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -437,8 +461,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -463,8 +487,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -474,12 +498,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -494,22 +519,24 @@
+
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+- test -d $(distdir) || mkdir $(distdir)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ mkdir $(distdir)
++ $(mkdir_p) $(distdir)/gnome-panel $(distdir)/libpanel-applet $(distdir)/m4 $(distdir)/po
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -523,7 +550,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -531,8 +558,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -540,7 +565,7 @@
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
++ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+@@ -549,10 +574,6 @@
+ 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,8 +600,6 @@
+ 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*) \
+@@ -620,7 +639,7 @@
+ $(am__remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
++ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+@@ -682,20 +701,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -716,26 +727,24 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.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-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 \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
++ check-am clean clean-generic clean-libtool clean-recursive \
++ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
++ dist-shar dist-tarZ dist-zip distcheck distclean \
++ distclean-generic distclean-hdr distclean-libtool \
++ distclean-recursive distclean-tags distcleancheck distdir \
++ distuninstallcheck dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+
+ #
+--- gnome-panel-2.24.2.orig/man/Makefile.in
++++ gnome-panel-2.24.2/man/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -53,6 +57,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -69,6 +75,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -94,12 +102,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -108,9 +124,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -148,10 +171,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27911,20 +40544,218 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -250,7 +252,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -159,6 +185,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -194,6 +222,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -201,13 +231,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -219,7 +249,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -247,12 +276,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
man_MANS = \
-Index: gnome-panel-2.24.2/gnome-panel/libpanel-util/Makefile.in
-===================================================================
---- gnome-panel-2.24.2.orig/gnome-panel/libpanel-util/Makefile.in 2008-12-27 18:41:52.455987423 +0100
-+++ gnome-panel-2.24.2/gnome-panel/libpanel-util/Makefile.in 2008-12-28 02:39:36.787481648 +0100
-@@ -49,8 +49,7 @@ libpanel_util_la_LIBADD =
+ gnome-panel.1
+
+@@ -295,9 +320,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
++ test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -348,21 +377,22 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -378,7 +408,7 @@
+ all-am: Makefile $(MANS)
+ installdirs:
+ for dir in "$(DESTDIR)$(man1dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -410,7 +440,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -424,20 +454,12 @@
+
+ install-data-am: install-man
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man1
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -456,23 +478,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man
++uninstall-am: uninstall-info-am uninstall-man
+
+ uninstall-man: uninstall-man1
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
++ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-man1 \
+- install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-man uninstall-man1
++ uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man1
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- gnome-panel-2.24.2.orig/gnome-panel/libpanel-util/Makefile.in
++++ gnome-panel-2.24.2/gnome-panel/libpanel-util/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -14,11 +14,15 @@
+
+ @SET_MAKE@
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -49,21 +53,19 @@
am__objects_1 =
am_libpanel_util_la_OBJECTS = panel-cleanup.lo panel-dbus-service.lo \
panel-error.lo panel-glib.lo panel-keyfile.lo \
@@ -27932,9 +40763,85 @@
- $(am__objects_1)
+ panel-power-manager.lo panel-show.lo $(am__objects_1)
libpanel_util_la_OBJECTS = $(am_libpanel_util_la_OBJECTS)
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -167,6 +166,8 @@ LIBS = @LIBS@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libpanel_util_la_SOURCES)
+ DIST_SOURCES = $(libpanel_util_la_SOURCES)
+ ETAGS = etags
+@@ -72,6 +74,8 @@
+ ACLOCAL = @ACLOCAL@
+ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ ALL_LINGUAS = @ALL_LINGUAS@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -88,6 +92,8 @@
+ CFLAGS = @CFLAGS@
+ CLOCK_CFLAGS = @CLOCK_CFLAGS@
+ CLOCK_EDS_ICONDIR = @CLOCK_EDS_ICONDIR@
++CLOCK_INPROCESS_FALSE = @CLOCK_INPROCESS_FALSE@
++CLOCK_INPROCESS_TRUE = @CLOCK_INPROCESS_TRUE@
+ CLOCK_LIBS = @CLOCK_LIBS@
+ CLOCK_MECHANISM_CFLAGS = @CLOCK_MECHANISM_CFLAGS@
+ CLOCK_MECHANISM_LIBS = @CLOCK_MECHANISM_LIBS@
+@@ -113,12 +119,20 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
++ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
++ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
++ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FISH_CFLAGS = @FISH_CFLAGS@
++FISH_INPROCESS_FALSE = @FISH_INPROCESS_FALSE@
++FISH_INPROCESS_TRUE = @FISH_INPROCESS_TRUE@
+ FISH_LIBS = @FISH_LIBS@
+ GCONFTOOL = @GCONFTOOL@
++GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
++GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -127,9 +141,16 @@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
++GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
++HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
++HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
++HAVE_LIBECAL_FALSE = @HAVE_LIBECAL_FALSE@
++HAVE_LIBECAL_TRUE = @HAVE_LIBECAL_TRUE@
++HAVE_POLKIT_FALSE = @HAVE_POLKIT_FALSE@
++HAVE_POLKIT_TRUE = @HAVE_POLKIT_TRUE@
+ HELP_DIR = @HELP_DIR@
+ HTML_DIR = @HTML_DIR@
+-INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -167,10 +188,13 @@
LIBTOOL = @LIBTOOL@
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
LN_S = @LN_S@
@@ -27942,16 +40849,71 @@
+LOGOUT_LIBS = @LOGOUT_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-@@ -269,7 +270,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
+-MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -178,6 +202,8 @@
+ NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+ NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NMEDIT = @NMEDIT@
++NOTIFICATION_AREA_INPROCESS_FALSE = @NOTIFICATION_AREA_INPROCESS_FALSE@
++NOTIFICATION_AREA_INPROCESS_TRUE = @NOTIFICATION_AREA_INPROCESS_TRUE@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+@@ -213,6 +239,8 @@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ WNCKLET_CFLAGS = @WNCKLET_CFLAGS@
++WNCKLET_INPROCESS_FALSE = @WNCKLET_INPROCESS_FALSE@
++WNCKLET_INPROCESS_TRUE = @WNCKLET_INPROCESS_TRUE@
+ WNCKLET_LIBS = @WNCKLET_LIBS@
+ XGETTEXT = @XGETTEXT@
+ XMKMF = @XMKMF@
+@@ -220,13 +248,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -238,7 +266,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -266,12 +293,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
NULL =
-@@ -304,8 +304,6 @@ libpanel_util_la_SOURCES = \
+ INCLUDES = \
+ -I. \
+@@ -304,8 +327,6 @@
panel-keyfile.h \
panel-power-manager.c \
panel-power-manager.h \
@@ -27960,7 +40922,16 @@
panel-show.c \
panel-show.h \
$(NULL)
-@@ -367,7 +365,6 @@ distclean-compile:
+@@ -353,7 +374,7 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libpanel-util.la: $(libpanel_util_la_OBJECTS) $(libpanel_util_la_DEPENDENCIES)
+- $(LINK) $(libpanel_util_la_OBJECTS) $(libpanel_util_la_LIBADD) $(LIBS)
++ $(LINK) $(libpanel_util_la_LDFLAGS) $(libpanel_util_la_OBJECTS) $(libpanel_util_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -367,26 +388,25 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-glib.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-keyfile.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/panel-power-manager.Plo at am__quote@
@@ -27970,0 +40942,166 @@
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++ at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -397,13 +417,17 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 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; nonemtpy = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+@@ -415,8 +439,8 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { 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) \
+@@ -426,12 +450,13 @@
+ 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; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+@@ -445,21 +470,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -507,7 +533,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -521,20 +547,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -555,22 +573,19 @@
+
+ ps-am:
+
+-uninstall-am:
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
only in patch2:
unchanged:
--- gnome-panel-2.24.2.orig/debian/patches/10_use_orientable_gtk_box.patch
+++ gnome-panel-2.24.2/debian/patches/10_use_orientable_gtk_box.patch
@@ -0,0 +1,173 @@
+--- gnome-panel-2.24.2.orig/applets/clock/Makefile.am
++++ gnome-panel-2.24.2/applets/clock/Makefile.am
+@@ -42,8 +42,6 @@
+ CLOCK_SOURCES = \
+ calendar-window.c \
+ calendar-window.h \
+- obox.c \
+- obox.h \
+ clock.c \
+ clock.h \
+ clock-face.c \
+--- gnome-panel-2.24.2.orig/applets/clock/clock.c
++++ gnome-panel-2.24.2/applets/clock/clock.c
+@@ -62,7 +62,6 @@
+ #include "clock-location-tile.h"
+ #include "clock-map.h"
+ #include "clock-utils.h"
+-#include "obox.h"
+ #include "set-timezone.h"
+ #include "system-timezone.h"
+
+@@ -239,6 +238,27 @@
+ static gboolean edit_delete (GtkWidget *unused, GdkEvent *event, ClockData *cd);
+ static void save_cities_store (ClockData *cd);
+
++/* ClockBox, an instantiable GtkBox */
++
++typedef GtkBox ClockBox;
++typedef GtkBoxClass ClockBoxClass;
++
++static GType clock_box_get_type (void);
++
++G_DEFINE_TYPE (ClockBox, clock_box, GTK_TYPE_BOX)
++
++static void
++clock_box_init (ClockBox *box)
++{
++}
++
++static void
++clock_box_class_init (ClockBoxClass *klass)
++{
++}
++
++/* Clock */
++
+ static void
+ unfix_size (ClockData *cd)
+ {
+@@ -1354,13 +1374,13 @@
+ gtk_widget_show (cd->panel_button);
+
+ /* Main orientable box */
+- cd->main_obox = clock_obox_new ();
++ cd->main_obox = g_object_new (clock_box_get_type (), NULL);
+ gtk_box_set_spacing (GTK_BOX (cd->main_obox), 12); /* spacing between weather and time */
+ gtk_container_add (GTK_CONTAINER (cd->panel_button), cd->main_obox);
+ gtk_widget_show (cd->main_obox);
+
+ /* Weather orientable box */
+- cd->weather_obox = clock_obox_new ();
++ cd->weather_obox = g_object_new (clock_box_get_type (), NULL);
+ gtk_box_set_spacing (GTK_BOX (cd->weather_obox), 2); /* spacing between weather icon and temperature */
+ gtk_box_pack_start (GTK_BOX (cd->main_obox), cd->weather_obox, FALSE, FALSE, 0);
+ gtk_widget_set_has_tooltip (cd->weather_obox, TRUE);
+@@ -1459,8 +1479,8 @@
+ return;
+ }
+
+- clock_obox_set_orientation (CLOCK_OBOX (cd->main_obox), o);
+- clock_obox_set_orientation (CLOCK_OBOX (cd->weather_obox), o);
++ gtk_orientable_set_orientation (GTK_ORIENTABLE (cd->main_obox), o);
++ gtk_orientable_set_orientation (GTK_ORIENTABLE (cd->weather_obox), o);
+
+ unfix_size (cd);
+ update_clock (cd);
+--- gnome-panel-2.24.2.orig/applets/notification_area/Makefile.am
++++ gnome-panel-2.24.2/applets/notification_area/Makefile.am
+@@ -18,8 +18,6 @@
+ fixedtip.h \
+ fixedtip.c \
+ main.c \
+- obox.c \
+- obox.h \
+ na-tray.c \
+ na-tray.h \
+ na-tray-manager.c \
+@@ -96,8 +94,6 @@
+ na-tray.h \
+ na-tray-manager.c \
+ na-tray-manager.h \
+- obox.c \
+- obox.h \
+ testtray.c
+
+ testtray_LDADD = \
+--- gnome-panel-2.24.2.orig/applets/notification_area/main.c
++++ gnome-panel-2.24.2/applets/notification_area/main.c
+@@ -33,7 +33,6 @@
+ #include "na-tray-manager.h"
+ #include "na-tray.h"
+ #include "fixedtip.h"
+-#include "obox.h"
+
+ #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
+
+--- gnome-panel-2.24.2.orig/applets/notification_area/na-tray.c
++++ gnome-panel-2.24.2/applets/notification_area/na-tray.c
+@@ -31,7 +31,6 @@
+
+ #include "na-tray-manager.h"
+ #include "fixedtip.h"
+-#include "obox.h"
+
+ #include "na-tray.h"
+
+@@ -88,6 +87,27 @@
+
+ static void icon_tip_show_next (IconTip *icontip);
+
++/* NaBox, an instantiable GtkBox */
++
++typedef GtkBox NaBox;
++typedef GtkBoxClass NaBoxClass;
++
++static GType na_box_get_type (void);
++
++G_DEFINE_TYPE (NaBox, na_box, GTK_TYPE_BOX)
++
++static void
++na_box_init (NaBox *box)
++{
++}
++
++static void
++na_box_class_init (NaBoxClass *klass)
++{
++}
++
++/* NaTray */
++
+ G_DEFINE_TYPE (NaTray, na_tray, GTK_TYPE_BIN)
+
+ static NaTray *
+@@ -380,7 +400,7 @@
+ {
+ NaTrayPrivate *priv = tray->priv;
+
+- na_obox_set_orientation (NA_OBOX (priv->box), priv->orientation);
++ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), priv->orientation);
+
+ /* This only happens when setting the property during object construction */
+ if (!priv->trays_screen)
+@@ -422,7 +442,7 @@
+ gtk_container_add (GTK_CONTAINER (tray), priv->frame);
+ gtk_widget_show (priv->frame);
+
+- priv->box = na_obox_new ();
++ priv->box = g_object_new (na_box_get_type (), NULL);
+ gtk_box_set_spacing (GTK_BOX (priv->box), ICON_SPACING);
+ gtk_container_add (GTK_CONTAINER (priv->frame), priv->box);
+ gtk_widget_show (priv->box);
+--- gnome-panel-2.24.2.orig/configure.in
++++ gnome-panel-2.24.2/configure.in
+@@ -52,7 +52,7 @@
+ GDK_PIXBUF_REQUIRED=2.7.1
+ PANGO_REQUIRED=1.15.4
+ GLIB_REQUIRED=2.15.6
+-GTK_REQUIRED=2.13.1
++GTK_REQUIRED=2.15.1
+ LIBGLADE_REQUIRED=2.5.0
+ LIBGNOME_REQUIRED=2.13.0
+ LIBGNOMEUI_REQUIRED=2.5.4
More information about the pkg-gnome-maintainers
mailing list