r14831 - in /packages/unstable/gdesklets/debian: changelog control control.in copyright patches/70_relibtoolize.diff watch
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Fri Feb 29 19:02:39 UTC 2008
Author: manphiz-guest
Date: Fri Feb 29 19:02:39 2008
New Revision: 14831
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14831
Log:
Revert to 14828: 0.36 is not ready for use...
Modified:
packages/unstable/gdesklets/debian/changelog
packages/unstable/gdesklets/debian/control
packages/unstable/gdesklets/debian/control.in
packages/unstable/gdesklets/debian/copyright
packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff
packages/unstable/gdesklets/debian/watch
Modified: packages/unstable/gdesklets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/changelog?rev=14831&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/changelog (original)
+++ packages/unstable/gdesklets/debian/changelog Fri Feb 29 19:02:39 2008
@@ -1,24 +1,15 @@
-gdesklets (0.36-1) unstable; urgency=high
-
- * New upstream release.
- + Adjust build-depends and depends fields as per configure.in
- + Fix watch file to work again.
- + Regenerate 70_relibtoolize.diff for new version.
+gdesklets (0.35.4-2) unstable; urgency=high
+
* Run `intltoolize' when relibtoolizing to regenerate intltool-*.in
which solves the `@INTLTOOL_ICONV@ not being substituted' issue. And
drop 10_intltools-merge_fix.diff as no longer needed any more.
- * Refine debian/copyright to have copyright holder and text.
- * Follow Debian Python Policy to avoid residues after purge. Details:
- + Bump cdbs build-depends to >= 0.4.49.
- + Add python-support to build-depend in control file.
- + Add XS-Python-Version and XB-Python-Version fields in control file.
- + Run 'dh_pysupport -pgdesklets' in binary-post-install/gdesklets
- rule.
- Thanks Josselin Mouette and Loïc Minier for suggestions.
+ * Add python-support to build-depend and run 'dh_pysupport -pgdesklets'
+ in binary-post-install/gdesklets rule to avoid residues after
+ purge. Thanks Josselin Mouette and Loïc Minier for suggestions.
(Closes: #466243)
* Fix RC bug, bump urgency.
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Sat, 01 Mar 2008 01:55:22 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Sat, 01 Mar 2008 00:57:44 +0800
gdesklets (0.35.4-1) unstable; urgency=high
Modified: packages/unstable/gdesklets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control?rev=14831&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control (original)
+++ packages/unstable/gdesklets/debian/control Fri Feb 29 19:02:39 2008
@@ -3,34 +3,33 @@
Priority: optional
Maintainer: Clément Stenac <zorglub at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Deng Xiyue <manphiz-guest at users.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Loic Minier <lool at dooz.org>
-Build-Depends: cdbs (>= 0.4.49),
+Build-Depends: cdbs,
debhelper (>= 6),
python-dev,
- python-gnome2-dev (>= 2.12.0),
- python-gtk2-dev (>= 2.10.0),
- python-pyorbit-dev (>= 2.0.1),
+ python-gnome2-dev,
+ python-gtk2-dev,
+ python-pyorbit-dev,
libglib2.0-dev (>= 2.4.1-2),
pkg-config,
swig,
- libglib2.0-dev (>= 2.10.0)
- libgtk2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.4.1-3),
+ libgnomevfs2-dev (>= 2.8.4),
libgtop2-dev (>= 2.6.0-4),
gnome-pkg-tools,
+ libgnomeui-dev (>= 2.6.1.1-2),
libxml-parser-perl,
- librsvg2-dev (>= 2.8.0),
+ librsvg2-dev,
autotools-dev,
- python-support (>= 0.3)
+ python-support
Standards-Version: 3.7.3
-XS-Python-Version: >= 2.3
Package: gdesklets
Architecture: any
-XB-Python-Version: ${python:Version}
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends},
- python-gnome2 (>= 2.10.0),
- python-gtk2 (>= 2.10.0),
+ python-gnome2 (>= 2.0),
+ python-gtk2 (>= 2.0),
python-numeric (>= 23.0-7),
python,
python-xml,
Modified: packages/unstable/gdesklets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control.in?rev=14831&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control.in (original)
+++ packages/unstable/gdesklets/debian/control.in Fri Feb 29 19:02:39 2008
@@ -3,34 +3,33 @@
Priority: optional
Maintainer: Clément Stenac <zorglub at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.49),
+Build-Depends: cdbs,
debhelper (>= 6),
python-dev,
- python-gnome2-dev (>= 2.12.0),
- python-gtk2-dev (>= 2.10.0),
- python-pyorbit-dev (>= 2.0.1),
+ python-gnome2-dev,
+ python-gtk2-dev,
+ python-pyorbit-dev,
libglib2.0-dev (>= 2.4.1-2),
pkg-config,
swig,
- libglib2.0-dev (>= 2.10.0)
- libgtk2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.4.1-3),
+ libgnomevfs2-dev (>= 2.8.4),
libgtop2-dev (>= 2.6.0-4),
gnome-pkg-tools,
+ libgnomeui-dev (>= 2.6.1.1-2),
libxml-parser-perl,
- librsvg2-dev (>= 2.8.0),
+ librsvg2-dev,
autotools-dev,
- python-support (>= 0.3)
+ python-support
Standards-Version: 3.7.3
-XS-Python-Version: >= 2.3
Package: gdesklets
Architecture: any
-XB-Python-Version: ${python:Version}
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends},
- python-gnome2 (>= 2.10.0),
- python-gtk2 (>= 2.10.0),
+ python-gnome2 (>= 2.0),
+ python-gtk2 (>= 2.0),
python-numeric (>= 23.0-7),
python,
python-xml,
Modified: packages/unstable/gdesklets/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/copyright?rev=14831&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/copyright (original)
+++ packages/unstable/gdesklets/debian/copyright Fri Feb 29 19:02:39 2008
@@ -9,10 +9,7 @@
Copyright:
- Copyright (C) 2003-2008 The gDesklet Team
-
- You are free to redistribute this software under the terms of the GNU
- General Public License.
-
+You are free to redistribute this software under the terms of the GNU
+General Public License.
On Debian systems, the complete text of the GNU General Public License can
be found at /usr/share/common-licenses/GPL-2.
Modified: packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff?rev=14831&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff (original)
+++ packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff Fri Feb 29 19:02:39 2008
@@ -1,6 +1,6 @@
-diff -urN gdesklets-0.36.orig/aclocal.m4 gdesklets-0.36/aclocal.m4
---- gdesklets-0.36.orig/aclocal.m4 2008-02-17 01:45:31.000000000 +0800
-+++ gdesklets-0.36/aclocal.m4 2008-03-01 01:27:23.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/aclocal.m4 gdesklets-0.35.4/aclocal.m4
+--- gdesklets-0.35.4.orig/aclocal.m4 2006-10-05 20:04:26.000000000 +0800
++++ gdesklets-0.35.4/aclocal.m4 2008-02-18 20:49:03.000000000 +0800
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -26,27 +26,67 @@
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
#
-@@ -114,8 +122,7 @@
- #-----------------
- glib_DEFUN([GLIB_WITH_NLS],
- dnl NLS is obligatory
-- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-- USE_NLS=yes
-+ [USE_NLS=yes
- AC_SUBST(USE_NLS)
-
- gt_cv_have_gettext=no
-@@ -221,7 +228,7 @@
+@@ -218,6 +226,20 @@
+ 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],[
++ 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"
-@@ -447,7 +454,7 @@
-
++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)'`"], :)
+@@ -389,8 +411,10 @@
+ [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+ glib_save_prefix="$prefix"
+ glib_save_exec_prefix="$exec_prefix"
++glib_save_datarootdir="$datarootdir"
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++datarootdir=`eval echo "${datarootdir}"`
+ if test "x$CATOBJEXT" = "x.mo" ; then
+ localedir=`eval echo "${libdir}/locale"`
+ else
+@@ -398,6 +422,7 @@
+ 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])
+ ])
+@@ -410,9 +435,26 @@
+ AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+ ])dnl
+
++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
++#
++# Create a temporary file with TEST-FILE as its contents and pass the
++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
++# 0 and perform ACTION-IF-FAIL for any other exit status.
++AC_DEFUN([GLIB_RUN_PROG],
++[cat >conftest.foo <<_ACEOF
++$2
++_ACEOF
++if AC_RUN_LOG([$1 conftest.foo]); then
++ m4_ifval([$3], [$3], [:])
++m4_ifvaln([$4], [else $4])dnl
++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
++fi])
++
++
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 35 IT_PROG_INTLTOOL
@@ -54,7 +94,7 @@
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
-@@ -460,7 +467,7 @@
+@@ -425,7 +467,7 @@
esac
if test -n "$1"; then
@@ -63,7 +103,7 @@
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-@@ -489,6 +496,7 @@
+@@ -454,6 +496,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -71,7 +111,7 @@
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -508,6 +516,21 @@
+@@ -473,6 +516,21 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
@@ -93,7 +133,7 @@
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-@@ -530,19 +553,16 @@
+@@ -495,14 +553,34 @@
fi
fi
@@ -104,20 +144,37 @@
-
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
-
- # Set DATADIRNAME correctly if it is not set yet
- # (copied from glib-gettext.m4)
- if test -z "$DATADIRNAME"; then
-- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr],
+-
++
++# Set DATADIRNAME correctly if it is not set yet
++# (copied from glib-gettext.m4)
++if test -z "$DATADIRNAME"; then
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]],
+ [[extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr]])],
- [DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
-@@ -583,10 +603,6 @@
++ [DATADIRNAME=share],
++ [case $host in
++ *-*-solaris*)
++ dnl On Solaris, if bind_textdomain_codeset is in libc,
++ dnl GNU format message catalog is always supported,
++ dnl since both are added to the libc all together.
++ dnl Hence, we'd like to go with DATADIRNAME=share
++ dnl in this case.
++ AC_CHECK_FUNC(bind_textdomain_codeset,
++ [DATADIRNAME=share], [DATADIRNAME=lib])
++ ;;
++ *)
++ [DATADIRNAME=lib]
++ ;;
++ esac])
++fi
++AC_SUBST(DATADIRNAME)
++
+ IT_PO_SUBDIR([po])
+
+ dnl The following is very similar to
+@@ -525,10 +603,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
@@ -128,7 +185,7 @@
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
-@@ -601,9 +617,7 @@
+@@ -543,9 +617,7 @@
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -139,7 +196,7 @@
])
-@@ -652,7 +666,7 @@
+@@ -594,7 +666,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -148,7 +205,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -740,7 +754,6 @@
+@@ -682,7 +754,6 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
@@ -156,7 +213,7 @@
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
-@@ -815,7 +828,7 @@
+@@ -757,7 +828,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -165,7 +222,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -842,6 +855,8 @@
+@@ -784,6 +855,8 @@
;;
esac
@@ -174,7 +231,7 @@
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)
-@@ -902,8 +917,9 @@
+@@ -844,8 +917,9 @@
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
@@ -186,7 +243,7 @@
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -915,13 +931,85 @@
+@@ -857,13 +931,85 @@
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
@@ -275,7 +332,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
-@@ -932,12 +1020,20 @@
+@@ -874,12 +1020,20 @@
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
@@ -301,7 +358,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -1168,13 +1264,17 @@
+@@ -1110,13 +1264,17 @@
rm -rf conftest*
;;
@@ -320,7 +377,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -1191,6 +1291,9 @@
+@@ -1133,6 +1291,9 @@
;;
*64-bit*)
case $host in
@@ -330,7 +387,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -1231,7 +1334,11 @@
+@@ -1173,7 +1334,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -343,7 +400,7 @@
esac
;;
esac
-@@ -1262,7 +1369,7 @@
+@@ -1204,7 +1369,7 @@
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -352,7 +409,7 @@
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.
-@@ -1303,11 +1410,12 @@
+@@ -1245,11 +1410,12 @@
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -367,7 +424,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -1323,7 +1431,7 @@
+@@ -1265,7 +1431,7 @@
$2=yes
fi
fi
@@ -376,7 +433,7 @@
LDFLAGS="$save_LDFLAGS"
])
-@@ -1421,24 +1529,27 @@
+@@ -1363,24 +1529,27 @@
fi
;;
*)
@@ -421,7 +478,7 @@
;;
esac
])
-@@ -1591,7 +1702,7 @@
+@@ -1533,7 +1702,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
@@ -430,7 +487,7 @@
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
-@@ -1599,7 +1710,7 @@
+@@ -1541,7 +1710,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
@@ -439,7 +496,7 @@
])
])
])
-@@ -1665,7 +1776,8 @@
+@@ -1607,7 +1776,8 @@
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -449,7 +506,7 @@
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
-@@ -1673,7 +1785,7 @@
+@@ -1615,7 +1785,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -458,7 +515,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -1813,6 +1925,7 @@
+@@ -1755,6 +1925,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -466,7 +523,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1830,7 +1943,8 @@
+@@ -1772,7 +1943,8 @@
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -476,7 +533,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -1844,20 +1958,58 @@
+@@ -1786,20 +1958,58 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -540,7 +597,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1875,7 +2027,7 @@
+@@ -1817,7 +2027,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -549,7 +606,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2014,12 +2166,8 @@
+@@ -1956,12 +2166,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -564,7 +621,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -2073,7 +2221,7 @@
+@@ -2015,7 +2221,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -573,7 +630,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -2136,7 +2284,7 @@
+@@ -2078,7 +2284,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -582,7 +639,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2207,7 +2355,7 @@
+@@ -2149,7 +2355,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -591,7 +648,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -2313,6 +2461,10 @@
+@@ -2255,6 +2461,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -602,7 +659,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -2408,6 +2560,13 @@
+@@ -2350,6 +2560,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -616,7 +673,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -2418,7 +2577,8 @@
+@@ -2360,7 +2577,8 @@
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -626,7 +683,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -2679,7 +2839,7 @@
+@@ -2621,7 +2839,7 @@
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -635,7 +692,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -2742,7 +2902,7 @@
+@@ -2684,7 +2902,7 @@
# AC_PATH_MAGIC
# -------------
@@ -644,7 +701,7 @@
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
-@@ -2889,7 +3049,7 @@
+@@ -2831,7 +3049,7 @@
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -653,7 +710,7 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2906,7 +3066,7 @@
+@@ -2848,7 +3066,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -662,7 +719,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2928,9 +3088,15 @@
+@@ -2870,9 +3088,15 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -681,7 +738,7 @@
;;
darwin* | rhapsody*)
-@@ -2975,7 +3141,7 @@
+@@ -2917,7 +3141,7 @@
esac
;;
@@ -690,7 +747,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
-@@ -3025,6 +3191,10 @@
+@@ -2967,6 +3191,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -701,7 +758,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3077,7 +3247,7 @@
+@@ -3019,7 +3247,7 @@
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
@@ -710,7 +767,7 @@
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
-@@ -3293,10 +3463,10 @@
+@@ -3235,10 +3463,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -723,7 +780,7 @@
_LT_AC_SYS_COMPILER
-@@ -3332,7 +3502,7 @@
+@@ -3274,7 +3502,7 @@
fi
;;
@@ -732,7 +789,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -3389,6 +3559,7 @@
+@@ -3331,6 +3559,7 @@
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
@@ -740,7 +797,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -3398,10 +3569,10 @@
+@@ -3340,10 +3569,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -753,7 +810,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -3498,7 +3669,7 @@
+@@ -3440,7 +3669,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -762,7 +819,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -3511,7 +3682,7 @@
+@@ -3453,7 +3682,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -771,7 +828,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -3547,7 +3718,7 @@
+@@ -3489,7 +3718,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -780,7 +837,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -3657,59 +3828,31 @@
+@@ -3599,59 +3828,31 @@
fi
;;
darwin* | rhapsody*)
@@ -851,7 +908,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -3792,9 +3935,7 @@
+@@ -3734,9 +3935,7 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -862,7 +919,7 @@
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
-@@ -3862,7 +4003,7 @@
+@@ -3804,7 +4003,7 @@
;;
esac
;;
@@ -871,7 +928,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -3954,7 +4095,7 @@
+@@ -3896,7 +4095,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -880,7 +937,7 @@
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -3982,6 +4123,29 @@
+@@ -3924,6 +4123,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -910,7 +967,7 @@
esac
;;
lynxos*)
-@@ -4020,16 +4184,20 @@
+@@ -3962,16 +4184,20 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
@@ -940,7 +997,7 @@
;;
osf3*)
case $cc_basename in
-@@ -4191,15 +4359,10 @@
+@@ -4133,15 +4359,10 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -959,7 +1016,7 @@
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -4246,6 +4409,12 @@
+@@ -4188,6 +4409,12 @@
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -972,7 +1029,7 @@
fi
;;
esac
-@@ -4361,7 +4530,8 @@
+@@ -4303,7 +4530,8 @@
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -982,7 +1039,7 @@
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
-@@ -4486,10 +4656,15 @@
+@@ -4428,10 +4656,15 @@
$rm -f confest.$objext
@@ -999,7 +1056,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
_LT_AC_TAGVAR(predep_objects,$1)=
-@@ -4497,19 +4672,51 @@
+@@ -4439,19 +4672,51 @@
_LT_AC_TAGVAR(postdeps,$1)=
;;
@@ -1053,7 +1110,7 @@
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -4552,10 +4759,17 @@
+@@ -4494,10 +4759,17 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1073,7 +1130,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4587,7 +4801,7 @@
+@@ -4529,7 +4801,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1082,7 +1139,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -4634,10 +4848,10 @@
+@@ -4576,10 +4848,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1095,7 +1152,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4690,7 +4904,7 @@
+@@ -4632,7 +4904,7 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1104,7 +1161,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -4764,6 +4978,7 @@
+@@ -4706,6 +4978,7 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
@@ -1112,7 +1169,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -4779,6 +4994,7 @@
+@@ -4721,6 +4994,7 @@
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -1120,7 +1177,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -4825,7 +5041,7 @@
+@@ -4767,7 +5041,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -1129,7 +1186,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -5062,6 +5278,10 @@
+@@ -5004,6 +5278,10 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
@@ -1140,7 +1197,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -5150,7 +5370,7 @@
+@@ -5092,7 +5370,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -1149,7 +1206,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -5233,6 +5453,7 @@
+@@ -5175,6 +5453,7 @@
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -1157,7 +1214,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -5410,7 +5631,7 @@
+@@ -5352,7 +5631,7 @@
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
@@ -1166,7 +1223,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -5459,13 +5680,16 @@
+@@ -5401,13 +5680,16 @@
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -1186,7 +1243,7 @@
;;
darwin* | rhapsody*)
# PIC is the default on this platform
-@@ -5476,7 +5700,7 @@
+@@ -5418,7 +5700,7 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -1195,7 +1252,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5502,7 +5726,7 @@
+@@ -5444,7 +5726,7 @@
esac
else
case $host_os in
@@ -1204,7 +1261,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -5598,7 +5822,7 @@
+@@ -5540,7 +5822,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
@@ -1213,7 +1270,7 @@
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -5612,6 +5836,14 @@
+@@ -5554,6 +5836,14 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -1228,7 +1285,7 @@
;;
esac
;;
-@@ -5732,14 +5964,17 @@
+@@ -5674,14 +5964,17 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -1249,7 +1306,7 @@
;;
darwin* | rhapsody*)
-@@ -5748,7 +5983,7 @@
+@@ -5690,7 +5983,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -1258,7 +1315,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5806,10 +6041,11 @@
+@@ -5748,10 +6041,11 @@
esac
;;
@@ -1272,7 +1329,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -5858,6 +6094,22 @@
+@@ -5800,6 +6094,22 @@
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1295,7 +1352,7 @@
esac
;;
-@@ -5867,6 +6119,10 @@
+@@ -5809,6 +6119,10 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1306,7 +1363,7 @@
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -5926,7 +6182,7 @@
+@@ -5868,7 +6182,7 @@
#
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],
@@ -1315,7 +1372,7 @@
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
-@@ -5950,7 +6206,7 @@
+@@ -5892,7 +6206,7 @@
#
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],
@@ -1324,7 +1381,7 @@
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -5961,11 +6217,12 @@
+@@ -5903,11 +6217,12 @@
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -1339,7 +1396,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -5978,7 +6235,7 @@
+@@ -5920,7 +6235,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -1348,7 +1405,7 @@
;;
linux* | k*bsd*-gnu)
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -5987,6 +6244,7 @@
+@@ -5929,6 +6244,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
@@ -1356,7 +1413,7 @@
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -6017,12 +6275,14 @@
+@@ -5959,12 +6275,14 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -1372,7 +1429,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
-@@ -6072,7 +6332,7 @@
+@@ -6014,7 +6332,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -1381,7 +1438,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -6120,7 +6380,7 @@
+@@ -6062,7 +6380,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -1390,7 +1447,7 @@
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'
-@@ -6138,7 +6398,7 @@
+@@ -6080,7 +6398,7 @@
fi
;;
@@ -1399,7 +1456,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -6153,7 +6413,7 @@
+@@ -6095,7 +6413,7 @@
_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'
;;
@@ -1408,7 +1465,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -6171,13 +6431,22 @@
+@@ -6113,13 +6431,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -1433,7 +1490,7 @@
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
-@@ -6218,7 +6487,7 @@
+@@ -6160,7 +6487,7 @@
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
@@ -1442,7 +1499,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-@@ -6283,7 +6552,7 @@
+@@ -6225,7 +6552,7 @@
fi
;;
@@ -1451,7 +1508,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -6303,7 +6572,7 @@
+@@ -6245,7 +6572,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -1460,7 +1517,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -6337,7 +6606,7 @@
+@@ -6279,7 +6606,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1469,7 +1526,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -6430,7 +6699,7 @@
+@@ -6372,7 +6699,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
@@ -1478,7 +1535,7 @@
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
-@@ -6463,19 +6732,18 @@
+@@ -6405,19 +6732,18 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -1504,7 +1561,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -6637,24 +6905,28 @@
+@@ -6579,24 +6905,28 @@
;;
openbsd*)
@@ -1550,7 +1607,7 @@
fi
;;
-@@ -6713,17 +6985,16 @@
+@@ -6655,17 +6985,16 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -1577,7 +1634,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -6780,7 +7051,7 @@
+@@ -6722,7 +7051,7 @@
fi
;;
@@ -1586,7 +1643,7 @@
_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
-@@ -6855,7 +7126,7 @@
+@@ -6797,7 +7126,7 @@
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -1595,7 +1652,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
-@@ -6958,6 +7229,30 @@
+@@ -6900,6 +7229,30 @@
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -1626,7 +1683,7 @@
# 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 #
-@@ -6978,12 +7273,13 @@
+@@ -6920,12 +7273,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1641,7 +1698,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -7016,6 +7312,7 @@
+@@ -6958,6 +7312,7 @@
done
])
SED=$lt_cv_path_SED
@@ -1649,7 +1706,17 @@
AC_MSG_RESULT([$SED])
])
-@@ -7167,7 +7464,7 @@
+@@ -7099,7 +7454,8 @@
+
+ _PKG_TEXT
+ ])],
+- [$4])
++ [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
+@@ -7108,7 +7464,7 @@
_PKG_TEXT
@@ -1658,7 +1725,7 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -7177,7 +7474,7 @@
+@@ -7118,7 +7474,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
@@ -1667,7 +1734,7 @@
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -7187,14 +7484,31 @@
+@@ -7128,14 +7484,31 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
@@ -1702,7 +1769,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-@@ -7251,14 +7565,14 @@
+@@ -7192,14 +7565,14 @@
# AM_CONDITIONAL -*- Autoconf -*-
@@ -1719,7 +1786,7 @@
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
-@@ -7267,8 +7581,10 @@
+@@ -7208,8 +7581,10 @@
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
@@ -1732,7 +1799,7 @@
if $2; then
$1_TRUE=
$1_FALSE='#'
-@@ -7282,15 +7598,14 @@
+@@ -7223,15 +7598,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
@@ -1750,7 +1817,7 @@
# 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,
-@@ -7318,6 +7633,7 @@
+@@ -7259,6 +7633,7 @@
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
@@ -1758,7 +1825,7 @@
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
-@@ -7383,6 +7699,7 @@
+@@ -7324,6 +7699,7 @@
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 &&
@@ -1766,7 +1833,7 @@
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
-@@ -7435,7 +7752,8 @@
+@@ -7376,7 +7752,8 @@
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
@@ -1776,7 +1843,7 @@
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
-@@ -7460,8 +7778,9 @@
+@@ -7401,8 +7778,9 @@
# 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.
@@ -1788,7 +1855,7 @@
dirpart=`AS_DIRNAME("$mf")`
else
continue
-@@ -7520,14 +7839,14 @@
+@@ -7461,14 +7839,14 @@
# Do all the work for Automake. -*- Autoconf -*-
@@ -1806,7 +1873,7 @@
# 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.
-@@ -7544,16 +7863,20 @@
+@@ -7485,16 +7863,20 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
@@ -1832,7 +1899,7 @@
fi
# test whether we have cygpath
-@@ -7573,6 +7896,9 @@
+@@ -7514,6 +7896,9 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
@@ -1842,7 +1909,7 @@
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-@@ -7608,6 +7934,10 @@
+@@ -7549,6 +7934,10 @@
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
@@ -1853,7 +1920,7 @@
])
])
-@@ -7621,16 +7951,17 @@
+@@ -7562,16 +7951,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
@@ -1873,7 +1940,7 @@
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
-@@ -7643,7 +7974,7 @@
+@@ -7584,7 +7974,7 @@
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -1882,7 +1949,7 @@
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-@@ -7750,14 +8081,14 @@
+@@ -7691,14 +8081,14 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
@@ -1899,7 +1966,7 @@
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
-@@ -7773,6 +8104,7 @@
+@@ -7714,6 +8104,7 @@
# 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
@@ -1907,7 +1974,7 @@
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
-@@ -7783,7 +8115,7 @@
+@@ -7724,7 +8115,7 @@
fi
])
@@ -1916,7 +1983,7 @@
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -7791,60 +8123,23 @@
+@@ -7732,60 +8123,23 @@
# AM_PROG_MKDIR_P
# ---------------
@@ -1993,7 +2060,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-@@ -8137,9 +8432,21 @@
+@@ -8078,9 +8432,21 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
@@ -2016,604 +2083,9 @@
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-diff -urN gdesklets-0.36.orig/Additions/bg/Makefile.in gdesklets-0.36/Additions/bg/Makefile.in
---- gdesklets-0.36.orig/Additions/bg/Makefile.in 2008-02-17 01:45:39.000000000 +0800
-+++ gdesklets-0.36/Additions/bg/Makefile.in 2008-03-01 01:27:29.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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,8 +55,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -82,6 +76,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -98,6 +93,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -108,14 +104,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -127,7 +121,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -137,12 +130,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -164,6 +158,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -182,13 +177,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -200,6 +195,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -233,8 +229,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Additions/bg
- install_DATA = \
- black.svg \
-@@ -288,13 +287,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -317,22 +312,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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; \
-@@ -348,7 +342,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -380,7 +374,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -394,12 +388,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -418,17 +420,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-+
-+.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
-+ uninstall uninstall-am uninstall-installDATA
-
- # 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.
-diff -urN gdesklets-0.36.orig/Additions/Makefile.in gdesklets-0.36/Additions/Makefile.in
---- gdesklets-0.36.orig/Additions/Makefile.in 2008-02-17 01:45:38.000000000 +0800
-+++ gdesklets-0.36/Additions/Makefile.in 2008-03-01 01:27:29.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +13,11 @@
- # 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
-@@ -48,18 +44,19 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-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
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -81,6 +78,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -97,6 +95,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -107,14 +106,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -126,7 +123,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -136,12 +132,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -163,6 +160,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -181,13 +179,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -199,6 +197,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -232,8 +231,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = \
- bg
-
-@@ -277,10 +279,6 @@
- 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,
-@@ -312,8 +310,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -357,8 +354,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -383,8 +380,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -394,13 +391,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -414,22 +410,21 @@
- -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)'; 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; \
-+ @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 \
- 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; \
-@@ -443,7 +438,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`; \
-@@ -451,6 +446,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -490,8 +487,7 @@
-
- distclean: distclean-recursive
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
-
- dvi: dvi-recursive
-
-@@ -505,12 +501,20 @@
-
- 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
-@@ -529,22 +533,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.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 \
-+.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 \
- 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 \
-+ 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 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
-+ maintainer-clean-generic mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-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.
-diff -urN gdesklets-0.36.orig/config/Makefile.in gdesklets-0.36/config/Makefile.in
---- gdesklets-0.36.orig/config/Makefile.in 2008-02-17 01:45:50.000000000 +0800
-+++ gdesklets-0.36/config/Makefile.in 2008-03-01 01:27:32.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/config/Makefile.in gdesklets-0.35.4/config/Makefile.in
+--- gdesklets-0.35.4.orig/config/Makefile.in 2006-10-05 20:04:34.000000000 +0800
++++ gdesklets-0.35.4/config/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -2690,7 +2162,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -2700,13 +2172,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -2714,7 +2186,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -2732,7 +2204,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -2740,7 +2212,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -2752,7 +2224,7 @@
installdir = ${coredir}/config
install_DATA = \
__init__.py \
-@@ -309,13 +308,9 @@
+@@ -308,13 +308,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -2767,7 +2239,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -343,7 +338,7 @@
+@@ -342,7 +338,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -2776,7 +2248,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -366,22 +361,21 @@
+@@ -365,22 +361,21 @@
distdir: $(DISTFILES)
@@ -2812,7 +2284,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -397,7 +391,7 @@
+@@ -396,7 +391,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -2821,7 +2293,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -430,7 +424,7 @@
+@@ -429,7 +424,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -2830,7 +2302,7 @@
dvi: dvi-am
-@@ -444,12 +438,20 @@
+@@ -443,12 +438,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -2851,7 +2323,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -468,20 +470,22 @@
+@@ -467,20 +470,22 @@
ps-am:
@@ -2880,35 +2352,23 @@
# 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.
-diff -urN gdesklets-0.36.orig/config.guess gdesklets-0.36/config.guess
---- gdesklets-0.36.orig/config.guess 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/config.guess 2008-03-01 01:27:36.000000000 +0800
-@@ -1,10 +1,10 @@
+diff -urN gdesklets-0.35.4.orig/config.guess gdesklets-0.35.4/config.guess
+--- gdesklets-0.35.4.orig/config.guess 2006-10-05 20:04:42.000000000 +0800
++++ gdesklets-0.35.4/config.guess 2007-08-17 11:14:13.000000000 +0800
+@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--# Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# Free Software Foundation, Inc.
-
--timestamp='2006-07-02'
-+timestamp='2008-01-23'
+-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++# Inc.
+
+-timestamp='2006-02-23'
++timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -56,8 +56,8 @@
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -161,6 +161,7 @@
+@@ -160,6 +161,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
@@ -2916,7 +2376,16 @@
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
-@@ -329,7 +330,7 @@
+@@ -210,7 +212,7 @@
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+@@ -328,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -2925,32 +2394,35 @@
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
-@@ -531,7 +532,7 @@
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
-- *:AIX:*:[45])
-+ *:AIX:*:[456])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
-@@ -780,7 +781,7 @@
+@@ -770,6 +772,8 @@
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ amd64)
++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+@@ -777,10 +781,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+- echo ${UNAME_MACHINE}-pc-mingw32
+- exit ;;
+- i*:MSYS_NT-*:*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
-@@ -790,12 +791,18 @@
+@@ -790,12 +791,15 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
-- x86:Interix*:[3456]*)
+- x86:Interix*:[345]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-- EM64T:Interix*:[3456]*)
+- EM64T:Interix*:[345]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
@@ -2961,40 +2433,40 @@
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
-+ IA64)
-+ echo ia64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
-@@ -829,7 +836,14 @@
- echo ${UNAME_MACHINE}-pc-minix
+@@ -831,6 +835,9 @@
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- arm*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ eval $set_cc_for_build
-+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep -q __ARM_EABI__
-+ then
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ else
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ fi
++ avr32*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
exit ;;
- avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -950,6 +964,9 @@
+@@ -947,6 +954,9 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
-+ xtensa*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ xtensa:Linux:*:*)
++ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
-@@ -1208,6 +1225,15 @@
+@@ -989,7 +999,7 @@
+ LIBC=gnulibc1
+ # endif
+ #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+@@ -1205,6 +1215,15 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
@@ -3010,47 +2482,28 @@
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
-@@ -1458,9 +1484,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
-
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- and
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-diff -urN gdesklets-0.36.orig/config.sub gdesklets-0.36/config.sub
---- gdesklets-0.36.orig/config.sub 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/config.sub 2008-03-01 01:27:36.000000000 +0800
-@@ -1,10 +1,10 @@
+diff -urN gdesklets-0.35.4.orig/config.sub gdesklets-0.35.4/config.sub
+--- gdesklets-0.35.4.orig/config.sub 2006-10-05 20:04:42.000000000 +0800
++++ gdesklets-0.35.4/config.sub 2007-08-17 11:14:13.000000000 +0800
+@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--# Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# Free Software Foundation, Inc.
-
--timestamp='2006-09-20'
-+timestamp='2008-01-16'
+-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++# Inc.
+
+-timestamp='2006-02-23'
++timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
-@@ -72,8 +72,8 @@
- version="\
- GNU config.sub ($timestamp)
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -245,12 +245,12 @@
+@@ -240,15 +241,16 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -3059,13 +2512,48 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-- | maxq | mb | microblaze | mcore \
+- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
++ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
-@@ -324,7 +324,7 @@
+@@ -274,21 +276,19 @@
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++ | score \
++ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+- | sparcv8 | sparcv9 | sparcv9b \
+- | strongarm \
++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
+- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m32c)
+- basic_machine=$basic_machine-unknown
+- ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+@@ -318,18 +318,18 @@
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+- | avr-* \
++ | avr-* | avr32-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
@@ -3074,38 +2562,41 @@
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
-@@ -369,10 +369,14 @@
+ | ip2k-* | iq2000-* \
+- | m32r-* | m32rle-* \
++ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+@@ -358,23 +358,21 @@
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-- | xstormy16-* | xtensa-* \
-+ | xstormy16-* | xtensa*-* \
+- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
-+ # Recognize the basic CPU types without company name, with glob match.
-+ xtensa*)
-+ basic_machine=$basic_machine-unknown
-+ ;;
+- m32c-*)
+- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
-@@ -443,6 +447,14 @@
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
-+ blackfin)
-+ basic_machine=bfin-unknown
-+ os=-linux
-+ ;;
-+ blackfin-*)
-+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
-@@ -475,8 +487,8 @@
+@@ -477,8 +475,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
@@ -3116,22 +2607,7 @@
os=-elf
;;
crds | unos)
-@@ -668,6 +680,14 @@
- basic_machine=m68k-isi
- os=-sysv
- ;;
-+ m68knommu)
-+ basic_machine=m68k-unknown
-+ os=-linux
-+ ;;
-+ m68knommu-*)
-+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
-@@ -683,6 +703,10 @@
+@@ -685,6 +683,10 @@
basic_machine=i386-pc
os=-mingw32
;;
@@ -3142,22 +2618,18 @@
miniframe)
basic_machine=m68000-convergent
;;
-@@ -809,6 +833,14 @@
- basic_machine=i860-intel
- os=-osf
+@@ -912,6 +914,10 @@
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
;;
-+ parisc)
-+ basic_machine=hppa-unknown
-+ os=-linux
++ sde)
++ basic_machine=mipsisa32-sde
++ os=-elf
+ ;;
-+ parisc-*)
-+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ os=-linux
-+ ;;
- pbd)
- basic_machine=sparc-tti
- ;;
-@@ -925,6 +957,9 @@
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+@@ -923,6 +929,9 @@
basic_machine=sh-hitachi
os=-hms
;;
@@ -3167,27 +2639,51 @@
sh64)
basic_machine=sh64-unknown
;;
-@@ -1014,6 +1049,10 @@
- basic_machine=tic6x-unknown
- os=-coff
+@@ -1128,7 +1137,7 @@
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
;;
-+ tile*)
-+ basic_machine=tile-unknown
-+ os=-linux-gnu
-+ ;;
- tx39)
- basic_machine=mipstx39-unknown
+- sparc | sparcv8 | sparcv9 | sparcv9b)
++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ basic_machine=sparc-sun
;;
-@@ -1219,7 +1258,7 @@
+ cydra)
+@@ -1217,7 +1226,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos* | -toppers*)
+- | -skyos* | -haiku* | -rdos*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
-@@ -1414,6 +1453,9 @@
+@@ -1369,6 +1378,12 @@
+ # system, and we'll never get to this point.
+
+ case $basic_machine in
++ score-*)
++ os=-elf
++ ;;
++ spu-*)
++ os=-elf
++ ;;
+ *-acorn)
+ os=-riscix1.2
+ ;;
+@@ -1378,9 +1393,9 @@
+ arm*-semi)
+ os=-aout
+ ;;
+- c4x-* | tic4x-*)
+- os=-coff
+- ;;
++ c4x-* | tic4x-*)
++ os=-coff
++ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+ os=-tops20
+@@ -1406,6 +1421,9 @@
m68*-cisco)
os=-aout
;;
@@ -3197,10 +2693,189 @@
mips*-cisco)
os=-elf
;;
-diff -urN gdesklets-0.36.orig/configure gdesklets-0.36/configure
---- gdesklets-0.36.orig/configure 2008-02-17 01:45:36.000000000 +0800
-+++ gdesklets-0.36/configure 2008-03-01 01:27:26.000000000 +0800
-@@ -807,6 +807,7 @@
+diff -urN gdesklets-0.35.4.orig/configure gdesklets-0.35.4/configure
+--- gdesklets-0.35.4.orig/configure 2006-10-05 20:04:30.000000000 +0800
++++ gdesklets-0.35.4/configure 2008-02-18 20:51:05.000000000 +0800
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.60.
++# Generated by GNU Autoconf 2.61.
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -10,7 +10,8 @@
+ ## M4sh Initialization. ##
+ ## --------------------- ##
+
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+@@ -19,10 +20,13 @@
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+ else
+- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++ case `(set -o) 2>/dev/null` in
++ *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
++
+
+
+ # PATH needs CR
+@@ -215,7 +219,7 @@
+ else
+ as_candidate_shells=
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+@@ -233,7 +237,6 @@
+ # Try only shells that exist, to save several forks.
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { ("$as_shell") 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+@@ -242,10 +245,12 @@
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+ else
+- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++ case `(set -o) 2>/dev/null` in
++ *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
+
+ :
+ _ASEOF
+@@ -253,7 +258,6 @@
+ CONFIG_SHELL=$as_shell
+ as_have_required=yes
+ if { "$as_shell" 2> /dev/null <<\_ASEOF
+-# Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+@@ -262,10 +266,12 @@
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+ else
+- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++ case `(set -o) 2>/dev/null` in
++ *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
+
+ :
+ (as_func_return () {
+@@ -512,19 +518,28 @@
+ as_mkdir_p=false
+ fi
+
+-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+- as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++ as_test_x='test -x'
+ else
+- as_executable_p=:
++ if ls -dL / >/dev/null 2>&1; then
++ as_ls_L_option=L
++ else
++ as_ls_L_option=
++ fi
++ as_test_x='
++ eval sh -c '\''
++ if test -d "$1"; then
++ test -d "$1/.";
++ else
++ case $1 in
++ -*)set "./$1";;
++ esac;
++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++ ???[sx]*):;;*)false;;esac;fi
++ '\'' sh
++ '
+ fi
+-rm -f conf$$.file
++as_executable_p=$as_test_x
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -719,36 +734,36 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ # include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+ #endif
+-#if HAVE_STDINT_H
++#ifdef HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
+
+@@ -792,6 +807,7 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
@@ -3208,7 +2883,7 @@
CYGPATH_W
PACKAGE
VERSION
-@@ -865,14 +866,14 @@
+@@ -856,15 +872,16 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
@@ -3225,9 +2900,11 @@
-INTLTOOL_MSGMERGE
-INTLTOOL_XGETTEXT
ALL_LINGUAS
- DATADIRNAME
++DATADIRNAME
build
-@@ -883,10 +884,13 @@
+ build_cpu
+ build_vendor
+@@ -873,10 +890,13 @@
host_cpu
host_vendor
host_os
@@ -3238,21 +2915,108 @@
RANLIB
+DSYMUTIL
+NMEDIT
- CXX
- CXXFLAGS
- ac_ct_CXX
-@@ -927,10 +931,8 @@
+ CXXCPP
+ F77
+ FFLAGS
+@@ -915,12 +935,10 @@
UPDATE_DESKTOP_DATABASE
GETTEXT_PACKAGE
USE_NLS
-MSGFMT
- MSGFMT_OPTS
++MSGFMT_OPTS
GMSGFMT
-XGETTEXT
CATALOGS
CATOBJEXT
+-DATADIRNAME
GMOFILES
-@@ -2034,7 +2036,8 @@
+ INSTOBJEXT
+ INTLLIBS
+@@ -941,6 +959,7 @@
+ CC
+ CFLAGS
+ LDFLAGS
++LIBS
+ CPPFLAGS
+ CXX
+ CXXFLAGS
+@@ -1073,10 +1092,10 @@
+ -disable-* | --disable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+@@ -1092,10 +1111,10 @@
+ -enable-* | --enable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
+ eval enable_$ac_feature=\$ac_optarg ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+@@ -1289,19 +1308,19 @@
+ -with-* | --with-*)
+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+- ac_package=`echo $ac_package| sed 's/-/_/g'`
++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=\$ac_optarg ;;
+
+ -without-* | --without-*)
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+- ac_package=`echo $ac_package | sed 's/-/_/g'`
++ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
+ eval with_$ac_package=no ;;
+
+ --x)
+@@ -1570,6 +1589,7 @@
+ CFLAGS C compiler flags
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
++ LIBS libraries to pass to the linker, e.g. -l<library>
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CXX C++ compiler command
+@@ -1674,7 +1694,7 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ configure
+-generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.61
+
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -1688,7 +1708,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.60. Invocation command line was
++generated by GNU Autoconf 2.61. Invocation command line was
+
+ $ $0 $@
+
+@@ -2032,7 +2052,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3262,7 +3026,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
-@@ -2217,38 +2220,53 @@
+@@ -2100,7 +2121,7 @@
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+@@ -2215,38 +2236,53 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -3345,7 +3118,16 @@
for ac_prog in gawk mawk nawk awk
do
-@@ -2331,12 +2349,16 @@
+@@ -2266,7 +2302,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2329,12 +2365,16 @@
fi
rmdir .tst 2>/dev/null
@@ -3366,7 +3148,7 @@
fi
# test whether we have cygpath
-@@ -2370,7 +2392,7 @@
+@@ -2368,7 +2408,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
@@ -3375,7 +3157,25 @@
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
-@@ -2474,7 +2496,7 @@
+@@ -2392,7 +2432,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2432,7 +2472,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2472,7 +2512,7 @@
fi
fi
@@ -3384,7 +3184,7 @@
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-@@ -2501,9 +2523,7 @@
+@@ -2499,9 +2539,7 @@
{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
@@ -3395,7 +3195,252 @@
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
-@@ -3486,9 +3506,7 @@
+@@ -2535,7 +2573,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2575,7 +2613,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2632,7 +2670,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2673,7 +2711,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+@@ -2731,7 +2769,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2775,7 +2813,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -2916,7 +2954,7 @@
+ # in a Makefile. We should not override ac_cv_exeext if it was cached,
+ # so that the user can short-circuit this test for compilers unknown to
+ # Autoconf.
+-for ac_file in $ac_files
++for ac_file in $ac_files ''
+ do
+ test -f "$ac_file" || continue
+ case $ac_file in
+@@ -2944,6 +2982,12 @@
+ test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+ else
++ ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+@@ -2955,8 +2999,6 @@
+ fi
+
+ ac_exeext=$ac_cv_exeext
+-{ echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6; }
+
+ # Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+@@ -3134,27 +3176,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -3209,27 +3234,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -3264,27 +3272,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -3320,27 +3311,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -3456,27 +3430,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -3565,9 +3522,7 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
@@ -3406,7 +3451,7 @@
AMDEP_TRUE=
AMDEP_FALSE='#'
else
-@@ -3498,7 +3516,6 @@
+@@ -3577,7 +3532,6 @@
@@ -3414,7 +3459,7 @@
depcc="$CC" am_compiler_list=
{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-@@ -3566,6 +3583,7 @@
+@@ -3645,6 +3599,7 @@
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 &&
@@ -3422,7 +3467,7 @@
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
-@@ -3595,9 +3613,7 @@
+@@ -3674,9 +3629,7 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -3433,7 +3478,310 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
-@@ -4246,6 +4262,7 @@
+@@ -3715,7 +3668,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -3759,7 +3712,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -3872,27 +3825,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -3947,27 +3883,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4002,27 +3921,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4058,27 +3960,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cxx_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4186,6 +4071,7 @@
+ 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
+@@ -4215,9 +4101,7 @@
+ echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+-
+-
+-if
++ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+@@ -4281,17 +4165,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4325,17 +4202,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ # Broken: success on invalid input.
+ continue
+ else
+@@ -4400,17 +4270,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4444,17 +4307,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ # Broken: success on invalid input.
+ continue
+ else
+@@ -4509,7 +4365,7 @@
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ # Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+ case `"$ac_path_GREP" --version 2>&1` in
+@@ -4591,7 +4447,7 @@
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+- { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ # Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+ case `"$ac_path_EGREP" --version 2>&1` in
+@@ -4687,27 +4543,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_header_stdc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4911,6 +4750,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -3441,7 +3789,7 @@
-@@ -4266,24 +4283,18 @@
+@@ -4931,24 +4771,18 @@
@@ -3472,16 +3820,18 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4293,7 +4304,7 @@
+@@ -4957,8 +4791,8 @@
+ IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
++ 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"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4304,49 +4315,26 @@
+@@ -4969,49 +4803,26 @@
;;
esac
fi
@@ -3540,16 +3890,18 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4356,7 +4344,7 @@
+@@ -5020,8 +4831,8 @@
+ IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
++ 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"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4364,14 +4352,13 @@
+@@ -5029,14 +4840,13 @@
done
IFS=$as_save_IFS
@@ -3568,7 +3920,7 @@
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-@@ -4382,12 +4369,12 @@
+@@ -5047,12 +4857,12 @@
set dummy msgfmt; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
@@ -3584,16 +3936,18 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4397,7 +4384,7 @@
+@@ -5061,8 +4871,8 @@
+ IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ 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"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4405,71 +4392,51 @@
+@@ -5070,30 +4880,51 @@
done
IFS=$as_save_IFS
@@ -3617,46 +3971,11 @@
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- case $INTLTOOL_MSGMERGE in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
-- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
-- ;;
--esac
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
- fi
--INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
--if test -n "$INTLTOOL_MSGMERGE"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
--echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
++fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
@@ -3664,13 +3983,11 @@
+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
- fi
-
++fi
++
+# Use the tools built into the package, not the ones that are installed.
+INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-
--# Extract the first word of "xgettext", so it can be a program name with args.
--set dummy xgettext; ac_word=$2
++
+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+
+INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
@@ -3680,39 +3997,41 @@
+set dummy perl; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
+-if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- case $INTLTOOL_XGETTEXT in
+- case $INTLTOOL_MSGMERGE in
+ case $INTLTOOL_PERL in
[\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
+- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
+ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4479,7 +4446,7 @@
+@@ -5102,8 +4933,8 @@
+ IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
++ 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"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4487,20 +4454,41 @@
+@@ -5111,63 +4942,186 @@
done
IFS=$as_save_IFS
-- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
+- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
;;
esac
fi
--INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
--if test -n "$INTLTOOL_XGETTEXT"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
--echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
+-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
+-if test -n "$INTLTOOL_MSGMERGE"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
+-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+if test -n "$INTLTOOL_PERL"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
@@ -3723,6 +4042,11 @@
fi
+-# Extract the first word of "xgettext", so it can be a program name with args.
+-set dummy xgettext; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
+if test -z "$INTLTOOL_PERL"; then
+ { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+echo "$as_me: error: perl not found; required for intltool" >&2;}
@@ -3745,19 +4069,193 @@
+ { (exit 1); exit 1; }; }
+ fi
+fi
-
- # Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-@@ -4519,7 +4507,7 @@
- main ()
- {
- extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr
++
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
++
++
++# Set DATADIRNAME correctly if it is not set yet
++# (copied from glib-gettext.m4)
++if test -z "$DATADIRNAME"; then
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr
- ;
- return 0;
- }
-@@ -4880,12 +4868,13 @@
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ DATADIRNAME=share
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ case $host in
++ *-*-solaris*)
++ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
++if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $INTLTOOL_XGETTEXT in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
+- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
+- ;;
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char bind_textdomain_codeset (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef bind_textdomain_codeset
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char bind_textdomain_codeset ();
++/* The GNU C library defines this for functions which it implements
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
++choke me
++#endif
++
++int
++main ()
++{
++return bind_textdomain_codeset ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
+-if test -n "$INTLTOOL_XGETTEXT"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
+-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_func_bind_textdomain_codeset=yes
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_cv_func_bind_textdomain_codeset=no
+ fi
+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
++echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
++if test $ac_cv_func_bind_textdomain_codeset = yes; then
++ DATADIRNAME=share
++else
++ DATADIRNAME=lib
++fi
+
++ ;;
++ *)
++ DATADIRNAME=lib
++ ;;
++ esac
++fi
+
+-# Substitute ALL_LINGUAS so we can use it in po/Makefile
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++fi
+
+
+
+@@ -5213,7 +5167,7 @@
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+@@ -5402,12 +5356,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3772,7 +4270,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -4920,6 +4909,7 @@
+@@ -5442,6 +5397,7 @@
fi
SED=$lt_cv_path_SED
@@ -3780,7 +4278,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -5119,8 +5109,8 @@
+@@ -5641,8 +5597,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -3791,7 +4289,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5139,7 +5129,7 @@
+@@ -5661,7 +5617,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -3800,7 +4298,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5161,9 +5151,15 @@
+@@ -5683,9 +5639,15 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -3819,7 +4317,7 @@
;;
darwin* | rhapsody*)
-@@ -5208,7 +5204,7 @@
+@@ -5730,7 +5692,7 @@
esac
;;
@@ -3828,7 +4326,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-@@ -5258,6 +5254,10 @@
+@@ -5780,6 +5742,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3839,7 +4337,16 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5379,7 +5379,8 @@
+@@ -5866,7 +5832,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 5869 "configure"' > conftest.$ac_ext
++ echo '#line 5835 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -5901,7 +5867,8 @@
rm -rf conftest*
;;
@@ -3849,7 +4356,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -5390,6 +5391,9 @@
+@@ -5912,6 +5879,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -3859,7 +4366,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -5406,6 +5410,9 @@
+@@ -5928,6 +5898,9 @@
;;
*64-bit*)
case $host in
@@ -3869,7 +4376,49 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -5509,7 +5516,11 @@
+@@ -5990,27 +5963,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ lt_cv_cc_needs_belf=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -6019,7 +5976,7 @@
+ lt_cv_cc_needs_belf=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -6047,7 +6004,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -3882,26 +4431,313 @@
esac
;;
esac
-@@ -6163,6 +6174,7 @@
- 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
-@@ -6192,9 +6204,7 @@
- echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
--
--
--if
-+ if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
- am__fastdepCXX_TRUE=
-@@ -6702,7 +6712,6 @@
+@@ -6103,27 +6064,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -6167,46 +6111,29 @@
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -6242,17 +6169,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -6364,17 +6284,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_cxx_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -6408,17 +6321,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_cxx_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ # Broken: success on invalid input.
+ continue
+ else
+@@ -6483,17 +6389,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_cxx_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -6527,17 +6426,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_cxx_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ # Broken: success on invalid input.
+ continue
+ else
+@@ -6578,7 +6470,7 @@
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ 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
+@@ -6596,7 +6488,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -6622,7 +6514,7 @@
+ fi
+ if test -z "$F77"; then
+ ac_ct_F77=$F77
+- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -6640,7 +6532,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -6747,27 +6639,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_f77_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -6810,27 +6685,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_f77_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_f77_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -6870,7 +6728,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -3909,7 +4745,7 @@
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -6789,24 +6798,27 @@
+@@ -6957,24 +6814,27 @@
fi
;;
*)
@@ -3954,7 +4790,7 @@
;;
esac
-@@ -6823,6 +6835,7 @@
+@@ -6991,6 +6851,7 @@
@@ -3962,7 +4798,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -7013,7 +7026,7 @@
+@@ -7181,7 +7042,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -3971,7 +4807,61 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -7411,7 +7424,7 @@
+@@ -7285,7 +7146,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -7325,7 +7186,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -7381,7 +7242,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -7421,7 +7282,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -7477,7 +7338,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -7517,7 +7378,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -7579,7 +7440,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -3980,10 +4870,114 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -7573,6 +7586,318 @@
- ;;
- esac
-
+@@ -7648,98 +7509,410 @@
+ *** may want to report the problem to your system manager and/or to
+ *** bug-libtool at gnu.org
+
+-EOF
+- fi ;;
+- esac
+- fi
+- break
+- fi
+- done
+- IFS="$lt_save_ifs"
+- MAGIC_CMD="$lt_save_MAGIC_CMD"
+- ;;
+-esac
++EOF
++ fi ;;
++ esac
++ fi
++ break
++ fi
++ done
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
++ ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++ if test -n "$ac_tool_prefix"; then
++ { echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6; }
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $MAGIC_CMD in
++[\\/*] | ?:[\\/]*)
++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++ ;;
++*)
++ lt_save_MAGIC_CMD="$MAGIC_CMD"
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++ for ac_dir in $ac_dummy; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/file; then
++ lt_cv_path_MAGIC_CMD="$ac_dir/file"
++ if test -n "$file_magic_test_file"; then
++ case $deplibs_check_method in
++ "file_magic "*)
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++ $EGREP "$file_magic_regex" > /dev/null; then
++ :
++ else
++ cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such. This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem. Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool at gnu.org
++
++EOF
++ fi ;;
++ esac
++ fi
++ break
++ fi
++ done
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
++ ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ else
++ MAGIC_CMD=:
++ fi
++fi
++
++ fi
++ ;;
++esac
++
+
+ case $host_os in
+ rhapsody* | darwin*)
@@ -4109,17 +5103,27 @@
+done
+IFS=$as_save_IFS
+
-+fi
+ fi
+-
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
+echo "${ECHO_T}$NMEDIT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+- if test -n "$ac_tool_prefix"; then
+- { echo "$as_me:$LINENO: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
@@ -4129,8 +5133,40 @@
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $MAGIC_CMD in
+-[\\/*] | ?:[\\/]*)
+- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+- ;;
+-*)
+- lt_save_MAGIC_CMD="$MAGIC_CMD"
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+- for ac_dir in $ac_dummy; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/file; then
+- lt_cv_path_MAGIC_CMD="$ac_dir/file"
+- 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
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
@@ -4148,21 +5184,38 @@
+done
+done
+IFS=$as_save_IFS
-+
-+fi
+
+-EOF
+- fi ;;
+- esac
+- fi
+- break
+- fi
+- done
+- IFS="$lt_save_ifs"
+- MAGIC_CMD="$lt_save_MAGIC_CMD"
+- ;;
+-esac
+ fi
+-
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+
+ if test "x$ac_ct_NMEDIT" = x; then
+ NMEDIT=":"
-+ else
+ else
+- MAGIC_CMD=:
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
@@ -4174,11 +5227,13 @@
+ac_tool_warned=yes ;;
+esac
+ NMEDIT=$ac_ct_NMEDIT
-+ fi
+ fi
+else
+ NMEDIT="$ac_cv_prog_NMEDIT"
-+fi
-+
+ fi
+
+- fi
+- ;;
+
+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
@@ -4232,7 +5287,7 @@
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
-+esac
+ esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
@@ -4295,11 +5350,10 @@
+ ;;
+ esac
+
-+
+
enable_dlopen=no
enable_win32_dll=no
-
-@@ -7611,10 +7936,10 @@
+@@ -7779,10 +7952,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -4312,7 +5366,7 @@
# If no C compiler was specified, use CC.
-@@ -7629,16 +7954,16 @@
+@@ -7797,16 +7970,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -4332,7 +5386,7 @@
-@@ -7655,7 +7980,7 @@
+@@ -7823,7 +7996,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -4341,21 +5395,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -7666,11 +7991,11 @@
+@@ -7834,11 +8007,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:7669: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7994: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7837: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8010: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7673: \$? = $ac_status" >&5
-+ echo "$as_me:7998: \$? = $ac_status" >&5
+- echo "$as_me:7841: \$? = $ac_status" >&5
++ echo "$as_me:8014: \$? = $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.
-@@ -7721,13 +8046,15 @@
+@@ -7889,13 +8062,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -4373,7 +5427,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -7737,7 +8064,7 @@
+@@ -7905,7 +8080,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -4382,7 +5436,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -7795,7 +8122,7 @@
+@@ -7963,7 +8138,7 @@
esac
;;
@@ -4391,7 +5445,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -7847,6 +8174,22 @@
+@@ -8015,6 +8190,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -4414,7 +5468,7 @@
esac
;;
-@@ -7856,6 +8199,10 @@
+@@ -8024,6 +8215,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -4425,7 +5479,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -7918,12 +8265,12 @@
+@@ -8086,12 +8281,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
@@ -4441,17 +5495,17 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -7934,27 +8281,27 @@
+@@ -8102,27 +8297,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7937: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8284: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8105: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8300: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7941: \$? = $ac_status" >&5
-+ echo "$as_me:8288: \$? = $ac_status" >&5
+- echo "$as_me:8109: \$? = $ac_status" >&5
++ echo "$as_me:8304: \$? = $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.
@@ -4475,7 +5529,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -7981,13 +8328,13 @@
+@@ -8149,13 +8344,13 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -4492,7 +5546,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -7997,20 +8344,20 @@
+@@ -8165,20 +8360,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -4519,7 +5573,7 @@
:
else
lt_prog_compiler_static=
-@@ -8027,7 +8374,7 @@
+@@ -8195,7 +8390,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -4528,21 +5582,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -8038,11 +8385,11 @@
+@@ -8206,11 +8401,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:8041: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8209: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8404: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8045: \$? = $ac_status" >&5
-+ echo "$as_me:8392: \$? = $ac_status" >&5
+- echo "$as_me:8213: \$? = $ac_status" >&5
++ echo "$as_me:8408: \$? = $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
-@@ -8122,12 +8469,13 @@
+@@ -8290,12 +8485,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -4557,7 +5611,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -8186,7 +8534,7 @@
+@@ -8354,7 +8550,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -4566,7 +5620,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -8234,7 +8582,7 @@
+@@ -8402,7 +8598,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -4575,7 +5629,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -8252,7 +8600,7 @@
+@@ -8420,7 +8616,7 @@
fi
;;
@@ -4584,7 +5638,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -8267,7 +8615,7 @@
+@@ -8435,7 +8631,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -4593,7 +5647,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8285,13 +8633,22 @@
+@@ -8453,13 +8649,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -4618,7 +5672,7 @@
fi
link_all_deplibs=no
else
-@@ -8397,7 +8754,7 @@
+@@ -8565,7 +8770,7 @@
fi
;;
@@ -4627,7 +5681,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -8417,7 +8774,7 @@
+@@ -8585,7 +8790,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -4636,7 +5690,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -8451,7 +8808,7 @@
+@@ -8619,7 +8824,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -4645,12 +5699,40 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -8525,11 +8882,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
+@@ -8687,33 +8892,24 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -4668,12 +5750,49 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8584,11 +8948,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
+@@ -8721,7 +8917,7 @@
+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++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
+
+@@ -8762,33 +8958,24 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -4691,7 +5810,16 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8642,7 +9013,7 @@
+@@ -8796,7 +8983,7 @@
+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++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
+
+@@ -8842,7 +9029,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -4700,7 +5828,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -8675,19 +9046,18 @@
+@@ -8875,19 +9062,18 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -4726,7 +5854,7 @@
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -8849,24 +9219,28 @@
+@@ -9049,24 +9235,28 @@
;;
openbsd*)
@@ -4772,7 +5900,7 @@
fi
;;
-@@ -8925,17 +9299,16 @@
+@@ -9125,17 +9315,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -4799,7 +5927,7 @@
esac
link_all_deplibs=yes
;;
-@@ -8992,7 +9365,7 @@
+@@ -9192,7 +9381,7 @@
fi
;;
@@ -4808,7 +5936,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -9069,7 +9442,7 @@
+@@ -9269,7 +9458,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -4817,7 +5945,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -9127,17 +9500,55 @@
+@@ -9327,17 +9516,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4877,7 +6005,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -9158,7 +9569,7 @@
+@@ -9358,7 +9585,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -4886,7 +6014,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9297,12 +9708,8 @@
+@@ -9497,12 +9724,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -4901,7 +6029,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -9356,7 +9763,7 @@
+@@ -9556,7 +9779,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -4910,7 +6038,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -9419,7 +9826,7 @@
+@@ -9619,7 +9842,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -4919,7 +6047,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9490,7 +9897,7 @@
+@@ -9690,7 +9913,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -4928,7 +6056,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -9596,6 +10003,10 @@
+@@ -9796,6 +10019,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -4939,7 +6067,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -9692,6 +10103,21 @@
+@@ -9892,6 +10119,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -4961,7 +6089,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -9749,6 +10175,7 @@
+@@ -9949,6 +10191,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -4969,7 +6097,132 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -10010,7 +10437,7 @@
+@@ -10032,27 +10275,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlopen=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -10061,7 +10288,7 @@
+ ac_cv_lib_dl_dlopen=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -10143,27 +10370,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_shl_load=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -10172,7 +10383,7 @@
+ ac_cv_func_shl_load=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+@@ -10222,27 +10433,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_shl_load=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -10251,14 +10446,14 @@
+ ac_cv_lib_dld_shl_load=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
@@ -4978,7 +6231,174 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -10286,7 +10713,7 @@
+@@ -10323,27 +10518,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_dlopen=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -10352,7 +10531,7 @@
+ ac_cv_func_dlopen=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+@@ -10402,27 +10581,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dl_dlopen=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -10431,7 +10594,7 @@
+ ac_cv_lib_dl_dlopen=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -10482,27 +10645,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_svld_dlopen=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -10511,7 +10658,7 @@
+ ac_cv_lib_svld_dlopen=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -10562,27 +10709,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_dld_dld_link=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -10591,14 +10722,14 @@
+ ac_cv_lib_dld_dld_link=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
@@ -4987,25 +6407,25 @@
fi
-@@ -10335,7 +10762,7 @@
+@@ -10647,7 +10778,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10338 "configure"
-+#line 10765 "configure"
+-#line 10650 "configure"
++#line 10781 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10435,7 +10862,7 @@
+@@ -10747,7 +10878,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10438 "configure"
-+#line 10865 "configure"
+-#line 10750 "configure"
++#line 10881 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10562,7 +10989,7 @@
+@@ -10874,7 +11005,7 @@
fi
;;
@@ -5014,7 +6434,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -10618,6 +11045,7 @@
+@@ -10930,6 +11061,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -5022,7 +6442,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -10633,6 +11061,7 @@
+@@ -10945,6 +11077,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -5030,7 +6450,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -10677,7 +11106,7 @@
+@@ -10989,7 +11122,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -5039,7 +6459,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -10913,6 +11342,10 @@
+@@ -11225,6 +11358,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -5050,7 +6470,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -11001,7 +11434,7 @@
+@@ -11313,7 +11450,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -5059,7 +6479,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -11161,6 +11594,7 @@
+@@ -11473,6 +11610,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -5067,7 +6487,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -11170,10 +11604,10 @@
+@@ -11482,10 +11620,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -5080,7 +6500,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -11189,16 +11623,16 @@
+@@ -11501,16 +11639,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -5100,7 +6520,7 @@
# Allow CC to be a program name with arguments.
-@@ -11405,7 +11839,7 @@
+@@ -11717,7 +11855,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -5109,7 +6529,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -11418,7 +11852,7 @@
+@@ -11730,7 +11868,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -5118,7 +6538,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -11454,7 +11888,7 @@
+@@ -11766,7 +11904,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -5127,12 +6547,40 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -11528,11 +11962,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
+@@ -11834,33 +11972,24 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
++ (exit $ac_status); } && {
++ test -z "$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -5150,12 +6598,49 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11588,11 +12029,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
+@@ -11868,7 +11997,7 @@
+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++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
+
+@@ -11910,33 +12039,24 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
++ (exit $ac_status); } && {
++ test -z "$ac_cxx_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -5173,7 +6658,16 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11662,59 +12110,31 @@
+@@ -11944,7 +12064,7 @@
+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++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
+
+@@ -12006,59 +12126,31 @@
fi
;;
darwin* | rhapsody*)
@@ -5244,7 +6738,7 @@
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -11797,9 +12217,7 @@
+@@ -12141,9 +12233,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -5255,7 +6749,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -11867,7 +12285,7 @@
+@@ -12211,7 +12301,7 @@
;;
esac
;;
@@ -5264,7 +6758,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -11959,7 +12377,7 @@
+@@ -12303,7 +12393,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -5273,7 +6767,7 @@
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -11987,6 +12405,29 @@
+@@ -12331,6 +12421,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -5303,7 +6797,7 @@
esac
;;
lynxos*)
-@@ -12025,16 +12466,20 @@
+@@ -12369,16 +12482,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -5333,7 +6827,7 @@
;;
osf3*)
case $cc_basename in
-@@ -12196,15 +12641,10 @@
+@@ -12540,15 +12657,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -5352,7 +6846,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -12251,6 +12691,12 @@
+@@ -12595,6 +12707,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -5365,7 +6859,7 @@
fi
;;
esac
-@@ -12338,7 +12784,6 @@
+@@ -12682,7 +12800,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -5373,7 +6867,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -12440,9 +12885,14 @@
+@@ -12784,9 +12901,14 @@
$rm -f confest.$objext
@@ -5389,7 +6883,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -12450,19 +12900,51 @@
+@@ -12794,19 +12916,51 @@
postdeps_CXX=
;;
@@ -5443,7 +6937,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -12493,12 +12975,14 @@
+@@ -12837,12 +12991,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -5460,7 +6954,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -12510,7 +12994,7 @@
+@@ -12854,7 +13010,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -5469,7 +6963,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -12536,7 +13020,7 @@
+@@ -12880,7 +13036,7 @@
esac
else
case $host_os in
@@ -5478,7 +6972,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -12632,7 +13116,7 @@
+@@ -12976,7 +13132,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -5487,7 +6981,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -12646,6 +13130,14 @@
+@@ -12990,6 +13146,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -5502,7 +6996,7 @@
;;
esac
;;
-@@ -12755,12 +13247,12 @@
+@@ -13099,12 +13263,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
@@ -5518,17 +7012,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -12771,27 +13263,27 @@
+@@ -13115,27 +13279,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12774: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13266: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13118: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13282: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:12778: \$? = $ac_status" >&5
-+ echo "$as_me:13270: \$? = $ac_status" >&5
+- echo "$as_me:13122: \$? = $ac_status" >&5
++ echo "$as_me:13286: \$? = $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.
@@ -5552,7 +7046,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -12818,13 +13310,13 @@
+@@ -13162,13 +13326,13 @@
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -5569,7 +7063,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -12834,20 +13326,20 @@
+@@ -13178,20 +13342,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -5596,7 +7090,7 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -12864,7 +13356,7 @@
+@@ -13208,7 +13372,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -5605,21 +7099,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -12875,11 +13367,11 @@
+@@ -13219,11 +13383,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:12878: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13370: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13222: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13386: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:12882: \$? = $ac_status" >&5
-+ echo "$as_me:13374: \$? = $ac_status" >&5
+- echo "$as_me:13226: \$? = $ac_status" >&5
++ echo "$as_me:13390: \$? = $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
-@@ -12932,7 +13424,7 @@
+@@ -13276,7 +13440,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -5628,7 +7122,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -12945,7 +13437,7 @@
+@@ -13289,7 +13453,7 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -5637,7 +7131,7 @@
;;
linux* | k*bsd*-gnu)
link_all_deplibs_CXX=no
-@@ -12954,6 +13446,7 @@
+@@ -13298,6 +13462,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
@@ -5645,7 +7139,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -12979,7 +13472,7 @@
+@@ -13323,7 +13488,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -5654,7 +7148,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -13037,20 +13530,7 @@
+@@ -13381,20 +13546,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5676,7 +7170,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13068,7 +13548,7 @@
+@@ -13412,7 +13564,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -5685,7 +7179,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13207,12 +13687,7 @@
+@@ -13551,12 +13703,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -5699,7 +7193,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -13266,7 +13741,7 @@
+@@ -13610,7 +13757,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -5708,7 +7202,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -13329,7 +13804,7 @@
+@@ -13673,7 +13820,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -5717,7 +7211,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13400,7 +13875,7 @@
+@@ -13744,7 +13891,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -5726,7 +7220,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -13506,6 +13981,10 @@
+@@ -13850,6 +13997,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -5737,7 +7231,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -13602,6 +14081,21 @@
+@@ -13946,6 +14097,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -5759,7 +7253,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -13685,6 +14179,7 @@
+@@ -14029,6 +14195,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -5767,7 +7261,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -13700,6 +14195,7 @@
+@@ -14044,6 +14211,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -5775,7 +7269,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -13932,6 +14428,10 @@
+@@ -14276,6 +14444,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -5786,7 +7280,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -14020,7 +14520,7 @@
+@@ -14364,7 +14536,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -5795,7 +7289,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -14111,10 +14611,17 @@
+@@ -14455,10 +14627,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -5815,7 +7309,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -14130,16 +14637,16 @@
+@@ -14474,16 +14653,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -5835,7 +7329,7 @@
# Allow CC to be a program name with arguments.
-@@ -14177,7 +14684,7 @@
+@@ -14521,7 +14700,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -5844,7 +7338,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -14223,13 +14730,15 @@
+@@ -14567,13 +14746,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -5862,7 +7356,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -14239,7 +14748,7 @@
+@@ -14583,7 +14764,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -5871,7 +7365,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -14297,7 +14806,7 @@
+@@ -14641,7 +14822,7 @@
esac
;;
@@ -5880,7 +7374,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -14349,6 +14858,22 @@
+@@ -14693,6 +14874,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -5903,7 +7397,7 @@
esac
;;
-@@ -14358,6 +14883,10 @@
+@@ -14702,6 +14899,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -5914,7 +7408,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -14420,12 +14949,12 @@
+@@ -14764,12 +14965,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
@@ -5930,17 +7424,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -14436,27 +14965,27 @@
+@@ -14780,27 +14981,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14439: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14968: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14783: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14984: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14443: \$? = $ac_status" >&5
-+ echo "$as_me:14972: \$? = $ac_status" >&5
+- echo "$as_me:14787: \$? = $ac_status" >&5
++ echo "$as_me:14988: \$? = $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.
@@ -5964,7 +7458,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -14483,13 +15012,13 @@
+@@ -14827,13 +15028,13 @@
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -5981,7 +7475,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -14499,20 +15028,20 @@
+@@ -14843,20 +15044,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -6008,7 +7502,7 @@
:
else
lt_prog_compiler_static_F77=
-@@ -14529,7 +15058,7 @@
+@@ -14873,7 +15074,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -6017,21 +7511,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14540,11 +15069,11 @@
+@@ -14884,11 +15085,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:14543: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15072: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14887: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15088: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14547: \$? = $ac_status" >&5
-+ echo "$as_me:15076: \$? = $ac_status" >&5
+- echo "$as_me:14891: \$? = $ac_status" >&5
++ echo "$as_me:15092: \$? = $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
-@@ -14624,12 +15153,13 @@
+@@ -14968,12 +15169,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -6046,7 +7540,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -14688,7 +15218,7 @@
+@@ -15032,7 +15234,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -6055,7 +7549,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -14736,7 +15266,7 @@
+@@ -15080,7 +15282,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -6064,7 +7558,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -14754,7 +15284,7 @@
+@@ -15098,7 +15300,7 @@
fi
;;
@@ -6073,7 +7567,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -14769,7 +15299,7 @@
+@@ -15113,7 +15315,7 @@
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -6082,7 +7576,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -14787,13 +15317,22 @@
+@@ -15131,13 +15333,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -6107,7 +7601,7 @@
fi
link_all_deplibs_F77=no
else
-@@ -14899,7 +15438,7 @@
+@@ -15243,7 +15454,7 @@
fi
;;
@@ -6116,7 +7610,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -14919,7 +15458,7 @@
+@@ -15263,7 +15474,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -6125,7 +7619,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -14953,7 +15492,7 @@
+@@ -15297,7 +15508,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -6134,12 +7628,40 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -15017,11 +15556,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
+@@ -15355,33 +15566,24 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
++ (exit $ac_status); } && {
++ test -z "$ac_f77_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -6157,12 +7679,49 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15066,11 +15612,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
+@@ -15389,7 +15591,7 @@
+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++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
+
+@@ -15420,33 +15622,24 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
++ (exit $ac_status); } && {
++ test -z "$ac_f77_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -6180,7 +7739,16 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15124,7 +15677,7 @@
+@@ -15454,7 +15647,7 @@
+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++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
+
+@@ -15500,7 +15693,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -6189,7 +7757,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -15157,19 +15710,18 @@
+@@ -15533,19 +15726,18 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -6215,7 +7783,7 @@
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -15331,24 +15883,28 @@
+@@ -15707,24 +15899,28 @@
;;
openbsd*)
@@ -6261,7 +7829,7 @@
fi
;;
-@@ -15407,17 +15963,16 @@
+@@ -15783,17 +15979,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -6288,7 +7856,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -15474,7 +16029,7 @@
+@@ -15850,7 +16045,7 @@
fi
;;
@@ -6297,7 +7865,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -15551,7 +16106,7 @@
+@@ -15927,7 +16122,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -6306,7 +7874,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -15609,20 +16164,7 @@
+@@ -15985,20 +16180,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6328,7 +7896,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -15640,7 +16182,7 @@
+@@ -16016,7 +16198,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -6337,7 +7905,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15779,12 +16321,7 @@
+@@ -16155,12 +16337,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -6351,7 +7919,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -15838,7 +16375,7 @@
+@@ -16214,7 +16391,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -6360,7 +7928,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -15901,7 +16438,7 @@
+@@ -16277,7 +16454,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -6369,7 +7937,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15972,7 +16509,7 @@
+@@ -16348,7 +16525,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -6378,7 +7946,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -16078,6 +16615,10 @@
+@@ -16454,6 +16631,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -6389,7 +7957,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -16174,6 +16715,21 @@
+@@ -16550,6 +16731,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -6411,7 +7979,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -16257,6 +16813,7 @@
+@@ -16633,6 +16829,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -6419,7 +7987,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -16272,6 +16829,7 @@
+@@ -16648,6 +16845,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -6427,7 +7995,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -16504,6 +17062,10 @@
+@@ -16880,6 +17078,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -6438,7 +8006,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -16592,7 +17154,7 @@
+@@ -16968,7 +17170,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -6447,7 +8015,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -16650,10 +17212,10 @@
+@@ -17026,10 +17228,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -6460,7 +8028,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -16669,16 +17231,16 @@
+@@ -17045,16 +17247,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -6480,7 +8048,7 @@
# Allow CC to be a program name with arguments.
-@@ -16716,7 +17278,7 @@
+@@ -17092,7 +17294,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -6489,21 +8057,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16727,11 +17289,11 @@
+@@ -17103,11 +17305,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:16730: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17292: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17106: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17308: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16734: \$? = $ac_status" >&5
-+ echo "$as_me:17296: \$? = $ac_status" >&5
+- echo "$as_me:17110: \$? = $ac_status" >&5
++ echo "$as_me:17312: \$? = $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.
-@@ -16782,14 +17344,16 @@
+@@ -17158,14 +17360,16 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -6523,7 +8091,7 @@
;;
darwin* | rhapsody*)
-@@ -16798,7 +17362,7 @@
+@@ -17174,7 +17378,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -6532,7 +8100,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -16856,10 +17420,10 @@
+@@ -17232,10 +17436,10 @@
esac
;;
@@ -6545,7 +8113,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -16908,6 +17472,22 @@
+@@ -17284,6 +17488,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -6568,7 +8136,7 @@
esac
;;
-@@ -16917,6 +17497,10 @@
+@@ -17293,6 +17513,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -6579,7 +8147,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -16979,12 +17563,12 @@
+@@ -17355,12 +17579,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
@@ -6595,17 +8163,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16995,27 +17579,27 @@
+@@ -17371,27 +17595,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16998: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17582: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17374: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17598: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17002: \$? = $ac_status" >&5
-+ echo "$as_me:17586: \$? = $ac_status" >&5
+- echo "$as_me:17378: \$? = $ac_status" >&5
++ echo "$as_me:17602: \$? = $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.
@@ -6629,7 +8197,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -17042,13 +17626,13 @@
+@@ -17418,13 +17642,13 @@
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -6646,7 +8214,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -17058,20 +17642,20 @@
+@@ -17434,20 +17658,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -6673,7 +8241,7 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -17088,7 +17672,7 @@
+@@ -17464,7 +17688,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -6682,21 +8250,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -17099,11 +17683,11 @@
+@@ -17475,11 +17699,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:17102: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17686: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17478: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17702: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17106: \$? = $ac_status" >&5
-+ echo "$as_me:17690: \$? = $ac_status" >&5
+- echo "$as_me:17482: \$? = $ac_status" >&5
++ echo "$as_me:17706: \$? = $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
-@@ -17183,12 +17767,13 @@
+@@ -17559,12 +17783,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -6711,7 +8279,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -17247,7 +17832,7 @@
+@@ -17623,7 +17848,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -6720,7 +8288,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -17295,7 +17880,7 @@
+@@ -17671,7 +17896,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -6729,7 +8297,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -17313,7 +17898,7 @@
+@@ -17689,7 +17914,7 @@
fi
;;
@@ -6738,7 +8306,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -17328,7 +17913,7 @@
+@@ -17704,7 +17929,7 @@
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -6747,7 +8315,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -17346,13 +17931,22 @@
+@@ -17722,13 +17947,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -6772,7 +8340,7 @@
fi
link_all_deplibs_GCJ=no
else
-@@ -17458,7 +18052,7 @@
+@@ -17834,7 +18068,7 @@
fi
;;
@@ -6781,7 +8349,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -17478,7 +18072,7 @@
+@@ -17854,7 +18088,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -6790,7 +8358,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -17512,7 +18106,7 @@
+@@ -17888,7 +18122,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -6799,12 +8367,40 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -17586,11 +18180,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
+@@ -17956,33 +18190,24 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -6822,12 +8418,49 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17645,11 +18246,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
+@@ -17990,7 +18215,7 @@
+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++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
+
+@@ -18031,33 +18256,24 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-}'`
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++
+lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
@@ -6845,7 +8478,16 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17703,7 +18311,7 @@
+@@ -18065,7 +18281,7 @@
+
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++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
+
+@@ -18111,7 +18327,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -6854,7 +8496,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -17736,19 +18344,18 @@
+@@ -18144,19 +18360,18 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -6880,7 +8522,7 @@
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -17910,24 +18517,28 @@
+@@ -18318,24 +18533,28 @@
;;
openbsd*)
@@ -6926,7 +8568,7 @@
fi
;;
-@@ -17986,17 +18597,16 @@
+@@ -18394,17 +18613,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -6953,7 +8595,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -18053,7 +18663,7 @@
+@@ -18461,7 +18679,7 @@
fi
;;
@@ -6962,7 +8604,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -18130,7 +18740,7 @@
+@@ -18538,7 +18756,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -6971,7 +8613,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -18188,20 +18798,7 @@
+@@ -18596,20 +18814,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6993,7 +8635,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -18219,7 +18816,7 @@
+@@ -18627,7 +18832,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -7002,7 +8644,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18358,12 +18955,7 @@
+@@ -18766,12 +18971,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -7016,7 +8658,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -18417,7 +19009,7 @@
+@@ -18825,7 +19025,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -7025,7 +8667,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -18480,7 +19072,7 @@
+@@ -18888,7 +19088,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -7034,7 +8676,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18551,7 +19143,7 @@
+@@ -18959,7 +19159,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -7043,7 +8685,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -18657,6 +19249,10 @@
+@@ -19065,6 +19265,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -7054,7 +8696,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -18753,6 +19349,21 @@
+@@ -19161,6 +19365,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -7076,7 +8718,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -18836,6 +19447,7 @@
+@@ -19244,6 +19463,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -7084,7 +8726,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -18851,6 +19463,7 @@
+@@ -19259,6 +19479,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -7092,7 +8734,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -19083,6 +19696,10 @@
+@@ -19491,6 +19712,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -7103,7 +8745,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -19171,7 +19788,7 @@
+@@ -19579,7 +19804,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -7112,7 +8754,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -19228,7 +19845,7 @@
+@@ -19636,7 +19861,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -7121,7 +8763,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -19247,16 +19864,16 @@
+@@ -19655,16 +19880,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -7141,7 +8783,7 @@
# Allow CC to be a program name with arguments.
-@@ -19316,6 +19933,7 @@
+@@ -19724,6 +19949,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -7149,7 +8791,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -19331,6 +19949,7 @@
+@@ -19739,6 +19965,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -7157,7 +8799,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -19563,6 +20182,10 @@
+@@ -19971,6 +20198,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -7168,7 +8810,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -19651,7 +20274,7 @@
+@@ -20059,7 +20290,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -7177,7 +8819,88 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -20373,7 +20996,7 @@
+@@ -20324,7 +20555,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -20467,27 +20698,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -20523,17 +20737,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -20616,7 +20823,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -20659,7 +20866,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -20805,7 +21012,7 @@
and GDESKLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -7186,7 +8909,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -20383,7 +21006,7 @@
+@@ -20815,7 +21022,7 @@
and GDESKLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -7195,7 +8918,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20497,7 +21120,7 @@
+@@ -20929,7 +21136,7 @@
and UTILS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -7204,7 +8927,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -20507,7 +21130,7 @@
+@@ -20939,7 +21146,7 @@
and UTILS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -7213,7 +8936,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20611,7 +21234,7 @@
+@@ -21043,7 +21250,7 @@
and GLIBTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -7222,7 +8945,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -20621,7 +21244,7 @@
+@@ -21053,7 +21260,7 @@
and GLIBTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -7231,7 +8954,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20725,7 +21348,7 @@
+@@ -21157,7 +21364,7 @@
and SVG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -7240,7 +8963,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -20735,7 +21358,7 @@
+@@ -21167,7 +21374,7 @@
and SVG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -7249,8 +8972,8 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20839,7 +21462,7 @@
- and TILING_LIBS to avoid the need to call pkg-config.
+@@ -21271,7 +21478,7 @@
+ and SYSTRAY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -7258,8 +8981,8 @@
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
-@@ -20849,7 +21472,7 @@
- and TILING_LIBS to avoid the need to call pkg-config.
+@@ -21281,7 +21488,7 @@
+ and SYSTRAY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -7267,8 +8990,8 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20953,7 +21576,7 @@
- and X11_LIBS to avoid the need to call pkg-config.
+@@ -21385,7 +21592,7 @@
+ and TILING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -7276,8 +8999,8 @@
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
-@@ -20963,7 +21586,7 @@
- and X11_LIBS to avoid the need to call pkg-config.
+@@ -21395,7 +21602,7 @@
+ and TILING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -7285,8 +9008,8 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21067,7 +21690,7 @@
- and SHARED_MIME_INFO_LIBS to avoid the need to call pkg-config.
+@@ -21499,7 +21706,7 @@
+ and TILINGIMAGE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -7294,8 +9017,8 @@
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
-@@ -21077,7 +21700,7 @@
- and SHARED_MIME_INFO_LIBS to avoid the need to call pkg-config.
+@@ -21509,7 +21716,7 @@
+ and TILINGIMAGE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
@@ -7303,27 +9026,859 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21378,7 +22001,7 @@
-
- fi
- fi
-- USE_NLS=yes
-+ USE_NLS=yes
-
-
- gt_cv_have_gettext=no
-@@ -22349,8 +22972,8 @@
- "Content-Transfer-Encoding: 8bit\n"
-
- _ACEOF
--if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
-- (msgfmt -c -o /dev/null conftest.foo) 2>&5
+@@ -21613,7 +21820,7 @@
+ and X11_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++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
+@@ -21623,7 +21830,7 @@
+ and X11_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -21727,7 +21934,7 @@
+ and SHARED_MIME_INFO_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++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
+@@ -21737,7 +21944,7 @@
+ and SHARED_MIME_INFO_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -21765,7 +21972,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_UPDATE_MIME_DATABASE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -21805,7 +22012,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_UPDATE_DESKTOP_DATABASE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -21877,27 +22084,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -21933,17 +22123,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22033,30 +22216,14 @@
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ am_cv_val_LC_MESSAGES=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22065,7 +22232,7 @@
+ am_cv_val_LC_MESSAGES=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+@@ -22121,27 +22288,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22177,17 +22327,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++ (exit $ac_status); } >/dev/null && {
++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ }; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22278,27 +22421,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ gt_cv_func_ngettext_libc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22307,7 +22434,7 @@
+ gt_cv_func_ngettext_libc=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+@@ -22350,27 +22477,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ gt_cv_func_dgettext_libc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22379,7 +22490,7 @@
+ gt_cv_func_dgettext_libc=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+@@ -22455,27 +22566,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22484,7 +22579,7 @@
+ eval "$as_ac_var=no"
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -22549,27 +22644,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_bindtextdomain=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22578,7 +22657,7 @@
+ ac_cv_lib_intl_bindtextdomain=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -22627,27 +22706,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_ngettext=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22656,7 +22719,7 @@
+ ac_cv_lib_intl_ngettext=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -22705,27 +22768,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_dgettext=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22734,7 +22781,7 @@
+ ac_cv_lib_intl_dgettext=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -22796,27 +22843,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_ngettext=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22825,7 +22856,7 @@
+ ac_cv_lib_intl_ngettext=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -22874,27 +22905,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_intl_dcgettext=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -22903,7 +22918,7 @@
+ ac_cv_lib_intl_dcgettext=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+@@ -22998,27 +23013,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -23027,7 +23026,7 @@
+ eval "$as_ac_var=no"
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -23174,27 +23173,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -23203,7 +23186,7 @@
+ eval "$as_ac_var=no"
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -23217,6 +23200,35 @@
+ fi
+ done
+
++ MSGFMT_OPTS=
++ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
++echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
++ cat >conftest.foo <<_ACEOF
++
++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"
++
++_ACEOF
+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
- ac_status=$?
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++echo "$as_me: failed input was:" >&5
++sed 's/^/| /' conftest.foo >&5
++fi
++
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -23235,7 +23247,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ 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"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -23323,27 +23335,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -23200,6 +23823,7 @@
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ else
+@@ -23415,27 +23411,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_bind_textdomain_codeset=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -23444,7 +23424,7 @@
+ ac_cv_func_bind_textdomain_codeset=no
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+@@ -23465,7 +23445,7 @@
+ esac
+ fi
+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$glib_save_LIBS"
+ INSTOBJEXT=.mo
+@@ -23747,7 +23727,8 @@
+ ## M4sh Initialization. ##
+ ## --------------------- ##
+
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+@@ -23756,10 +23737,13 @@
+ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
+ else
+- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++ case `(set -o) 2>/dev/null` in
++ *posix*) set -o posix ;;
++esac
++
+ fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
++
++
+
+
+ # PATH needs CR
+@@ -23983,19 +23967,28 @@
+ as_mkdir_p=false
+ fi
+
+-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
+-# systems may use methods other than mode bits to determine executability.
+-cat >conf$$.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conf$$.file
+-if test -x conf$$.file >/dev/null 2>&1; then
+- as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++ as_test_x='test -x'
+ else
+- as_executable_p=:
++ if ls -dL / >/dev/null 2>&1; then
++ as_ls_L_option=L
++ else
++ as_ls_L_option=
++ fi
++ as_test_x='
++ eval sh -c '\''
++ if test -d "$1"; then
++ test -d "$1/.";
++ else
++ case $1 in
++ -*)set "./$1";;
++ esac;
++ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++ ???[sx]*):;;*)false;;esac;fi
++ '\'' sh
++ '
+ fi
+-rm -f conf$$.file
++as_executable_p=$as_test_x
+
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -24011,7 +24004,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.60. Invocation command line was
++generated by GNU Autoconf 2.61. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -24040,7 +24033,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+- -V, --version print version number, then exit
++ -V, --version print version number and configuration settings, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+@@ -24064,7 +24057,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.61,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+
+ Copyright (C) 2006 Free Software Foundation, Inc.
+@@ -24074,6 +24067,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
@@ -7331,7 +9886,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -23295,9 +23919,7 @@
+@@ -24169,9 +24163,7 @@
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -7342,7 +9897,7 @@
_ACEOF
-@@ -23480,6 +24102,7 @@
+@@ -24338,6 +24330,7 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -7350,19 +9905,25 @@
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
-@@ -23536,7 +24159,6 @@
- INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
- INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
- INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
--INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
+@@ -24394,7 +24387,6 @@
+ INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
+ INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
+ INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
+-INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -23578,15 +24200,16 @@
+@@ -24436,6 +24428,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
++INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
+ INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
+ INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
+ INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
+@@ -24443,15 +24436,16 @@
+ INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
+ INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
@@ -7377,9 +9938,11 @@
-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
- DATADIRNAME!$DATADIRNAME$ac_delim
++DATADIRNAME!$DATADIRNAME$ac_delim
build!$build$ac_delim
-@@ -23597,10 +24220,13 @@
+ build_cpu!$build_cpu$ac_delim
+ build_vendor!$build_vendor$ac_delim
+@@ -24460,10 +24454,13 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -7390,30 +9953,33 @@
RANLIB!$RANLIB$ac_delim
+DSYMUTIL!$DSYMUTIL$ac_delim
+NMEDIT!$NMEDIT$ac_delim
- CXX!$CXX$ac_delim
- CXXFLAGS!$CXXFLAGS$ac_delim
- ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -23641,10 +24267,8 @@
+ CXXCPP!$CXXCPP$ac_delim
+ F77!$F77$ac_delim
+ FFLAGS!$FFLAGS$ac_delim
+@@ -24502,12 +24499,10 @@
UPDATE_DESKTOP_DATABASE!$UPDATE_DESKTOP_DATABASE$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
- MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
++MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
CATALOGS!$CATALOGS$ac_delim
CATOBJEXT!$CATOBJEXT$ac_delim
+-DATADIRNAME!$DATADIRNAME$ac_delim
GMOFILES!$GMOFILES$ac_delim
-@@ -23662,7 +24286,7 @@
+ INSTOBJEXT!$INSTOBJEXT$ac_delim
+ INTLLIBS!$INTLLIBS$ac_delim
+@@ -24523,7 +24518,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -23889,6 +24513,11 @@
+@@ -24750,6 +24745,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
@@ -7425,7 +9991,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -23942,6 +24571,7 @@
+@@ -24803,6 +24803,7 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
@@ -7433,7 +9999,7 @@
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-@@ -24057,21 +24687,22 @@
+@@ -24918,21 +24919,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -7463,7 +10029,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -24106,8 +24737,9 @@
+@@ -24967,8 +24969,9 @@
# 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.
@@ -7475,7 +10041,7 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -24226,10 +24858,6 @@
+@@ -25087,10 +25090,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
@@ -7486,9 +10052,265 @@
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
-diff -urN gdesklets-0.36.orig/Controls/ArrayBuffer/Makefile.in gdesklets-0.36/Controls/ArrayBuffer/Makefile.in
---- gdesklets-0.36.orig/Controls/ArrayBuffer/Makefile.in 2008-02-17 01:45:39.000000000 +0800
-+++ gdesklets-0.36/Controls/ArrayBuffer/Makefile.in 2008-03-01 01:27:30.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Controls/ArrayBuffer/Makefile.in gdesklets-0.35.4/Controls/ArrayBuffer/Makefile.in
+--- gdesklets-0.35.4.orig/Controls/ArrayBuffer/Makefile.in 2006-10-05 20:04:32.000000000 +0800
++++ gdesklets-0.35.4/Controls/ArrayBuffer/Makefile.in 2008-02-18 20:50:55.000000000 +0800
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+
+ @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,8 +55,6 @@
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -82,6 +76,7 @@
+ DATADIRNAME = @DATADIRNAME@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -98,6 +93,7 @@
+ GMOFILES = @GMOFILES@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -108,14 +104,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -127,7 +121,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
+@@ -137,11 +130,13 @@
+ LN_S = @LN_S@
+ 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@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -163,6 +158,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
+ SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
+@@ -185,13 +181,13 @@
+ X11_CFLAGS = @X11_CFLAGS@
+ X11_LIBS = @X11_LIBS@
+ XGETTEXT = @XGETTEXT@
++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@
+@@ -203,6 +199,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ coredir = @coredir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+@@ -236,8 +233,11 @@
+ pythondir = @pythondir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ installdir = ${coredir}/Controls/ArrayBuffer
+ install_DATA = \
+ __init__.py \
+@@ -283,13 +283,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-installDATA: $(install_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
++ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
+ @list='$(install_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -312,22 +308,21 @@
+
+
+ distdir: $(DISTFILES)
+- @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; \
++ @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 \
+ 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; \
+@@ -343,7 +338,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(installdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -376,7 +371,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+
+ dvi: dvi-am
+
+@@ -390,12 +385,20 @@
+
+ install-data-am: install-installDATA
+
++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
+@@ -414,17 +417,21 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-installDATA
++uninstall-am: uninstall-installDATA
++
++.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
++ uninstall uninstall-am uninstall-installDATA
+
+ # 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.
+diff -urN gdesklets-0.35.4.orig/Controls/Calendar/Makefile.in gdesklets-0.35.4/Controls/Calendar/Makefile.in
+--- gdesklets-0.35.4.orig/Controls/Calendar/Makefile.in 2006-10-05 20:04:32.000000000 +0800
++++ gdesklets-0.35.4/Controls/Calendar/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7565,7 +10387,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -7575,13 +10397,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -7589,7 +10411,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -7607,7 +10429,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -7615,7 +10437,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -7624,10 +10446,10 @@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Controls/ArrayBuffer
+ installdir = ${coredir}/Controls/Calendar
install_DATA = \
__init__.py \
-@@ -284,13 +283,9 @@
+@@ -287,13 +287,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -7642,7 +10464,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -318,7 +313,7 @@
+@@ -321,7 +317,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -7651,7 +10473,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -341,22 +336,21 @@
+@@ -344,22 +340,21 @@
distdir: $(DISTFILES)
@@ -7687,7 +10509,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -372,7 +366,7 @@
+@@ -375,7 +370,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -7696,7 +10518,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -405,7 +399,7 @@
+@@ -408,7 +403,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -7705,7 +10527,7 @@
dvi: dvi-am
-@@ -419,12 +413,20 @@
+@@ -422,12 +417,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -7726,7 +10548,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -443,20 +445,22 @@
+@@ -446,20 +449,22 @@
ps-am:
@@ -7755,9 +10577,265 @@
# 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.
-diff -urN gdesklets-0.36.orig/Controls/Calendar/Makefile.in gdesklets-0.36/Controls/Calendar/Makefile.in
---- gdesklets-0.36.orig/Controls/Calendar/Makefile.in 2008-02-17 01:45:39.000000000 +0800
-+++ gdesklets-0.36/Controls/Calendar/Makefile.in 2008-03-01 01:27:30.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Controls/EventPipe/Makefile.in gdesklets-0.35.4/Controls/EventPipe/Makefile.in
+--- gdesklets-0.35.4.orig/Controls/EventPipe/Makefile.in 2006-10-05 20:04:32.000000000 +0800
++++ gdesklets-0.35.4/Controls/EventPipe/Makefile.in 2008-02-18 20:50:55.000000000 +0800
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+
+ @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,8 +55,6 @@
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -82,6 +76,7 @@
+ DATADIRNAME = @DATADIRNAME@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -98,6 +93,7 @@
+ GMOFILES = @GMOFILES@
+ GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -108,14 +104,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -127,7 +121,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ LDFLAGS = @LDFLAGS@
+@@ -137,11 +130,13 @@
+ LN_S = @LN_S@
+ 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@
++MSGMERGE = @MSGMERGE@
++NMEDIT = @NMEDIT@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -163,6 +158,7 @@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+ PYTHON_VERSION = @PYTHON_VERSION@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
+ SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
+@@ -185,13 +181,13 @@
+ X11_CFLAGS = @X11_CFLAGS@
+ X11_LIBS = @X11_LIBS@
+ XGETTEXT = @XGETTEXT@
++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@
+@@ -203,6 +199,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ coredir = @coredir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+@@ -236,8 +233,11 @@
+ pythondir = @pythondir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ installdir = ${coredir}/Controls/EventPipe
+ install_DATA = \
+ __init__.py \
+@@ -283,13 +283,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-installDATA: $(install_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
++ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
+ @list='$(install_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -312,22 +308,21 @@
+
+
+ distdir: $(DISTFILES)
+- @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; \
++ @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 \
+ 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; \
+@@ -343,7 +338,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(installdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -376,7 +371,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+
+ dvi: dvi-am
+
+@@ -390,12 +385,20 @@
+
+ install-data-am: install-installDATA
+
++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
+@@ -414,17 +417,21 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-installDATA
++uninstall-am: uninstall-installDATA
++
++.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
++ uninstall uninstall-am uninstall-installDATA
+
+ # 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.
+diff -urN gdesklets-0.35.4.orig/Controls/HDDTemp/Makefile.in gdesklets-0.35.4/Controls/HDDTemp/Makefile.in
+--- gdesklets-0.35.4.orig/Controls/HDDTemp/Makefile.in 2006-10-05 20:04:32.000000000 +0800
++++ gdesklets-0.35.4/Controls/HDDTemp/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -7834,7 +10912,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -7844,13 +10922,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -7858,7 +10936,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -7876,7 +10954,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -7884,7 +10962,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -7893,10 +10971,10 @@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Controls/Calendar
+ installdir = ${coredir}/Controls/HDDTemp
install_DATA = \
- __init__.py \
-@@ -284,13 +283,9 @@
+ __init__.py \
+@@ -288,13 +288,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -7911,7 +10989,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -318,7 +313,7 @@
+@@ -322,7 +318,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -7920,7 +10998,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -341,22 +336,21 @@
+@@ -345,22 +341,21 @@
distdir: $(DISTFILES)
@@ -7956,7 +11034,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -372,7 +366,7 @@
+@@ -376,7 +371,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -7965,7 +11043,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -405,7 +399,7 @@
+@@ -409,7 +404,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -7974,7 +11052,7 @@
dvi: dvi-am
-@@ -419,12 +413,20 @@
+@@ -423,12 +418,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -7995,7 +11073,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -443,20 +445,22 @@
+@@ -447,20 +450,22 @@
ps-am:
@@ -8024,547 +11102,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/Controls/EventPipe/Makefile.in gdesklets-0.36/Controls/EventPipe/Makefile.in
---- gdesklets-0.36.orig/Controls/EventPipe/Makefile.in 2008-02-17 01:45:40.000000000 +0800
-+++ gdesklets-0.36/Controls/EventPipe/Makefile.in 2008-03-01 01:27:30.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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
-@@ -62,8 +58,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -85,6 +79,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -101,6 +96,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -111,14 +107,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -130,7 +124,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -203,6 +198,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Controls/EventPipe
- install_DATA = \
- __init__.py \
-@@ -284,13 +283,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installPYTHON: $(install_PYTHON)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
- if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
- if test -f $$b$$p; then \
-@@ -318,7 +313,7 @@
- done
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -341,22 +336,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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; \
-@@ -372,7 +366,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -405,7 +399,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -419,12 +413,20 @@
-
- install-data-am: install-installDATA install-installPYTHON
-
-+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
-@@ -443,20 +445,22 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA \
-- uninstall-installPYTHON
-+uninstall-am: uninstall-installDATA uninstall-installPYTHON
-+
-+.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-exec install-exec-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-installDATA \
-- install-installPYTHON install-man install-strip installcheck \
-+ install-installPYTHON 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-info-am uninstall-installDATA \
-- uninstall-installPYTHON
-+ uninstall-installDATA uninstall-installPYTHON
-
- # 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.
-diff -urN gdesklets-0.36.orig/Controls/HDDTemp/Makefile.in gdesklets-0.36/Controls/HDDTemp/Makefile.in
---- gdesklets-0.36.orig/Controls/HDDTemp/Makefile.in 2008-02-17 01:45:40.000000000 +0800
-+++ gdesklets-0.36/Controls/HDDTemp/Makefile.in 2008-03-01 01:27:30.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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
-@@ -62,8 +58,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -85,6 +79,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -101,6 +96,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -111,14 +107,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -130,7 +124,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -203,6 +198,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Controls/HDDTemp
- install_DATA = \
- __init__.py \
-@@ -285,13 +284,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installPYTHON: $(install_PYTHON)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
- if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
- if test -f $$b$$p; then \
-@@ -319,7 +314,7 @@
- done
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -342,22 +337,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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 +367,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -406,7 +400,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -420,12 +414,20 @@
-
- install-data-am: install-installDATA install-installPYTHON
-
-+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
-@@ -444,20 +446,22 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA \
-- uninstall-installPYTHON
-+uninstall-am: uninstall-installDATA uninstall-installPYTHON
-+
-+.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-exec install-exec-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-installDATA \
-- install-installPYTHON install-man install-strip installcheck \
-+ install-installPYTHON 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-info-am uninstall-installDATA \
-- uninstall-installPYTHON
-+ uninstall-installDATA uninstall-installPYTHON
-
- # 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.
-diff -urN gdesklets-0.36.orig/Controls/Makefile.in gdesklets-0.36/Controls/Makefile.in
---- gdesklets-0.36.orig/Controls/Makefile.in 2008-02-17 01:45:41.000000000 +0800
-+++ gdesklets-0.36/Controls/Makefile.in 2008-03-01 01:27:30.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Controls/Makefile.in gdesklets-0.35.4/Controls/Makefile.in
+--- gdesklets-0.35.4.orig/Controls/Makefile.in 2006-10-05 20:04:33.000000000 +0800
++++ gdesklets-0.35.4/Controls/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -8665,7 +11205,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,12 +145,13 @@
+@@ -149,11 +145,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -8675,13 +11215,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -176,6 +173,7 @@
+@@ -175,6 +173,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -8689,7 +11229,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -194,13 +192,13 @@
+@@ -197,13 +196,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -8707,7 +11247,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -212,6 +210,7 @@
+@@ -215,6 +214,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -8715,7 +11255,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -245,8 +244,11 @@
+@@ -248,8 +248,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -8727,7 +11267,7 @@
SUBDIRS = ArrayBuffer \
EventPipe \
Sensor \
-@@ -301,13 +303,9 @@
+@@ -304,13 +307,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -8742,7 +11282,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -335,7 +333,7 @@
+@@ -338,7 +337,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -8751,7 +11291,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -382,8 +380,7 @@
+@@ -385,8 +384,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -8761,7 +11301,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -427,8 +424,8 @@
+@@ -430,8 +428,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -8772,7 +11312,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -453,8 +450,8 @@
+@@ -456,8 +454,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -8783,7 +11323,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -464,13 +461,12 @@
+@@ -467,13 +465,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -8799,7 +11339,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -484,22 +480,21 @@
+@@ -487,22 +484,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -8835,7 +11375,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -513,7 +508,7 @@
+@@ -516,7 +512,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -8844,7 +11384,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -521,6 +516,8 @@
+@@ -524,6 +520,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -8853,7 +11393,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -531,7 +528,7 @@
+@@ -534,7 +532,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -8862,7 +11402,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -564,8 +561,7 @@
+@@ -567,8 +565,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -8872,7 +11412,7 @@
dvi: dvi-recursive
-@@ -579,12 +575,20 @@
+@@ -582,12 +579,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -8893,7 +11433,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -603,24 +607,25 @@
+@@ -606,24 +611,25 @@
ps-am:
@@ -8932,9 +11472,9 @@
uninstall-installPYTHON
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN gdesklets-0.36.orig/Controls/Sensor/Makefile.in gdesklets-0.36/Controls/Sensor/Makefile.in
---- gdesklets-0.36.orig/Controls/Sensor/Makefile.in 2008-02-17 01:45:41.000000000 +0800
-+++ gdesklets-0.36/Controls/Sensor/Makefile.in 2008-03-01 01:27:30.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Controls/Sensor/Makefile.in gdesklets-0.35.4/Controls/Sensor/Makefile.in
+--- gdesklets-0.35.4.orig/Controls/Sensor/Makefile.in 2006-10-05 20:04:33.000000000 +0800
++++ gdesklets-0.35.4/Controls/Sensor/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9011,7 +11551,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -9021,13 +11561,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -9035,7 +11575,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -9053,7 +11593,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -9061,7 +11601,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -9073,7 +11613,7 @@
installdir = ${coredir}/Controls/Sensors
install_DATA = \
__init__.py \
-@@ -284,13 +283,9 @@
+@@ -287,13 +287,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -9088,7 +11628,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -318,7 +313,7 @@
+@@ -321,7 +317,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -9097,7 +11637,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -341,22 +336,21 @@
+@@ -344,22 +340,21 @@
distdir: $(DISTFILES)
@@ -9133,7 +11673,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -372,7 +366,7 @@
+@@ -375,7 +370,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -9142,7 +11682,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -405,7 +399,7 @@
+@@ -408,7 +403,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -9151,7 +11691,7 @@
dvi: dvi-am
-@@ -419,12 +413,20 @@
+@@ -422,12 +417,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -9172,7 +11712,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -443,20 +445,22 @@
+@@ -446,20 +449,22 @@
ps-am:
@@ -9201,9 +11741,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/Controls/System/Makefile.in gdesklets-0.36/Controls/System/Makefile.in
---- gdesklets-0.36.orig/Controls/System/Makefile.in 2008-02-17 01:45:42.000000000 +0800
-+++ gdesklets-0.36/Controls/System/Makefile.in 2008-03-01 01:27:30.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Controls/System/Makefile.in gdesklets-0.35.4/Controls/System/Makefile.in
+--- gdesklets-0.35.4.orig/Controls/System/Makefile.in 2006-10-05 20:04:33.000000000 +0800
++++ gdesklets-0.35.4/Controls/System/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9280,7 +11820,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -9290,13 +11830,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -9304,7 +11844,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -9322,7 +11862,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -9330,7 +11870,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -9342,7 +11882,7 @@
installdir = ${coredir}/Controls/System
install_DATA = \
__init__.py \
-@@ -284,13 +283,9 @@
+@@ -287,13 +287,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -9357,7 +11897,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -318,7 +313,7 @@
+@@ -321,7 +317,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -9366,7 +11906,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -341,22 +336,21 @@
+@@ -344,22 +340,21 @@
distdir: $(DISTFILES)
@@ -9402,7 +11942,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -372,7 +366,7 @@
+@@ -375,7 +370,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -9411,7 +11951,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -405,7 +399,7 @@
+@@ -408,7 +403,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -9420,7 +11960,7 @@
dvi: dvi-am
-@@ -419,12 +413,20 @@
+@@ -422,12 +417,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -9441,7 +11981,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -443,20 +445,22 @@
+@@ -446,20 +449,22 @@
ps-am:
@@ -9470,9 +12010,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/Controls/Time/Makefile.in gdesklets-0.36/Controls/Time/Makefile.in
---- gdesklets-0.36.orig/Controls/Time/Makefile.in 2008-02-17 01:45:42.000000000 +0800
-+++ gdesklets-0.36/Controls/Time/Makefile.in 2008-03-01 01:27:30.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Controls/Time/Makefile.in gdesklets-0.35.4/Controls/Time/Makefile.in
+--- gdesklets-0.35.4.orig/Controls/Time/Makefile.in 2006-10-05 20:04:33.000000000 +0800
++++ gdesklets-0.35.4/Controls/Time/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9549,7 +12089,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -9559,13 +12099,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -9573,7 +12113,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -9591,7 +12131,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -9599,7 +12139,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -9611,7 +12151,7 @@
installdir = ${coredir}/Controls/Time
install_DATA = \
__init__.py \
-@@ -284,13 +283,9 @@
+@@ -287,13 +287,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -9626,7 +12166,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -318,7 +313,7 @@
+@@ -321,7 +317,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -9635,7 +12175,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -341,22 +336,21 @@
+@@ -344,22 +340,21 @@
distdir: $(DISTFILES)
@@ -9671,7 +12211,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -372,7 +366,7 @@
+@@ -375,7 +370,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -9680,7 +12220,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -405,7 +399,7 @@
+@@ -408,7 +403,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -9689,7 +12229,7 @@
dvi: dvi-am
-@@ -419,12 +413,20 @@
+@@ -422,12 +417,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -9710,7 +12250,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -443,20 +445,22 @@
+@@ -446,20 +449,22 @@
ps-am:
@@ -9739,9 +12279,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/Controls/URI/Makefile.in gdesklets-0.36/Controls/URI/Makefile.in
---- gdesklets-0.36.orig/Controls/URI/Makefile.in 2008-02-17 01:45:43.000000000 +0800
-+++ gdesklets-0.36/Controls/URI/Makefile.in 2008-03-01 01:27:30.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Controls/URI/Makefile.in gdesklets-0.35.4/Controls/URI/Makefile.in
+--- gdesklets-0.35.4.orig/Controls/URI/Makefile.in 2006-10-05 20:04:34.000000000 +0800
++++ gdesklets-0.35.4/Controls/URI/Makefile.in 2008-02-18 20:50:55.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -9818,7 +12358,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -9828,13 +12368,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -9842,7 +12382,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -9860,7 +12400,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -9868,7 +12408,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -9880,7 +12420,7 @@
installdir = ${coredir}/Controls/URI
install_DATA = \
__init__.py \
-@@ -284,13 +283,9 @@
+@@ -287,13 +287,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -9895,7 +12435,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -318,7 +313,7 @@
+@@ -321,7 +317,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -9904,7 +12444,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -341,22 +336,21 @@
+@@ -344,22 +340,21 @@
distdir: $(DISTFILES)
@@ -9940,7 +12480,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -372,7 +366,7 @@
+@@ -375,7 +370,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -9949,7 +12489,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -405,7 +399,7 @@
+@@ -408,7 +403,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -9958,7 +12498,7 @@
dvi: dvi-am
-@@ -419,12 +413,20 @@
+@@ -422,12 +417,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -9979,7 +12519,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -443,20 +445,22 @@
+@@ -446,20 +449,22 @@
ps-am:
@@ -10008,9 +12548,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/data/Makefile.in gdesklets-0.36/data/Makefile.in
---- gdesklets-0.36.orig/data/Makefile.in 2008-02-17 01:45:50.000000000 +0800
-+++ gdesklets-0.36/data/Makefile.in 2008-03-01 01:27:32.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/data/Makefile.in gdesklets-0.35.4/data/Makefile.in
+--- gdesklets-0.35.4.orig/data/Makefile.in 2006-10-05 20:04:35.000000000 +0800
++++ gdesklets-0.35.4/data/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10087,7 +12627,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -144,12 +137,13 @@
+@@ -144,11 +137,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -10097,13 +12637,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -171,6 +165,7 @@
+@@ -170,6 +165,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -10111,7 +12651,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -189,13 +184,13 @@
+@@ -192,13 +188,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -10129,7 +12669,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -207,6 +202,7 @@
+@@ -210,6 +206,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -10137,7 +12677,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -240,8 +236,11 @@
+@@ -243,8 +240,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -10149,7 +12689,7 @@
desktopdir = $(datadir)/applications
desktop_in_files = gdesklets.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@@ -312,13 +311,9 @@
+@@ -313,13 +313,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -10164,7 +12704,7 @@
@list='$(desktop_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -335,7 +330,7 @@
+@@ -336,7 +332,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -10173,7 +12713,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -352,7 +347,7 @@
+@@ -353,7 +349,7 @@
done
install-mimeiconDATA: $(mimeicon_DATA)
@$(NORMAL_INSTALL)
@@ -10182,7 +12722,7 @@
@list='$(mimeicon_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -369,7 +364,7 @@
+@@ -370,7 +366,7 @@
done
install-pixmapDATA: $(pixmap_DATA)
@$(NORMAL_INSTALL)
@@ -10191,7 +12731,7 @@
@list='$(pixmap_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -386,7 +381,7 @@
+@@ -387,7 +383,7 @@
done
install-sharedmimepackageDATA: $(sharedmimepackage_DATA)
@$(NORMAL_INSTALL)
@@ -10200,7 +12740,7 @@
@list='$(sharedmimepackage_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -409,22 +404,21 @@
+@@ -410,22 +406,21 @@
distdir: $(DISTFILES)
@@ -10236,7 +12776,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -440,7 +434,7 @@
+@@ -441,7 +436,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(mimeicondir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(sharedmimepackagedir)"; do \
@@ -10245,7 +12785,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -473,7 +467,7 @@
+@@ -474,7 +469,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -10254,7 +12794,7 @@
dvi: dvi-am
-@@ -491,12 +485,20 @@
+@@ -492,12 +487,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -10275,7 +12815,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -515,23 +517,27 @@
+@@ -516,23 +519,27 @@
ps-am:
@@ -10310,162 +12850,9 @@
uninstall-sharedmimepackageDATA
@INTLTOOL_DESKTOP_RULE@
-diff -urN gdesklets-0.36.orig/depcomp gdesklets-0.36/depcomp
---- gdesklets-0.36.orig/depcomp 2008-02-17 01:46:06.000000000 +0800
-+++ gdesklets-0.36/depcomp 2008-03-01 01:27:35.000000000 +0800
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
-
--scriptversion=2005-07-09.11
-+scriptversion=2007-03-29.01
-
--# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
-+# Foundation, Inc.
-
- # 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
-@@ -91,7 +92,20 @@
- ## gcc 3 implements dependency tracking that does exactly what
- ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
- ## it if -MD -MP comes after the -MF stuff. Hmm.
-- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-+## the command line argument order; so add the flags where they
-+## appear in depend2.am. Note that the slowdown incurred here
-+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-+ for arg
-+ do
-+ case $arg in
-+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-+ *) set fnord "$@" "$arg" ;;
-+ esac
-+ shift # fnord
-+ shift # $arg
-+ done
-+ "$@"
- stat=$?
- if test $stat -eq 0; then :
- else
-@@ -201,34 +215,39 @@
- # current directory. Also, the AIX compiler puts `$object:' at the
- # start of each line; $object doesn't have directory information.
- # Version 6 uses the directory in both cases.
-- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-- tmpdepfile="$stripped.u"
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
-+ tmpdepfile1=$dir$base.u
-+ tmpdepfile2=$base.u
-+ tmpdepfile3=$dir.libs/$base.u
- "$@" -Wc,-M
- else
-+ tmpdepfile1=$dir$base.u
-+ tmpdepfile2=$dir$base.u
-+ tmpdepfile3=$dir$base.u
- "$@" -M
- fi
- stat=$?
-
-- if test -f "$tmpdepfile"; then :
-- else
-- stripped=`echo "$stripped" | sed 's,^.*/,,'`
-- tmpdepfile="$stripped.u"
-- fi
--
- if test $stat -eq 0; then :
- else
-- rm -f "$tmpdepfile"
-+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- exit $stat
- fi
-
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
- if test -f "$tmpdepfile"; then
-- outname="$stripped.o"
- # Each line is of the form `foo.o: dependent.h'.
- # Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
-- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+ # That's a tab and a space in the [].
-+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
-@@ -276,6 +295,46 @@
- rm -f "$tmpdepfile"
- ;;
-
-+hp2)
-+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-+ # compilers, which have integrated preprocessors. The correct option
-+ # to use with these is +Maked; it writes dependencies to a file named
-+ # 'foo.d', which lands next to the object file, wherever that
-+ # happens to be.
-+ # Much of this is similar to the tru64 case; see comments there.
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+ if test "$libtool" = yes; then
-+ tmpdepfile1=$dir$base.d
-+ tmpdepfile2=$dir.libs/$base.d
-+ "$@" -Wc,+Maked
-+ else
-+ tmpdepfile1=$dir$base.d
-+ tmpdepfile2=$dir$base.d
-+ "$@" +Maked
-+ fi
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile1" "$tmpdepfile2"
-+ exit $stat
-+ fi
-+
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
-+ if test -f "$tmpdepfile"; then
-+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+ # Add `dependent.h:' lines.
-+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-+ else
-+ echo "#dummy" > "$depfile"
-+ fi
-+ rm -f "$tmpdepfile" "$tmpdepfile2"
-+ ;;
-+
- tru64)
- # The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-@@ -288,13 +347,13 @@
-
- if test "$libtool" = yes; then
- # With Tru64 cc, shared objects can also be used to make a
-- # static library. This mecanism is used in libtool 1.4 series to
-+ # static library. This mechanism is used in libtool 1.4 series to
- # handle both shared and static libraries in a single compilation.
- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
- #
- # With libtool 1.5 this exception was removed, and libtool now
- # generates 2 separate objects for the 2 libraries. These two
-- # compilations output dependencies in in $dir.libs/$base.o.d and
-+ # compilations output dependencies in $dir.libs/$base.o.d and
- # in $dir$base.o.d. We have to check for both files, because
- # one of the two compilations can be disabled. We should prefer
- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-diff -urN gdesklets-0.36.orig/display/Makefile.in gdesklets-0.36/display/Makefile.in
---- gdesklets-0.36.orig/display/Makefile.in 2008-02-17 01:45:51.000000000 +0800
-+++ gdesklets-0.36/display/Makefile.in 2008-03-01 01:27:32.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/display/Makefile.in gdesklets-0.35.4/display/Makefile.in
+--- gdesklets-0.35.4.orig/display/Makefile.in 2006-10-05 20:04:35.000000000 +0800
++++ gdesklets-0.35.4/display/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -10542,7 +12929,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -10552,13 +12939,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -10566,7 +12953,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -10584,7 +12971,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -10592,7 +12979,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -10604,7 +12991,7 @@
installdir = ${coredir}/display
install_DATA = \
__init__.py \
-@@ -308,13 +307,9 @@
+@@ -311,13 +311,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -10619,7 +13006,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -342,7 +337,7 @@
+@@ -345,7 +341,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -10628,7 +13015,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -365,22 +360,21 @@
+@@ -368,22 +364,21 @@
distdir: $(DISTFILES)
@@ -10664,7 +13051,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -396,7 +390,7 @@
+@@ -399,7 +394,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -10673,7 +13060,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -429,7 +423,7 @@
+@@ -432,7 +427,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -10682,7 +13069,7 @@
dvi: dvi-am
-@@ -443,12 +437,20 @@
+@@ -446,12 +441,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -10703,7 +13090,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -467,20 +469,22 @@
+@@ -470,20 +473,22 @@
ps-am:
@@ -10732,2878 +13119,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/Displays/15pieces/gDesklets/Makefile.in gdesklets-0.36/Displays/15pieces/gDesklets/Makefile.in
---- gdesklets-0.36.orig/Displays/15pieces/gDesklets/Makefile.in 2008-02-17 01:45:45.000000000 +0800
-+++ gdesklets-0.36/Displays/15pieces/gDesklets/Makefile.in 2008-03-01 01:27:31.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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,8 +55,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -82,6 +76,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -98,6 +93,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -108,14 +104,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -127,7 +121,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -137,12 +130,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -164,6 +158,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -182,13 +177,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -200,6 +195,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -233,8 +229,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Displays/15pieces/gDesklets
- install_DATA = \
- 10.png \
-@@ -295,13 +294,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -324,22 +319,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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 +349,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -387,7 +381,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -401,12 +395,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -425,17 +427,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-+
-+.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
-+ uninstall uninstall-am uninstall-installDATA
-
- # 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.
-diff -urN gdesklets-0.36.orig/Displays/15pieces/Globe/Makefile.in gdesklets-0.36/Displays/15pieces/Globe/Makefile.in
---- gdesklets-0.36.orig/Displays/15pieces/Globe/Makefile.in 2008-02-17 01:45:43.000000000 +0800
-+++ gdesklets-0.36/Displays/15pieces/Globe/Makefile.in 2008-03-01 01:27:30.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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,8 +55,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -82,6 +76,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -98,6 +93,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -108,14 +104,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -127,7 +121,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -137,12 +130,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -164,6 +158,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -182,13 +177,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -200,6 +195,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -233,8 +229,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Displays/15pieces/Globe
- install_DATA = \
- 10.png \
-@@ -295,13 +294,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -324,22 +319,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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 +349,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -387,7 +381,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -401,12 +395,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -425,17 +427,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-+
-+.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
-+ uninstall uninstall-am uninstall-installDATA
-
- # 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.
-diff -urN gdesklets-0.36.orig/Displays/15pieces/Gnome/Makefile.in gdesklets-0.36/Displays/15pieces/Gnome/Makefile.in
---- gdesklets-0.36.orig/Displays/15pieces/Gnome/Makefile.in 2008-02-17 01:45:44.000000000 +0800
-+++ gdesklets-0.36/Displays/15pieces/Gnome/Makefile.in 2008-03-01 01:27:30.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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,8 +55,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -82,6 +76,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -98,6 +93,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -108,14 +104,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -127,7 +121,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -137,12 +130,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -164,6 +158,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -182,13 +177,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -200,6 +195,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -233,8 +229,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Displays/15pieces/Gnome
- install_DATA = \
- 10.png \
-@@ -295,13 +294,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -324,22 +319,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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 +349,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -387,7 +381,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -401,12 +395,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -425,17 +427,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-+
-+.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
-+ uninstall uninstall-am uninstall-installDATA
-
- # 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.
-diff -urN gdesklets-0.36.orig/Displays/15pieces/Makefile.in gdesklets-0.36/Displays/15pieces/Makefile.in
---- gdesklets-0.36.orig/Displays/15pieces/Makefile.in 2008-02-17 01:45:44.000000000 +0800
-+++ gdesklets-0.36/Displays/15pieces/Makefile.in 2008-03-01 01:27:31.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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
-@@ -50,10 +46,11 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-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
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -63,14 +60,14 @@
- am__installdirs = "$(DESTDIR)$(installdir)"
- installDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(install_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -92,6 +89,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -108,6 +106,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -118,14 +117,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -137,7 +134,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -147,12 +143,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -174,6 +171,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -192,13 +190,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -210,6 +208,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -243,8 +242,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = \
- gDesklets \
- Globe \
-@@ -297,13 +299,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -350,8 +348,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -395,8 +392,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -421,8 +418,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -432,13 +429,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -452,22 +448,21 @@
- -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)'; 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; \
-+ @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 \
- 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; \
-@@ -481,7 +476,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`; \
-@@ -489,6 +484,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -499,7 +496,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -531,8 +528,7 @@
-
- distclean: distclean-recursive
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
-
- dvi: dvi-recursive
-
-@@ -546,12 +542,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -570,22 +574,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.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 \
-+.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 \
- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-installDATA install-man install-strip \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-installDATA 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 \
-- 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 \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am \
- uninstall-installDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN gdesklets-0.36.orig/Displays/15pieces/Numbers/Makefile.in gdesklets-0.36/Displays/15pieces/Numbers/Makefile.in
---- gdesklets-0.36.orig/Displays/15pieces/Numbers/Makefile.in 2008-02-17 01:45:44.000000000 +0800
-+++ gdesklets-0.36/Displays/15pieces/Numbers/Makefile.in 2008-03-01 01:27:31.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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,8 +55,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -82,6 +76,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -98,6 +93,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -108,14 +104,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -127,7 +121,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -137,12 +130,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -164,6 +158,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -182,13 +177,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -200,6 +195,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -233,8 +229,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Displays/15pieces/Numbers
- install_DATA = \
- 10.png \
-@@ -295,13 +294,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -324,22 +319,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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 +349,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -387,7 +381,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -401,12 +395,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -425,17 +427,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-+
-+.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
-+ uninstall uninstall-am uninstall-installDATA
-
- # 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.
-diff -urN gdesklets-0.36.orig/Displays/15pieces/Tux/Makefile.in gdesklets-0.36/Displays/15pieces/Tux/Makefile.in
---- gdesklets-0.36.orig/Displays/15pieces/Tux/Makefile.in 2008-02-17 01:45:45.000000000 +0800
-+++ gdesklets-0.36/Displays/15pieces/Tux/Makefile.in 2008-03-01 01:27:31.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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,8 +55,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -82,6 +76,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -98,6 +93,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -108,14 +104,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -127,7 +121,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -137,12 +130,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -164,6 +158,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -182,13 +177,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -200,6 +195,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -233,8 +229,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Displays/15pieces/Tux
- install_DATA = \
- 10.png \
-@@ -295,13 +294,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -324,22 +319,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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 +349,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -387,7 +381,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -401,12 +395,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -425,17 +427,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-+
-+.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
-+ uninstall uninstall-am uninstall-installDATA
-
- # 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.
-diff -urN gdesklets-0.36.orig/Displays/Calendar/Makefile.in gdesklets-0.36/Displays/Calendar/Makefile.in
---- gdesklets-0.36.orig/Displays/Calendar/Makefile.in 2008-02-17 01:45:46.000000000 +0800
-+++ gdesklets-0.36/Displays/Calendar/Makefile.in 2008-03-01 01:27:31.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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
-@@ -50,10 +46,11 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-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
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -63,14 +60,14 @@
- am__installdirs = "$(DESTDIR)$(installdir)"
- installDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(install_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -92,6 +89,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -108,6 +106,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -118,14 +117,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -137,7 +134,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -147,12 +143,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -174,6 +171,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -192,13 +190,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -210,6 +208,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -243,8 +242,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = \
- months
-
-@@ -297,13 +299,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -350,8 +348,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -395,8 +392,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -421,8 +418,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -432,13 +429,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -452,22 +448,21 @@
- -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)'; 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; \
-+ @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 \
- 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; \
-@@ -481,7 +476,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`; \
-@@ -489,6 +484,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -499,7 +496,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -531,8 +528,7 @@
-
- distclean: distclean-recursive
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
-
- dvi: dvi-recursive
-
-@@ -546,12 +542,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -570,22 +574,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.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 \
-+.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 \
- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-installDATA install-man install-strip \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-installDATA 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 \
-- 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 \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am \
- uninstall-installDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN gdesklets-0.36.orig/Displays/Calendar/months/Makefile.in gdesklets-0.36/Displays/Calendar/months/Makefile.in
---- gdesklets-0.36.orig/Displays/Calendar/months/Makefile.in 2008-02-17 01:45:46.000000000 +0800
-+++ gdesklets-0.36/Displays/Calendar/months/Makefile.in 2008-03-01 01:27:31.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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,8 +55,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -82,6 +76,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -98,6 +93,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -108,14 +104,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -127,7 +121,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -137,12 +130,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -164,6 +158,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -182,13 +177,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -200,6 +195,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -233,8 +229,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Displays/Calendar/months
- install_DATA = \
- 0.png \
-@@ -291,13 +290,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -320,22 +315,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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; \
-@@ -351,7 +345,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -383,7 +377,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -397,12 +391,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -421,17 +423,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-+
-+.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
-+ uninstall uninstall-am uninstall-installDATA
-
- # 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.
-diff -urN gdesklets-0.36.orig/Displays/Clock/gfx/Makefile.in gdesklets-0.36/Displays/Clock/gfx/Makefile.in
---- gdesklets-0.36.orig/Displays/Clock/gfx/Makefile.in 2008-02-17 01:45:47.000000000 +0800
-+++ gdesklets-0.36/Displays/Clock/gfx/Makefile.in 2008-03-01 01:27:31.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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,8 +55,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -82,6 +76,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -98,6 +93,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -108,14 +104,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -127,7 +121,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -137,12 +130,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -164,6 +158,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -182,13 +177,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -200,6 +195,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -233,8 +229,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Displays/Clock/gfx
- install_DATA = \
- aero.png \
-@@ -293,13 +292,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -322,22 +317,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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; \
-@@ -353,7 +347,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -385,7 +379,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -399,12 +393,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -423,17 +425,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-+
-+.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
-+ uninstall uninstall-am uninstall-installDATA
-
- # 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.
-diff -urN gdesklets-0.36.orig/Displays/Clock/Makefile.in gdesklets-0.36/Displays/Clock/Makefile.in
---- gdesklets-0.36.orig/Displays/Clock/Makefile.in 2008-02-17 01:45:47.000000000 +0800
-+++ gdesklets-0.36/Displays/Clock/Makefile.in 2008-03-01 01:27:31.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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
-@@ -50,10 +46,11 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-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
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -63,14 +60,14 @@
- am__installdirs = "$(DESTDIR)$(installdir)"
- installDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(install_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -92,6 +89,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -108,6 +106,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -118,14 +117,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -137,7 +134,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -147,12 +143,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -174,6 +171,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -192,13 +190,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -210,6 +208,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -243,8 +242,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = \
- gfx
-
-@@ -294,13 +296,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -347,8 +345,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -392,8 +389,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -418,8 +415,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -429,13 +426,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -449,22 +445,21 @@
- -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)'; 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; \
-+ @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 \
- 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; \
-@@ -478,7 +473,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`; \
-@@ -486,6 +481,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -496,7 +493,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -528,8 +525,7 @@
-
- distclean: distclean-recursive
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
-
- dvi: dvi-recursive
-
-@@ -543,12 +539,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -567,22 +571,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.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 \
-+.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 \
- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-installDATA install-man install-strip \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-installDATA 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 \
-- 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 \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am \
- uninstall-installDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN gdesklets-0.36.orig/Displays/Makefile.in gdesklets-0.36/Displays/Makefile.in
---- gdesklets-0.36.orig/Displays/Makefile.in 2008-02-17 01:45:47.000000000 +0800
-+++ gdesklets-0.36/Displays/Makefile.in 2008-03-01 01:27:31.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/doc/Makefile.in gdesklets-0.35.4/doc/Makefile.in
+--- gdesklets-0.35.4.orig/doc/Makefile.in 2006-10-05 20:04:35.000000000 +0800
++++ gdesklets-0.35.4/doc/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -13697,7 +13215,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -136,12 +132,13 @@
+@@ -136,11 +132,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -13707,13 +13225,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -163,6 +160,7 @@
+@@ -162,6 +160,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -13721,7 +13239,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -181,13 +179,13 @@
+@@ -184,13 +183,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -13739,7 +13257,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -199,6 +197,7 @@
+@@ -202,6 +201,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -13747,7 +13265,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -232,8 +231,11 @@
+@@ -235,8 +235,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -13756,10 +13274,10 @@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
- SUBDIRS = \
- 15pieces \
- Calendar \
-@@ -280,10 +282,6 @@
+ SUBDIRS = man
+ SYNOPSIS = python2.2 /usr/bin/synopsis
+ SYN_FLAGS = -Wc,parser=Python,formatter=HTML,linker=Linker
+@@ -281,10 +284,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -13770,7 +13288,7 @@
# 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,
-@@ -315,8 +313,7 @@
+@@ -316,8 +315,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -13780,7 +13298,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -360,8 +357,8 @@
+@@ -361,8 +359,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -13791,7 +13309,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -386,8 +383,8 @@
+@@ -387,8 +385,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -13802,7 +13320,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -397,13 +394,12 @@
+@@ -398,13 +396,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -13818,7 +13336,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -417,22 +413,21 @@
+@@ -418,22 +415,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -13854,7 +13372,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -446,7 +441,7 @@
+@@ -447,7 +443,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -13863,7 +13381,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -454,6 +449,8 @@
+@@ -455,6 +451,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -13872,7 +13390,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -493,8 +490,7 @@
+@@ -494,8 +492,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -13882,7 +13400,7 @@
dvi: dvi-recursive
-@@ -508,12 +504,20 @@
+@@ -509,12 +506,20 @@
install-data-am:
@@ -13903,7 +13421,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -532,22 +536,24 @@
+@@ -533,22 +538,24 @@
ps-am:
@@ -13938,1221 +13456,11 @@
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-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.
-diff -urN gdesklets-0.36.orig/Displays/Quote-of-the-Day/Makefile.in gdesklets-0.36/Displays/Quote-of-the-Day/Makefile.in
---- gdesklets-0.36.orig/Displays/Quote-of-the-Day/Makefile.in 2008-02-17 01:45:48.000000000 +0800
-+++ gdesklets-0.36/Displays/Quote-of-the-Day/Makefile.in 2008-03-01 01:27:31.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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
-@@ -60,8 +56,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -83,6 +77,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -99,6 +94,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -109,14 +105,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -128,7 +122,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -138,12 +131,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -165,6 +159,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -183,13 +178,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -201,6 +196,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -234,8 +230,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Displays/Quote-of-the-Day
- install_DATA = \
- COPYING \
-@@ -283,13 +282,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -312,22 +307,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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; \
-@@ -343,7 +337,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -375,7 +369,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -389,12 +383,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -413,17 +415,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-+
-+.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
-+ uninstall uninstall-am uninstall-installDATA
-
- # 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.
-diff -urN gdesklets-0.36.orig/doc/basic/Images/Makefile.in gdesklets-0.36/doc/basic/Images/Makefile.in
---- gdesklets-0.36.orig/doc/basic/Images/Makefile.in 2008-02-17 01:45:51.000000000 +0800
-+++ gdesklets-0.36/doc/basic/Images/Makefile.in 2008-03-01 01:27:32.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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,8 +55,6 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -82,6 +76,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -98,6 +93,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -108,14 +104,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -127,7 +121,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -137,12 +130,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -164,6 +158,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -182,13 +177,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -200,6 +195,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -233,8 +229,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- installdir = ${coredir}/doc/basic/Images
- install_DATA = \
- desklet-context-menu.png \
-@@ -285,13 +284,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -314,22 +309,21 @@
-
-
- distdir: $(DISTFILES)
-- @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; \
-+ @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 \
- 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; \
-@@ -345,7 +339,7 @@
- all-am: Makefile $(DATA)
- installdirs:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-am
- install-exec: install-exec-am
-@@ -377,7 +371,7 @@
-
- distclean: distclean-am
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
-
- dvi: dvi-am
-
-@@ -391,12 +385,20 @@
-
- install-data-am: install-installDATA
-
-+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
-@@ -415,17 +417,21 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-+
-+.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-exec install-exec-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-installDATA 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-info-am uninstall-installDATA
-+ uninstall uninstall-am uninstall-installDATA
-
- # 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.
-diff -urN gdesklets-0.36.orig/doc/basic/Makefile.in gdesklets-0.36/doc/basic/Makefile.in
---- gdesklets-0.36.orig/doc/basic/Makefile.in 2008-02-17 01:45:52.000000000 +0800
-+++ gdesklets-0.36/doc/basic/Makefile.in 2008-03-01 01:27:32.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +14,11 @@
-
- @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,10 +45,11 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-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
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -62,14 +59,14 @@
- am__installdirs = "$(DESTDIR)$(installdir)"
- installDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(install_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -91,6 +88,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -107,6 +105,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -117,14 +116,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -136,7 +133,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -146,12 +142,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -173,6 +170,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -191,13 +189,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -209,6 +207,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -242,8 +241,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = \
- Images
-
-@@ -290,13 +292,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
- install-installDATA: $(install_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(installdir)" || $(mkdir_p) "$(DESTDIR)$(installdir)"
-+ test -z "$(installdir)" || $(MKDIR_P) "$(DESTDIR)$(installdir)"
- @list='$(install_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -343,8 +341,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -388,8 +385,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -414,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; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -425,13 +422,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -445,22 +441,21 @@
- -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)'; 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; \
-+ @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 \
- 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; \
-@@ -474,7 +469,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`; \
-@@ -482,6 +477,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -492,7 +489,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- for dir in "$(DESTDIR)$(installdir)"; do \
-- test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -524,8 +521,7 @@
-
- distclean: distclean-recursive
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
-
- dvi: dvi-recursive
-
-@@ -539,12 +535,20 @@
-
- install-data-am: install-installDATA
-
-+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,22 +567,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-installDATA
-+uninstall-am: uninstall-installDATA
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.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 \
-+.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 \
- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-installDATA install-man install-strip \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-installDATA 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 \
-- 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 \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ tags tags-recursive uninstall uninstall-am \
- uninstall-installDATA
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN gdesklets-0.36.orig/doc/Makefile.in gdesklets-0.36/doc/Makefile.in
---- gdesklets-0.36.orig/doc/Makefile.in 2008-02-17 01:45:51.000000000 +0800
-+++ gdesklets-0.36/doc/Makefile.in 2008-03-01 01:27:32.000000000 +0800
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +13,11 @@
- # 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
-@@ -48,18 +44,19 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-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
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ALL_LINGUAS = @ALL_LINGUAS@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -81,6 +78,7 @@
- DATADIRNAME = @DATADIRNAME@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
-+DSYMUTIL = @DSYMUTIL@
- ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -97,6 +95,7 @@
- GMOFILES = @GMOFILES@
- GMSGFMT = @GMSGFMT@
- GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -107,14 +106,12 @@
- INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
- INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
- INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
--INTLTOOL_ICONV = @INTLTOOL_ICONV@
- INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
- INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
--INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
--INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
- INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
-+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
- INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
- INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
- INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -126,7 +123,6 @@
- INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
--INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
- LDFLAGS = @LDFLAGS@
-@@ -136,12 +132,13 @@
- LN_S = @LN_S@
- 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@
-+MSGMERGE = @MSGMERGE@
-+NMEDIT = @NMEDIT@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -163,6 +160,7 @@
- PYTHON_PREFIX = @PYTHON_PREFIX@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
- SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -181,13 +179,13 @@
- X11_CFLAGS = @X11_CFLAGS@
- X11_LIBS = @X11_LIBS@
- XGETTEXT = @XGETTEXT@
-+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@
-@@ -199,6 +197,7 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- coredir = @coredir@
- datadir = @datadir@
- datarootdir = @datarootdir@
-@@ -232,8 +231,11 @@
- pythondir = @pythondir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = man \
- basic
-
-@@ -280,10 +282,6 @@
- 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,
-@@ -315,8 +313,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -360,8 +357,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -386,8 +383,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -397,13 +394,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -417,22 +413,21 @@
- -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)'; 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; \
-+ @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 \
- 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; \
-@@ -446,7 +441,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`; \
-@@ -454,6 +449,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -493,8 +490,7 @@
-
- distclean: distclean-recursive
- -rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
-
- dvi: dvi-recursive
-
-@@ -508,12 +504,20 @@
-
- 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
-@@ -532,22 +536,24 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip
-
--.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 \
-+.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 \
- 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 \
-+ 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 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
-+ maintainer-clean-generic mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am
-
doc:
-diff -urN gdesklets-0.36.orig/doc/man/Makefile.in gdesklets-0.36/doc/man/Makefile.in
---- gdesklets-0.36.orig/doc/man/Makefile.in 2008-02-17 01:45:52.000000000 +0800
-+++ gdesklets-0.36/doc/man/Makefile.in 2008-03-01 01:27:32.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/doc/man/Makefile.in gdesklets-0.35.4/doc/man/Makefile.in
+--- gdesklets-0.35.4.orig/doc/man/Makefile.in 2006-10-05 20:04:35.000000000 +0800
++++ gdesklets-0.35.4/doc/man/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -15229,7 +13537,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -131,12 +124,13 @@
+@@ -131,11 +124,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -15239,13 +13547,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -158,6 +152,7 @@
+@@ -157,6 +152,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -15253,7 +13561,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -176,13 +171,13 @@
+@@ -179,13 +175,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -15271,7 +13579,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -194,6 +189,7 @@
+@@ -197,6 +193,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -15279,7 +13587,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -227,8 +223,11 @@
+@@ -230,8 +227,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -15291,7 +13599,7 @@
man_MANS = gdesklets.1
EXTRA_DIST = $(man_MANS)
all: all-am
-@@ -269,13 +268,9 @@
+@@ -272,13 +272,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -15306,7 +13614,7 @@
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
-@@ -326,22 +321,21 @@
+@@ -329,22 +325,21 @@
distdir: $(DISTFILES)
@@ -15342,7 +13650,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -357,7 +351,7 @@
+@@ -360,7 +355,7 @@
all-am: Makefile $(MANS)
installdirs:
for dir in "$(DESTDIR)$(man1dir)"; do \
@@ -15351,7 +13659,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -389,7 +383,7 @@
+@@ -392,7 +387,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -15360,7 +13668,7 @@
dvi: dvi-am
-@@ -403,12 +397,20 @@
+@@ -406,12 +401,20 @@
install-data-am: install-man
@@ -15381,7 +13689,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -427,20 +429,23 @@
+@@ -430,20 +433,23 @@
ps-am:
@@ -15409,9 +13717,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/factory/Makefile.in gdesklets-0.36/factory/Makefile.in
---- gdesklets-0.36.orig/factory/Makefile.in 2008-02-17 01:45:53.000000000 +0800
-+++ gdesklets-0.36/factory/Makefile.in 2008-03-01 01:27:32.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/factory/Makefile.in gdesklets-0.35.4/factory/Makefile.in
+--- gdesklets-0.35.4.orig/factory/Makefile.in 2006-10-05 20:04:35.000000000 +0800
++++ gdesklets-0.35.4/factory/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -15488,7 +13796,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -15498,13 +13806,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -15512,7 +13820,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -15530,7 +13838,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -15538,7 +13846,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -15550,7 +13858,7 @@
installdir = ${coredir}/factory
install_DATA = \
__init__.py \
-@@ -286,13 +285,9 @@
+@@ -289,13 +289,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -15565,7 +13873,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -320,7 +315,7 @@
+@@ -323,7 +319,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -15574,7 +13882,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -343,22 +338,21 @@
+@@ -346,22 +342,21 @@
distdir: $(DISTFILES)
@@ -15610,7 +13918,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +368,7 @@
+@@ -377,7 +372,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -15619,7 +13927,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +401,7 @@
+@@ -410,7 +405,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -15628,7 +13936,7 @@
dvi: dvi-am
-@@ -421,12 +415,20 @@
+@@ -424,12 +419,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -15649,7 +13957,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +447,22 @@
+@@ -448,20 +451,22 @@
ps-am:
@@ -15678,809 +13986,50 @@
# 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.
-diff -urN gdesklets-0.36.orig/INSTALL gdesklets-0.36/INSTALL
---- gdesklets-0.36.orig/INSTALL 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/INSTALL 2008-03-01 01:27:35.000000000 +0800
-@@ -1,8 +1,8 @@
- Installation Instructions
- *************************
-
--Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
--Software Foundation, Inc.
-+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-+2006, 2007 Free Software Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
-@@ -10,7 +10,10 @@
- Basic Installation
- ==================
-
--These are generic installation instructions.
-+Briefly, the shell commands `./configure; make; make install' should
-+configure, build, and install this package. The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package.
-
- The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
-@@ -23,9 +26,9 @@
-
- It can also use an optional file (typically called `config.cache'
- and enabled with `--cache-file=config.cache' or simply `-C') that saves
--the results of its tests to speed up reconfiguring. (Caching is
-+the results of its tests to speed up reconfiguring. Caching is
- disabled by default to prevent problems with accidental use of stale
--cache files.)
-+cache files.
-
- If you need to do unusual things to compile the package, please try
- to figure out how `configure' could check whether to do them, and mail
-@@ -35,20 +38,17 @@
- may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
--`configure' by a program called `autoconf'. You only need
--`configure.ac' if you want to change it or regenerate `configure' using
--a newer version of `autoconf'.
-+`configure' by a program called `autoconf'. You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
-
- The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
-- `./configure' to configure the package for your system. If you're
-- using `csh' on an old version of System V, you might need to type
-- `sh ./configure' instead to prevent `csh' from trying to execute
-- `configure' itself.
-+ `./configure' to configure the package for your system.
-
-- Running `configure' takes awhile. While running, it prints some
-- messages telling which features it is checking for.
-+ Running `configure' might take a while. While running, it prints
-+ some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
-@@ -67,6 +67,9 @@
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-+ 6. Often, you can also type `make uninstall' to remove the installed
-+ files again.
-+
- Compilers and Options
- =====================
-
-@@ -78,7 +81,7 @@
- by setting variables in the command line or in the environment. Here
- is an example:
-
-- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-@@ -87,17 +90,15 @@
-
- You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
--own directory. To do this, you must use a version of `make' that
--supports the `VPATH' variable, such as GNU `make'. `cd' to the
-+own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
- the `configure' script. `configure' automatically checks for the
- source code in the directory that `configure' is in and in `..'.
-
-- If you have to use a `make' that does not support the `VPATH'
--variable, you have to compile the package for one architecture at a
--time in the source code directory. After you have installed the
--package for one architecture, use `make distclean' before reconfiguring
--for another architecture.
-+ With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory. After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-
- Installation Names
- ==================
-@@ -190,12 +191,12 @@
- ./configure CC=/usr/local2/bin/gcc
-
- causes the specified `gcc' to be used as the C compiler (unless it is
--overridden in the site shell script). Here is a another example:
-+overridden in the site shell script).
-
-- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf bug. Until the bug is fixed you can use this workaround:
-
--Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
--configuration-related scripts to be executed by `/bin/bash'.
-+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
- `configure' Invocation
- ======================
-diff -urN gdesklets-0.36.orig/install-sh gdesklets-0.36/install-sh
---- gdesklets-0.36.orig/install-sh 2008-02-17 01:45:38.000000000 +0800
-+++ gdesklets-0.36/install-sh 2008-03-01 01:27:29.000000000 +0800
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2005-05-14.22
-+scriptversion=2006-12-25.00
-
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -39,38 +39,68 @@
- # when there is no Makefile.
- #
- # This script is compatible with the BSD install script, but was written
--# from scratch. It can only install one file at a time, a restriction
--# shared with many OS's install programs.
-+# from scratch.
-+
-+nl='
-+'
-+IFS=" "" $nl"
-
- # set DOITPROG to echo to test this script
-
- # Don't use :- since 4.3BSD and earlier shells don't like it.
--doit="${DOITPROG-}"
-+doit=${DOITPROG-}
-+if test -z "$doit"; then
-+ doit_exec=exec
-+else
-+ doit_exec=$doit
-+fi
-
--# put in absolute paths if you don't have them in your path; or use env. vars.
-+# Put in absolute file names if you don't have them in your path;
-+# or use environment vars.
-
--mvprog="${MVPROG-mv}"
--cpprog="${CPPROG-cp}"
--chmodprog="${CHMODPROG-chmod}"
--chownprog="${CHOWNPROG-chown}"
--chgrpprog="${CHGRPPROG-chgrp}"
--stripprog="${STRIPPROG-strip}"
--rmprog="${RMPROG-rm}"
--mkdirprog="${MKDIRPROG-mkdir}"
-+chgrpprog=${CHGRPPROG-chgrp}
-+chmodprog=${CHMODPROG-chmod}
-+chownprog=${CHOWNPROG-chown}
-+cmpprog=${CMPPROG-cmp}
-+cpprog=${CPPROG-cp}
-+mkdirprog=${MKDIRPROG-mkdir}
-+mvprog=${MVPROG-mv}
-+rmprog=${RMPROG-rm}
-+stripprog=${STRIPPROG-strip}
-+
-+posix_glob='?'
-+initialize_posix_glob='
-+ test "$posix_glob" != "?" || {
-+ if (set -f) 2>/dev/null; then
-+ posix_glob=
-+ else
-+ posix_glob=:
-+ fi
-+ }
-+'
-+
-+posix_mkdir=
-+
-+# Desired mode of installed file.
-+mode=0755
-
--chmodcmd="$chmodprog 0755"
--chowncmd=
- chgrpcmd=
--stripcmd=
-+chmodcmd=$chmodprog
-+chowncmd=
-+mvcmd=$mvprog
- rmcmd="$rmprog -f"
--mvcmd="$mvprog"
-+stripcmd=
-+
- src=
- dst=
- dir_arg=
--dstarg=
-+dst_arg=
-+
-+copy_on_change=false
- no_target_directory=
-
--usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+usage="\
-+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
- or: $0 [OPTION]... SRCFILES... DIRECTORY
- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
- or: $0 [OPTION]... -d DIRECTORIES...
-@@ -80,81 +110,86 @@
- In the 4th, create DIRECTORIES.
-
- Options:
---c (ignored)
---d create directories instead of installing files.
---g GROUP $chgrpprog installed files to GROUP.
---m MODE $chmodprog installed files to MODE.
---o USER $chownprog installed files to USER.
---s $stripprog installed files.
---t DIRECTORY install into DIRECTORY.
---T report an error if DSTFILE is a directory.
----help display this help and exit.
----version display version info and exit.
-+ --help display this help and exit.
-+ --version display version info and exit.
-+
-+ -c (ignored)
-+ -C install only if different (preserve the last data modification time)
-+ -d create directories instead of installing files.
-+ -g GROUP $chgrpprog installed files to GROUP.
-+ -m MODE $chmodprog installed files to MODE.
-+ -o USER $chownprog installed files to USER.
-+ -s $stripprog installed files.
-+ -t DIRECTORY install into DIRECTORY.
-+ -T report an error if DSTFILE is a directory.
-
- Environment variables override the default commands:
-- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-+ RMPROG STRIPPROG
- "
-
--while test -n "$1"; do
-+while test $# -ne 0; do
- case $1 in
-- -c) shift
-- continue;;
-+ -c) ;;
-
-- -d) dir_arg=true
-- shift
-- continue;;
-+ -C) copy_on_change=true;;
-+
-+ -d) dir_arg=true;;
-
- -g) chgrpcmd="$chgrpprog $2"
-- shift
-- shift
-- continue;;
-+ shift;;
-
- --help) echo "$usage"; exit $?;;
-
-- -m) chmodcmd="$chmodprog $2"
-- shift
-- shift
-- continue;;
-+ -m) mode=$2
-+ case $mode in
-+ *' '* | *' '* | *'
-+'* | *'*'* | *'?'* | *'['*)
-+ echo "$0: invalid mode: $mode" >&2
-+ exit 1;;
-+ esac
-+ shift;;
-
- -o) chowncmd="$chownprog $2"
-- shift
-- shift
-- continue;;
--
-- -s) stripcmd=$stripprog
-- shift
-- continue;;
--
-- -t) dstarg=$2
-- shift
-- shift
-- continue;;
--
-- -T) no_target_directory=true
-- shift
-- continue;;
-+ shift;;
-+
-+ -s) stripcmd=$stripprog;;
-+
-+ -t) dst_arg=$2
-+ shift;;
-+
-+ -T) no_target_directory=true;;
-
- --version) echo "$0 $scriptversion"; exit $?;;
-
-- *) # When -d is used, all remaining arguments are directories to create.
-- # When -t is used, the destination is already specified.
-- test -n "$dir_arg$dstarg" && break
-- # Otherwise, the last argument is the destination. Remove it from $@.
-- for arg
-- do
-- if test -n "$dstarg"; then
-- # $@ is not empty: it contains at least $arg.
-- set fnord "$@" "$dstarg"
-- shift # fnord
-- fi
-- shift # arg
-- dstarg=$arg
-- done
-+ --) shift
- break;;
-+
-+ -*) echo "$0: invalid option: $1" >&2
-+ exit 1;;
-+
-+ *) break;;
- esac
-+ shift
- done
-
--if test -z "$1"; then
-+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-+ # When -d is used, all remaining arguments are directories to create.
-+ # When -t is used, the destination is already specified.
-+ # Otherwise, the last argument is the destination. Remove it from $@.
-+ for arg
-+ do
-+ if test -n "$dst_arg"; then
-+ # $@ is not empty: it contains at least $arg.
-+ set fnord "$@" "$dst_arg"
-+ shift # fnord
-+ fi
-+ shift # arg
-+ dst_arg=$arg
-+ done
-+fi
-+
-+if test $# -eq 0; then
- if test -z "$dir_arg"; then
- echo "$0: no input file specified." >&2
- exit 1
-@@ -164,24 +199,47 @@
- exit 0
- fi
-
-+if test -z "$dir_arg"; then
-+ trap '(exit $?); exit' 1 2 13 15
-+
-+ # Set umask so as not to create temps with too-generous modes.
-+ # However, 'strip' requires both read and write access to temps.
-+ case $mode in
-+ # Optimize common cases.
-+ *644) cp_umask=133;;
-+ *755) cp_umask=22;;
-+
-+ *[0-7])
-+ if test -z "$stripcmd"; then
-+ u_plus_rw=
-+ else
-+ u_plus_rw='% 200'
-+ fi
-+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-+ *)
-+ if test -z "$stripcmd"; then
-+ u_plus_rw=
-+ else
-+ u_plus_rw=,u+rw
-+ fi
-+ cp_umask=$mode$u_plus_rw;;
-+ esac
-+fi
-+
- for src
- do
- # Protect names starting with `-'.
- case $src in
-- -*) src=./$src ;;
-+ -*) src=./$src;;
- esac
-
- if test -n "$dir_arg"; then
- dst=$src
-- src=
--
-- if test -d "$dst"; then
-- mkdircmd=:
-- chmodcmd=
-- else
-- mkdircmd=$mkdirprog
-- fi
-+ dstdir=$dst
-+ test -d "$dstdir"
-+ dstdir_status=$?
- else
-+
- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
- # might cause directories to be created, which would be especially bad
- # if $src (and thus $dsttmp) contains '*'.
-@@ -190,71 +248,199 @@
- exit 1
- fi
-
-- if test -z "$dstarg"; then
-+ if test -z "$dst_arg"; then
- echo "$0: no destination specified." >&2
- exit 1
- fi
-
-- dst=$dstarg
-+ dst=$dst_arg
- # Protect names starting with `-'.
- case $dst in
-- -*) dst=./$dst ;;
-+ -*) dst=./$dst;;
- esac
-
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
- if test -d "$dst"; then
- if test -n "$no_target_directory"; then
-- echo "$0: $dstarg: Is a directory" >&2
-+ echo "$0: $dst_arg: Is a directory" >&2
- exit 1
- fi
-- dst=$dst/`basename "$src"`
-+ dstdir=$dst
-+ dst=$dstdir/`basename "$src"`
-+ dstdir_status=0
-+ else
-+ # Prefer dirname, but fall back on a substitute if dirname fails.
-+ dstdir=`
-+ (dirname "$dst") 2>/dev/null ||
-+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$dst" : 'X\(//\)[^/]' \| \
-+ X"$dst" : 'X\(//\)$' \| \
-+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-+ echo X"$dst" |
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'
-+ `
-+
-+ test -d "$dstdir"
-+ dstdir_status=$?
- fi
- fi
-
-- # This sed command emulates the dirname command.
-- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
--
-- # Make sure that the destination directory exists.
-+ obsolete_mkdir_used=false
-
-- # Skip lots of stat calls in the usual case.
-- if test ! -d "$dstdir"; then
-- defaultIFS='
-- '
-- IFS="${IFS-$defaultIFS}"
--
-- oIFS=$IFS
-- # Some sh's can't handle IFS=/ for some reason.
-- IFS='%'
-- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-- shift
-- IFS=$oIFS
-+ if test $dstdir_status != 0; then
-+ case $posix_mkdir in
-+ '')
-+ # Create intermediate dirs using mode 755 as modified by the umask.
-+ # This is like FreeBSD 'install' as of 1997-10-28.
-+ umask=`umask`
-+ case $stripcmd.$umask in
-+ # Optimize common cases.
-+ *[2367][2367]) mkdir_umask=$umask;;
-+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-+
-+ *[0-7])
-+ mkdir_umask=`expr $umask + 22 \
-+ - $umask % 100 % 40 + $umask % 20 \
-+ - $umask % 10 % 4 + $umask % 2
-+ `;;
-+ *) mkdir_umask=$umask,go-w;;
-+ esac
-+
-+ # With -d, create the new directory with the user-specified mode.
-+ # Otherwise, rely on $mkdir_umask.
-+ if test -n "$dir_arg"; then
-+ mkdir_mode=-m$mode
-+ else
-+ mkdir_mode=
-+ fi
-+
-+ posix_mkdir=false
-+ case $umask in
-+ *[123567][0-7][0-7])
-+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+ ;;
-+ *)
-+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-+
-+ if (umask $mkdir_umask &&
-+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+ then
-+ if test -z "$dir_arg" || {
-+ # Check for POSIX incompatibilities with -m.
-+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-+ # other-writeable bit of parent directory when it shouldn't.
-+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+ case $ls_ld_tmpdir in
-+ d????-?r-*) different_mode=700;;
-+ d????-?--*) different_mode=755;;
-+ *) false;;
-+ esac &&
-+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+ }
-+ }
-+ then posix_mkdir=:
-+ fi
-+ rmdir "$tmpdir/d" "$tmpdir"
-+ else
-+ # Remove any dirs left behind by ancient mkdir implementations.
-+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+ fi
-+ trap '' 0;;
-+ esac;;
-+ esac
-
-- pathcomp=
-+ if
-+ $posix_mkdir && (
-+ umask $mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-+ )
-+ then :
-+ else
-
-- while test $# -ne 0 ; do
-- pathcomp=$pathcomp$1
-+ # The umask is ridiculous, or mkdir does not conform to POSIX,
-+ # or it failed possibly due to a race condition. Create the
-+ # directory the slow way, step by step, checking for races as we go.
-+
-+ case $dstdir in
-+ /*) prefix='/';;
-+ -*) prefix='./';;
-+ *) prefix='';;
-+ esac
-+
-+ eval "$initialize_posix_glob"
-+
-+ oIFS=$IFS
-+ IFS=/
-+ $posix_glob set -f
-+ set fnord $dstdir
- shift
-- if test ! -d "$pathcomp"; then
-- $mkdirprog "$pathcomp"
-- # mkdir can fail with a `File exist' error in case several
-- # install-sh are creating the directory concurrently. This
-- # is OK.
-- test -d "$pathcomp" || exit
-+ $posix_glob set +f
-+ IFS=$oIFS
-+
-+ prefixes=
-+
-+ for d
-+ do
-+ test -z "$d" && continue
-+
-+ prefix=$prefix$d
-+ if test -d "$prefix"; then
-+ prefixes=
-+ else
-+ if $posix_mkdir; then
-+ (umask=$mkdir_umask &&
-+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+ # Don't fail if two instances are running concurrently.
-+ test -d "$prefix" || exit 1
-+ else
-+ case $prefix in
-+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+ *) qprefix=$prefix;;
-+ esac
-+ prefixes="$prefixes '$qprefix'"
-+ fi
-+ fi
-+ prefix=$prefix/
-+ done
-+
-+ if test -n "$prefixes"; then
-+ # Don't fail if two instances are running concurrently.
-+ (umask $mkdir_umask &&
-+ eval "\$doit_exec \$mkdirprog $prefixes") ||
-+ test -d "$dstdir" || exit 1
-+ obsolete_mkdir_used=true
- fi
-- pathcomp=$pathcomp/
-- done
-+ fi
- fi
-
- if test -n "$dir_arg"; then
-- $doit $mkdircmd "$dst" \
-- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
--
-+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
- else
-- dstfile=`basename "$dst"`
-
- # Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
-@@ -262,10 +448,9 @@
-
- # Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-- trap '(exit $?); exit' 1 2 13 15
-
- # Copy the file name to the temp name.
-- $doit $cpprog "$src" "$dsttmp" &&
-+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
- # and set any options; do chmod last to preserve setuid bits.
- #
-@@ -273,47 +458,58 @@
- # ignore errors from any of these, just make sure not to ignore
- # errors from the above "$doit $cpprog $src $dsttmp" command.
- #
-- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
--
-- # Now rename the file to the real destination.
-- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-- || {
-- # The rename failed, perhaps because mv can't rename something else
-- # to itself, or perhaps because mv is so ancient that it does not
-- # support -f.
--
-- # Now remove or move aside any old file at destination location.
-- # We try this two ways since rm can't unlink itself on some
-- # systems and the destination file might be busy for other
-- # reasons. In this case, the final cleanup might fail but the new
-- # file should still install successfully.
-- {
-- if test -f "$dstdir/$dstfile"; then
-- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-- || {
-- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-- (exit 1); exit 1
-- }
-- else
-- :
-- fi
-- } &&
--
-- # Now rename the file to the real destination.
-- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-- }
-- }
-- fi || { (exit 1); exit 1; }
--done
-+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-+
-+ # If -C, don't bother to copy if it wouldn't change the file.
-+ if $copy_on_change &&
-+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
-+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-+
-+ eval "$initialize_posix_glob" &&
-+ $posix_glob set -f &&
-+ set X $old && old=:$2:$4:$5:$6 &&
-+ set X $new && new=:$2:$4:$5:$6 &&
-+ $posix_glob set +f &&
-+
-+ test "$old" = "$new" &&
-+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-+ then
-+ rm -f "$dsttmp"
-+ else
-+ # Rename the file to the real destination.
-+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
--# The final little trick to "correctly" pass the exit status to the exit trap.
--{
-- (exit 0); exit 0
--}
-+ # The rename failed, perhaps because mv can't rename something else
-+ # to itself, or perhaps because mv is so ancient that it does not
-+ # support -f.
-+ {
-+ # Now remove or move aside any old file at destination location.
-+ # We try this two ways since rm can't unlink itself on some
-+ # systems and the destination file might be busy for other
-+ # reasons. In this case, the final cleanup might fail but the new
-+ # file should still install successfully.
-+ {
-+ test ! -f "$dst" ||
-+ $doit $rmcmd -f "$dst" 2>/dev/null ||
-+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-+ } ||
-+ { echo "$0: cannot unlink or rename $dst" >&2
-+ (exit 1); exit 1
-+ }
-+ } &&
-+
-+ # Now rename the file to the real destination.
-+ $doit $mvcmd "$dsttmp" "$dst"
-+ }
-+ fi || exit 1
-+
-+ trap '' 0
-+ fi
-+done
-
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
-diff -urN gdesklets-0.36.orig/intltool-extract.in gdesklets-0.36/intltool-extract.in
---- gdesklets-0.36.orig/intltool-extract.in 2008-02-17 01:45:23.000000000 +0800
-+++ gdesklets-0.36/intltool-extract.in 2008-02-25 13:45:01.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/intltool-extract.in gdesklets-0.35.4/intltool-extract.in
+--- gdesklets-0.35.4.orig/intltool-extract.in 2006-10-05 20:04:21.000000000 +0800
++++ gdesklets-0.35.4/intltool-extract.in 2008-02-15 01:20:20.000000000 +0800
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
--my $VERSION = "0.35.5";
-+my $VERSION = "0.37.1";
+-my $VERSION = "0.35.0";
++my $VERSION = "0.37.0";
## Loaded modules
use strict;
-@@ -161,7 +161,8 @@
+@@ -114,6 +114,11 @@
+ sub place_normal {
+ $FILE = $ARGV[0];
+ $OUTFILE = "$FILE.h";
++
++ my $dirname = dirname ($OUTFILE);
++ if (! -d "$dirname" && $dirname ne "") {
++ system ("mkdir -p $dirname");
++ }
+ }
+
+ sub place_local {
+@@ -156,7 +161,8 @@
--type=TYPE Specify the file type of FILENAME. Currently supports:
"gettext/glade", "gettext/ini", "gettext/keys"
"gettext/rfc822deb", "gettext/schemas",
-- "gettext/scheme", "gettext/xml", "gettext/quoted"
+- "gettext/scheme", "gettext/xml"
+ "gettext/scheme", "gettext/xml", "gettext/quoted",
+ "gettext/quotedxml"
-l, --local Writes output into current working directory
(conflicts with --update)
--update Writes output into the same directory the source file
-@@ -218,6 +219,7 @@
+@@ -212,6 +218,8 @@
+ &type_scheme if $gettext_type eq "scheme";
&type_schemas if $gettext_type eq "schemas";
&type_rfc822deb if $gettext_type eq "rfc822deb";
- &type_quoted if $gettext_type eq "quoted";
++ &type_quoted if $gettext_type eq "quoted";
+ &type_quotedxml if $gettext_type eq "quotedxml";
}
sub entity_decode_minimal
-@@ -237,9 +239,9 @@
+@@ -231,9 +239,9 @@
s/'/'/g; # '
s/"/"/g; # "
@@ -16491,10 +14040,44 @@
return $_;
}
-@@ -731,6 +733,18 @@
+@@ -242,7 +250,7 @@
+ {
+ return '\"' if $_ eq '"';
+ return '\n' if $_ eq "\n";
+- return '\\' if $_ eq '\\';
++ return '\\\\' if $_ eq '\\';
+
+ return $_;
+ }
+@@ -255,8 +263,11 @@
+
+ sub type_ini {
+ ### For generic translatable desktop files ###
+- while ($input =~ /^_.*=(.*)$/mg) {
+- $messages{$1} = [];
++ while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
++ if (defined($2)) {
++ $comments{$3} = $2;
++ }
++ $messages{$3} = [];
}
}
+@@ -711,6 +722,29 @@
+ return @list;
+ }
+
++sub type_quoted {
++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
++ my $message = $1;
++ my $before = $`;
++ $message =~ s/\\\"/\"/g;
++ $before =~ s/[^\n]//g;
++ $messages{$message} = [];
++ $loc{$message} = length ($before) + 2;
++ }
++}
++
+sub type_quotedxml {
+ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
+ my $message = $1;
@@ -16510,35 +14093,37 @@
sub type_glade {
### For translatable Glade XML files ###
-diff -urN gdesklets-0.36.orig/intltool-merge.in gdesklets-0.36/intltool-merge.in
---- gdesklets-0.36.orig/intltool-merge.in 2008-02-17 01:45:23.000000000 +0800
-+++ gdesklets-0.36/intltool-merge.in 2008-02-25 13:45:01.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/intltool-merge.in gdesklets-0.35.4/intltool-merge.in
+--- gdesklets-0.35.4.orig/intltool-merge.in 2006-10-05 20:04:21.000000000 +0800
++++ gdesklets-0.35.4/intltool-merge.in 2008-02-15 01:20:20.000000000 +0800
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
--my $VERSION = "0.35.5";
-+my $VERSION = "0.37.1";
+-my $VERSION = "0.35.0";
++my $VERSION = "0.37.0";
## Loaded modules
use strict;
-@@ -61,6 +61,7 @@
+@@ -60,6 +60,8 @@
+ my $DESKTOP_STYLE_ARG = 0;
my $SCHEMAS_STYLE_ARG = 0;
my $RFC822DEB_STYLE_ARG = 0;
- my $QUOTED_STYLE_ARG = 0;
++my $QUOTED_STYLE_ARG = 0;
+my $QUOTEDXML_STYLE_ARG = 0;
my $QUIET_ARG = 0;
my $PASS_THROUGH_ARG = 0;
my $UTF8_ARG = 0;
-@@ -81,6 +82,7 @@
+@@ -79,6 +81,8 @@
+ "desktop-style|d" => \$DESKTOP_STYLE_ARG,
"schemas-style|s" => \$SCHEMAS_STYLE_ARG,
"rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
- "quoted-style" => \$QUOTED_STYLE_ARG,
++ "quoted-style" => \$QUOTED_STYLE_ARG,
+ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
"pass-through|p" => \$PASS_THROUGH_ARG,
"utf8|u" => \$UTF8_ARG,
"multiple-output|m" => \$MULTIPLE_OUTPUT,
-@@ -93,9 +95,24 @@
+@@ -91,9 +95,24 @@
my %po_files_by_lang = ();
my %translations = ();
@@ -16564,7 +14149,7 @@
# Use this instead of \w for XML files to handle more possible characters.
my $w = "[-A-Za-z0-9._:]";
-@@ -133,7 +150,7 @@
+@@ -131,7 +150,7 @@
&utf8_sanity_check;
&preparation;
&print_message;
@@ -16573,30 +14158,31 @@
&finalize;
}
elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
-@@ -159,12 +176,12 @@
+@@ -157,6 +176,14 @@
&rfc822deb_merge_translations;
&finalize;
}
--elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
+elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
++{
++ &utf8_sanity_check;
++ &preparation;
++ &print_message;
++ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
++ &finalize;
++}
+ else
{
- &utf8_sanity_check;
- &preparation;
- &print_message;
-- "ed_merge_translations;
-+ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
- &finalize;
- }
- else
-@@ -204,6 +221,7 @@
+ &print_help;
+@@ -193,6 +220,8 @@
+ -k, --keys-style includes translations in the keys style
-s, --schemas-style includes translations in the schemas style
-r, --rfc822deb-style includes translations in the RFC822 style
- --quoted-style includes translations in the quoted string style
++ --quoted-style includes translations in the quoted string style
+ --quotedxml-style includes translations in the quoted xml string style
-x, --xml-style includes translations in the standard xml style
Other options:
-@@ -260,8 +278,41 @@
+@@ -249,8 +278,41 @@
sub gather_po_files
{
@@ -16640,7 +14226,33 @@
}
}
-@@ -494,16 +545,15 @@
+@@ -415,7 +477,7 @@
+ {
+ $nextfuzzy = 1 if /^#, fuzzy/;
+
+- if (/^msgid "((\\.|[^\\])*)"/ )
++ if (/^msgid "((\\.|[^\\]+)*)"/ )
+ {
+ $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
+ $msgid = "";
+@@ -431,14 +493,14 @@
+ $nextfuzzy = 0;
+ }
+
+- if (/^msgstr "((\\.|[^\\])*)"/)
++ if (/^msgstr "((\\.|[^\\]+)*)"/)
+ {
+ $msgstr = unescape_po_string($1);
+ $inmsgstr = 1;
+ $inmsgid = 0;
+ }
+
+- if (/^"((\\.|[^\\])*)"/)
++ if (/^"((\\.|[^\\]+)*)"/)
+ {
+ $msgid .= unescape_po_string($1) if $inmsgid;
+ $msgstr .= unescape_po_string($1) if $inmsgstr;
+@@ -483,16 +545,15 @@
return $string;
}
@@ -16659,7 +14271,7 @@
return $_;
}
-@@ -528,6 +578,7 @@
+@@ -517,6 +578,7 @@
return "&" if $_ == 38;
return "'" if $_ == 39;
return "<" if $_ == 60;
@@ -16667,7 +14279,18 @@
return chr $_;
}
-@@ -1028,43 +1079,74 @@
+@@ -1006,8 +1068,8 @@
+
+ if ($MULTIPLE_OUTPUT) {
+ for my $lang (sort keys %po_files_by_lang) {
+- if ( ! -e $lang ) {
+- mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
++ if ( ! -d $lang ) {
++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+ }
+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+@@ -1017,43 +1079,74 @@
close OUTPUT;
print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
}
@@ -16764,7 +14387,7 @@
{
print OUTPUT;
}
-@@ -1072,6 +1154,24 @@
+@@ -1061,6 +1154,24 @@
close OUTPUT;
close INPUT;
@@ -16789,49 +14412,58 @@
}
sub desktop_merge_translations
-@@ -1367,19 +1467,22 @@
-
- sub quoted_translation
- {
-- my ($lang, $string) = @_;
+@@ -1354,3 +1465,42 @@
+ return @list;
+ }
+
++sub quoted_translation
++{
+ my ($xml_mode, $lang, $string) = @_;
-
++
+ $string = entity_decode($string) if $xml_mode;
- $string =~ s/\\\"/\"/g;
-
- my $translation = $translations{$lang, $string};
- $translation = $string if !$translation;
--
++ $string =~ s/\\\"/\"/g;
++
++ my $translation = $translations{$lang, $string};
++ $translation = $string if !$translation;
+ $translation = entity_encode($translation) if $xml_mode;
- $translation =~ s/\"/\\\"/g;
- return $translation
- }
-
- sub quoted_merge_translations
- {
++ $translation =~ s/\"/\\\"/g;
++ return $translation
++}
++
++sub quoted_merge_translations
++{
+ my ($xml_mode) = @_;
+
- if (!$MULTIPLE_OUTPUT) {
- print "Quoted only supports Multiple Output.\n";
- exit(1);
-@@ -1394,7 +1497,7 @@
- binmode (OUTPUT) if $^O eq 'MSWin32';
- while (<INPUT>)
- {
-- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
++ if (!$MULTIPLE_OUTPUT) {
++ print "Quoted only supports Multiple Output.\n";
++ exit(1);
++ }
++
++ for my $lang (sort keys %po_files_by_lang) {
++ if ( ! -d $lang ) {
++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++ }
++ open INPUT, "<${FILE}" or die;
++ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ while (<INPUT>)
++ {
+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
- print OUTPUT;
- }
- close OUTPUT;
-diff -urN gdesklets-0.36.orig/intltool-update.in gdesklets-0.36/intltool-update.in
---- gdesklets-0.36.orig/intltool-update.in 2008-02-17 01:45:23.000000000 +0800
-+++ gdesklets-0.36/intltool-update.in 2008-02-25 13:45:01.000000000 +0800
++ print OUTPUT;
++ }
++ close OUTPUT;
++ close INPUT;
++ }
++}
+diff -urN gdesklets-0.35.4.orig/intltool-update.in gdesklets-0.35.4/intltool-update.in
+--- gdesklets-0.35.4.orig/intltool-update.in 2006-10-05 20:04:21.000000000 +0800
++++ gdesklets-0.35.4/intltool-update.in 2008-02-15 01:20:20.000000000 +0800
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
--my $VERSION = "0.35.5";
-+my $VERSION = "0.37.1";
+-my $VERSION = "0.35.0";
++my $VERSION = "0.37.0";
my $PACKAGE = "intltool";
## Loaded modules
@@ -16845,7 +14477,41 @@
my $ini_support =
"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
-@@ -328,7 +329,12 @@
+@@ -90,10 +91,9 @@
+ $| = 1;
+
+ ## Sometimes the source tree will be rooted somewhere else.
+-my $SRCDIR = ".";
++my $SRCDIR = $ENV{"srcdir"} || ".";
+ my $POTFILES_in;
+
+-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
+ $POTFILES_in = "<$SRCDIR/POTFILES.in";
+
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+@@ -124,8 +124,10 @@
+
+ &Console_Write_IntltoolHelp if $arg_count > 1;
+
++my $PKGNAME = FindPackageName ();
++
+ # --version and --help don't require a module name
+-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
++my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
+
+ if ($POT_ARG)
+ {
+@@ -316,7 +318,8 @@
+ @buf_potfiles_ignore,
+ @buf_allfiles,
+ @buf_allfiles_sorted,
+- @buf_potfiles_sorted
++ @buf_potfiles_sorted,
++ @buf_potfiles_ignore_sorted
+ );
+
+ ## Search and find all translatable files
+@@ -326,7 +329,12 @@
push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
}, "..";
@@ -16859,34 +14525,69 @@
open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
@buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-@@ -428,8 +434,8 @@
+@@ -342,7 +350,7 @@
+ ## comparing with POTFILES.in
+ foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
+ {
+- (-s $ignore) or next;
++ (-s "$SRCDIR/$ignore") or next;
+
+ if ("$ignore" eq "POTFILES.ignore")
+ {
+@@ -351,7 +359,7 @@
+ }
+
+ print "Found $ignore: Ignoring files...\n" if $VERBOSE;
+- open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
++ open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
+
+ while (<FILE>)
+ {
+@@ -359,7 +367,7 @@
+ }
+ close FILE;
+
+- @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
++ @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
+ }
+
+ foreach my $file (@buf_i18n_plain)
+@@ -417,7 +425,7 @@
+ }
+ }
+
+- if (/\.GetString ?\(QUOTEDTEXT/)
++ if (/\w\.GetString *\(QUOTEDTEXT/)
+ {
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ ## Remove the first 3 chars and add newline
+@@ -426,7 +434,8 @@
last;
}
-- ## N_ Q_ and _ are the three macros defined in gi8n.h
-- if (/[NQ]?_ *\(QUOTEDTEXT/)
+- if (/_\(QUOTEDTEXT/)
+ ## C_ N_ Q_ and _ are the macros defined in gi8n.h
+ if (/[CNQ]?_ *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
-@@ -489,11 +495,15 @@
+@@ -486,6 +495,15 @@
my %in2;
foreach (@buf_potfiles_sorted)
{
+ s#^$SRCDIR/../##;
+ s#^$SRCDIR/##;
- $in2{$_} = 1;
- }
-
- foreach (@buf_potfiles_ignore_sorted)
- {
++ $in2{$_} = 1;
++ }
++
++ foreach (@buf_potfiles_ignore_sorted)
++ {
+ s#^$SRCDIR/../##;
+ s#^$SRCDIR/##;
$in2{$_} = 1;
}
-@@ -501,9 +511,16 @@
+@@ -493,9 +511,16 @@
foreach (@buf_allfiles_sorted)
{
@@ -16905,20 +14606,40 @@
}
}
-@@ -563,11 +580,23 @@
+@@ -504,7 +529,7 @@
+ foreach (@buf_potfiles_sorted)
+ {
+ chomp (my $dummy = $_);
+- if ("$dummy" ne "" and ! -f "../$dummy")
++ if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
+ {
+ push @buf_potfiles_notexist, $_;
+ }
+@@ -537,7 +562,7 @@
+ warn "\n" if ($VERBOSE or @result);
+ warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
+ warn @buf_potfiles_notexist, "\n";
+- warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
++ warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
+ "containing this list of absent files has been written in the current directory.\n";
+ }
+ }
+@@ -555,16 +580,33 @@
exit 1;
}
--sub isIntltoolExtractInPath
+-sub GenerateHeaders
+sub isProgramInPath
{
- my ($file) = @_;
- # If either a file exists, or when run it returns 0 exit status
-- return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
+- my $EXTRACT = "@INTLTOOL_EXTRACT@";
+- chomp $EXTRACT;
++ my ($file) = @_;
++ # If either a file exists, or when run it returns 0 exit status
+ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+ return 0;
+}
-+
+
+- $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
+sub isGNUGettextTool
+{
+ my ($file) = @_;
@@ -16928,19 +14649,21 @@
+ my $version = `$file --version`;
+ return 1 if ($version =~ m/.*\(GNU .*\).*/);
+ }
- return 0;
- }
-
-@@ -577,7 +606,7 @@
++ return 0;
++}
++
++sub GenerateHeaders
++{
++ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
## Generate the .h header files, so we can allow glade and
## xml translation support
-- if (! isIntltoolExtractInPath("$EXTRACT"))
+- if (! -x "$EXTRACT")
+ if (! isProgramInPath ("$EXTRACT"))
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
-@@ -624,13 +653,13 @@
+@@ -611,13 +653,13 @@
#
sub GeneratePOTemplate
{
@@ -16957,7 +14680,22 @@
" *** Without it, intltool-update can not extract strings.\n";
exit;
}
-@@ -726,13 +755,29 @@
+@@ -671,12 +713,8 @@
+ }
+ else
+ {
+- if ($SRCDIR eq ".") {
+- print OUTFILE "../$_\n";
+- } else {
+- print OUTFILE "$SRCDIR/../$_\n";
+- }
+- $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
++ print OUTFILE "$SRCDIR/../$_\n";
++ $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+ }
+
+ next if (! $gettext_support_nonascii);
+@@ -717,13 +755,29 @@
unlink "$MODULE.pot";
my @xgettext_argument=("$XGETTEXT",
"--add-comments",
@@ -16989,7 +14727,7 @@
push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
my $xgettext_command = join ' ', @xgettext_argument;
-@@ -793,9 +838,16 @@
+@@ -784,9 +838,16 @@
{
-f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
@@ -17007,7 +14745,7 @@
print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
my $infile = "$SRCDIR/$lang.po";
-@@ -836,7 +888,14 @@
+@@ -827,7 +888,14 @@
sub Console_Write_TranslationStatus
{
my ($lang, $output_file) = @_;
@@ -17023,7 +14761,7 @@
$output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
-@@ -845,21 +904,28 @@
+@@ -836,21 +904,28 @@
sub Console_Write_CoverageReport
{
@@ -17056,7 +14794,7 @@
system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
}
}
-@@ -933,13 +999,13 @@
+@@ -924,13 +999,13 @@
$conf_in || die "Cannot find top_builddir in Makevars.";
}
@@ -17074,7 +14812,7 @@
}
else
{
-@@ -1052,6 +1118,8 @@
+@@ -1043,6 +1118,8 @@
close IN;
}
@@ -17083,9 +14821,9 @@
$keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
return $keywords;
-diff -urN gdesklets-0.36.orig/layout/Makefile.in gdesklets-0.36/layout/Makefile.in
---- gdesklets-0.36.orig/layout/Makefile.in 2008-02-17 01:45:53.000000000 +0800
-+++ gdesklets-0.36/layout/Makefile.in 2008-03-01 01:27:32.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/layout/Makefile.in gdesklets-0.35.4/layout/Makefile.in
+--- gdesklets-0.35.4.orig/layout/Makefile.in 2006-10-05 20:04:36.000000000 +0800
++++ gdesklets-0.35.4/layout/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17162,7 +14900,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -17172,13 +14910,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -17186,7 +14924,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -17204,7 +14942,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -17212,7 +14950,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -17224,7 +14962,7 @@
installdir = ${coredir}/layout
install_DATA = \
__init__.py \
-@@ -286,13 +285,9 @@
+@@ -289,13 +289,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -17239,7 +14977,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -320,7 +315,7 @@
+@@ -323,7 +319,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -17248,7 +14986,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -343,22 +338,21 @@
+@@ -346,22 +342,21 @@
distdir: $(DISTFILES)
@@ -17284,7 +15022,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +368,7 @@
+@@ -377,7 +372,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -17293,7 +15031,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +401,7 @@
+@@ -410,7 +405,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -17302,7 +15040,7 @@
dvi: dvi-am
-@@ -421,12 +415,20 @@
+@@ -424,12 +419,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -17323,7 +15061,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +447,22 @@
+@@ -448,20 +451,22 @@
ps-am:
@@ -17352,9 +15090,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/libdesklets/controls/Makefile.in gdesklets-0.36/libdesklets/controls/Makefile.in
---- gdesklets-0.36.orig/libdesklets/controls/Makefile.in 2008-02-17 01:45:54.000000000 +0800
-+++ gdesklets-0.36/libdesklets/controls/Makefile.in 2008-03-01 01:27:33.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/libdesklets/controls/Makefile.in gdesklets-0.35.4/libdesklets/controls/Makefile.in
+--- gdesklets-0.35.4.orig/libdesklets/controls/Makefile.in 2006-10-05 20:04:36.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/controls/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17431,7 +15169,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -17441,13 +15179,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -17455,7 +15193,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -17473,7 +15211,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -17481,7 +15219,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -17493,7 +15231,7 @@
installdir = ${coredir}/libdesklets/controls
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -17508,7 +15246,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -17517,7 +15255,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -17553,7 +15291,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -17562,7 +15300,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -17571,7 +15309,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -17592,7 +15330,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -17621,9 +15359,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/libdesklets/Makefile.in gdesklets-0.36/libdesklets/Makefile.in
---- gdesklets-0.36.orig/libdesklets/Makefile.in 2008-02-17 01:45:54.000000000 +0800
-+++ gdesklets-0.36/libdesklets/Makefile.in 2008-03-01 01:27:33.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/libdesklets/Makefile.in gdesklets-0.35.4/libdesklets/Makefile.in
+--- gdesklets-0.35.4.orig/libdesklets/Makefile.in 2006-10-05 20:04:36.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17724,7 +15462,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,12 +145,13 @@
+@@ -149,11 +145,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -17734,13 +15472,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -176,6 +173,7 @@
+@@ -175,6 +173,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -17748,7 +15486,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -194,13 +192,13 @@
+@@ -197,13 +196,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -17766,7 +15504,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -212,6 +210,7 @@
+@@ -215,6 +214,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -17774,7 +15512,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -245,8 +244,11 @@
+@@ -248,8 +248,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -17786,7 +15524,7 @@
installdir = ${coredir}/libdesklets
install_DATA = \
__init__.py \
-@@ -298,13 +300,9 @@
+@@ -301,13 +304,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -17801,7 +15539,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -332,7 +330,7 @@
+@@ -335,7 +334,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -17810,7 +15548,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -379,8 +377,7 @@
+@@ -382,8 +381,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -17820,7 +15558,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -424,8 +421,8 @@
+@@ -427,8 +425,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17831,7 +15569,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -450,8 +447,8 @@
+@@ -453,8 +451,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17842,7 +15580,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -461,13 +458,12 @@
+@@ -464,13 +462,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -17858,7 +15596,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -481,22 +477,21 @@
+@@ -484,22 +481,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -17894,7 +15632,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -510,7 +505,7 @@
+@@ -513,7 +509,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -17903,7 +15641,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -518,6 +513,8 @@
+@@ -521,6 +517,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -17912,7 +15650,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -528,7 +525,7 @@
+@@ -531,7 +529,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -17921,7 +15659,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -561,8 +558,7 @@
+@@ -564,8 +562,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -17931,7 +15669,7 @@
dvi: dvi-recursive
-@@ -576,12 +572,20 @@
+@@ -579,12 +576,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -17952,7 +15690,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -600,24 +604,25 @@
+@@ -603,24 +608,25 @@
ps-am:
@@ -17991,9 +15729,9 @@
uninstall-installPYTHON
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN gdesklets-0.36.orig/libdesklets/system/FreeBSD/Makefile.in gdesklets-0.36/libdesklets/system/FreeBSD/Makefile.in
---- gdesklets-0.36.orig/libdesklets/system/FreeBSD/Makefile.in 2008-02-17 01:45:55.000000000 +0800
-+++ gdesklets-0.36/libdesklets/system/FreeBSD/Makefile.in 2008-03-01 01:27:33.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/libdesklets/system/FreeBSD/Makefile.in gdesklets-0.35.4/libdesklets/system/FreeBSD/Makefile.in
+--- gdesklets-0.35.4.orig/libdesklets/system/FreeBSD/Makefile.in 2006-10-05 20:04:36.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/system/FreeBSD/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18070,7 +15808,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -18080,13 +15818,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -18094,7 +15832,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -18112,7 +15850,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -18120,7 +15858,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -18132,7 +15870,7 @@
installdir = ${coredir}/libdesklets/system/FreeBSD
install_DATA = \
__init__.py \
-@@ -284,13 +283,9 @@
+@@ -287,13 +287,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -18147,7 +15885,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -318,7 +313,7 @@
+@@ -321,7 +317,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -18156,7 +15894,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -341,22 +336,21 @@
+@@ -344,22 +340,21 @@
distdir: $(DISTFILES)
@@ -18192,7 +15930,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -372,7 +366,7 @@
+@@ -375,7 +370,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -18201,7 +15939,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -405,7 +399,7 @@
+@@ -408,7 +403,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -18210,7 +15948,7 @@
dvi: dvi-am
-@@ -419,12 +413,20 @@
+@@ -422,12 +417,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -18231,7 +15969,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -443,20 +445,22 @@
+@@ -446,20 +449,22 @@
ps-am:
@@ -18260,9 +15998,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/libdesklets/system/Linux/Makefile.in gdesklets-0.36/libdesklets/system/Linux/Makefile.in
---- gdesklets-0.36.orig/libdesklets/system/Linux/Makefile.in 2008-02-17 01:45:55.000000000 +0800
-+++ gdesklets-0.36/libdesklets/system/Linux/Makefile.in 2008-03-01 01:27:33.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/libdesklets/system/Linux/Makefile.in gdesklets-0.35.4/libdesklets/system/Linux/Makefile.in
+--- gdesklets-0.35.4.orig/libdesklets/system/Linux/Makefile.in 2006-10-05 20:04:37.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/system/Linux/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18339,7 +16077,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -18349,13 +16087,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -18363,7 +16101,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -18381,7 +16119,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -18389,7 +16127,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -18401,7 +16139,7 @@
installdir = ${coredir}/libdesklets/system/Linux
install_DATA = \
__init__.py \
-@@ -287,13 +286,9 @@
+@@ -290,13 +290,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -18416,7 +16154,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -321,7 +316,7 @@
+@@ -324,7 +320,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -18425,7 +16163,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -344,22 +339,21 @@
+@@ -347,22 +343,21 @@
distdir: $(DISTFILES)
@@ -18461,7 +16199,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -375,7 +369,7 @@
+@@ -378,7 +373,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -18470,7 +16208,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -408,7 +402,7 @@
+@@ -411,7 +406,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -18479,7 +16217,7 @@
dvi: dvi-am
-@@ -422,12 +416,20 @@
+@@ -425,12 +420,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -18500,7 +16238,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -446,20 +448,22 @@
+@@ -449,20 +452,22 @@
ps-am:
@@ -18529,9 +16267,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/libdesklets/system/Makefile.in gdesklets-0.36/libdesklets/system/Makefile.in
---- gdesklets-0.36.orig/libdesklets/system/Makefile.in 2008-02-17 01:45:56.000000000 +0800
-+++ gdesklets-0.36/libdesklets/system/Makefile.in 2008-03-01 01:27:33.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/libdesklets/system/Makefile.in gdesklets-0.35.4/libdesklets/system/Makefile.in
+--- gdesklets-0.35.4.orig/libdesklets/system/Makefile.in 2006-10-05 20:04:37.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/system/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18654,7 +16392,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -168,12 +168,13 @@
+@@ -168,11 +168,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -18664,13 +16402,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -195,6 +196,7 @@
+@@ -194,6 +196,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -18678,7 +16416,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -213,13 +215,13 @@
+@@ -216,13 +219,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -18696,7 +16434,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -231,6 +233,7 @@
+@@ -234,6 +237,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -18704,7 +16442,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -264,8 +267,11 @@
+@@ -267,8 +271,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -18716,7 +16454,7 @@
INCLUDES = \
$(GLIBTOP_CFLAGS) \
$(PYTHON_CFLAGS)
-@@ -328,21 +334,21 @@
+@@ -331,21 +338,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-installLTLIBRARIES: $(install_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -18744,7 +16482,7 @@
done
clean-installLTLIBRARIES:
-@@ -354,7 +360,7 @@
+@@ -357,7 +364,7 @@
rm -f "$${dir}/so_locations"; \
done
gtop.la: $(gtop_la_OBJECTS) $(gtop_la_DEPENDENCIES)
@@ -18753,7 +16491,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -365,22 +371,22 @@
+@@ -368,22 +375,22 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtop.Plo at am__quote@
.c.o:
@@ -18782,7 +16520,7 @@
@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 $@ $<
-@@ -390,13 +396,9 @@
+@@ -393,13 +400,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -18797,7 +16535,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -424,7 +426,7 @@
+@@ -427,7 +430,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -18806,7 +16544,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -471,8 +473,7 @@
+@@ -474,8 +477,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -18816,7 +16554,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -516,8 +517,8 @@
+@@ -519,8 +521,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18827,7 +16565,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -542,8 +543,8 @@
+@@ -545,8 +547,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18838,7 +16576,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -553,13 +554,12 @@
+@@ -556,13 +558,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -18854,7 +16592,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -573,22 +573,21 @@
+@@ -576,22 +577,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -18890,7 +16628,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -602,7 +601,7 @@
+@@ -605,7 +605,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -18899,7 +16637,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -610,6 +609,8 @@
+@@ -613,6 +613,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -18908,7 +16646,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -620,7 +621,7 @@
+@@ -623,7 +625,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -18917,7 +16655,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -656,7 +657,7 @@
+@@ -659,7 +661,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -18926,7 +16664,7 @@
dvi: dvi-recursive
-@@ -671,12 +672,20 @@
+@@ -674,12 +676,20 @@
install-data-am: install-installDATA install-installLTLIBRARIES \
install-installPYTHON
@@ -18947,7 +16685,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -697,25 +706,27 @@
+@@ -700,25 +710,27 @@
ps-am:
@@ -18989,9 +16727,9 @@
uninstall-installDATA uninstall-installLTLIBRARIES \
uninstall-installPYTHON
-diff -urN gdesklets-0.36.orig/libdesklets/system/NetBSD/Makefile.in gdesklets-0.36/libdesklets/system/NetBSD/Makefile.in
---- gdesklets-0.36.orig/libdesklets/system/NetBSD/Makefile.in 2008-02-17 01:45:56.000000000 +0800
-+++ gdesklets-0.36/libdesklets/system/NetBSD/Makefile.in 2008-03-01 01:27:33.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/libdesklets/system/NetBSD/Makefile.in gdesklets-0.35.4/libdesklets/system/NetBSD/Makefile.in
+--- gdesklets-0.35.4.orig/libdesklets/system/NetBSD/Makefile.in 2006-10-05 20:04:37.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/system/NetBSD/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19068,7 +16806,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -19078,13 +16816,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -19092,7 +16830,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -19110,7 +16848,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -19118,7 +16856,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -19130,7 +16868,7 @@
installdir = ${coredir}/libdesklets/system/NetBSD
install_DATA = \
__init__.py \
-@@ -284,13 +283,9 @@
+@@ -287,13 +287,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -19145,7 +16883,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -318,7 +313,7 @@
+@@ -321,7 +317,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -19154,7 +16892,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -341,22 +336,21 @@
+@@ -344,22 +340,21 @@
distdir: $(DISTFILES)
@@ -19190,7 +16928,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -372,7 +366,7 @@
+@@ -375,7 +370,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -19199,7 +16937,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -405,7 +399,7 @@
+@@ -408,7 +403,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -19208,7 +16946,7 @@
dvi: dvi-am
-@@ -419,12 +413,20 @@
+@@ -422,12 +417,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -19229,7 +16967,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -443,20 +445,22 @@
+@@ -446,20 +449,22 @@
ps-am:
@@ -19258,9 +16996,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/libdesklets/system/OpenBSD/Makefile.in gdesklets-0.36/libdesklets/system/OpenBSD/Makefile.in
---- gdesklets-0.36.orig/libdesklets/system/OpenBSD/Makefile.in 2008-02-17 01:45:57.000000000 +0800
-+++ gdesklets-0.36/libdesklets/system/OpenBSD/Makefile.in 2008-03-01 01:27:33.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/libdesklets/system/OpenBSD/Makefile.in gdesklets-0.35.4/libdesklets/system/OpenBSD/Makefile.in
+--- gdesklets-0.35.4.orig/libdesklets/system/OpenBSD/Makefile.in 2006-10-05 20:04:37.000000000 +0800
++++ gdesklets-0.35.4/libdesklets/system/OpenBSD/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19337,7 +17075,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -19347,13 +17085,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -19361,7 +17099,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -19379,7 +17117,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -19387,7 +17125,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -19399,7 +17137,7 @@
installdir = ${coredir}/libdesklets/system/OpenBSD
install_DATA = \
__init__.py \
-@@ -284,13 +283,9 @@
+@@ -287,13 +287,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -19414,7 +17152,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -318,7 +313,7 @@
+@@ -321,7 +317,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -19423,7 +17161,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -341,22 +336,21 @@
+@@ -344,22 +340,21 @@
distdir: $(DISTFILES)
@@ -19459,7 +17197,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -372,7 +366,7 @@
+@@ -375,7 +370,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -19468,7 +17206,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -405,7 +399,7 @@
+@@ -408,7 +403,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -19477,7 +17215,7 @@
dvi: dvi-am
-@@ -419,12 +413,20 @@
+@@ -422,12 +417,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -19498,7 +17236,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -443,20 +445,22 @@
+@@ -446,20 +449,22 @@
ps-am:
@@ -19527,9 +17265,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/ltmain.sh gdesklets-0.36/ltmain.sh
---- gdesklets-0.36.orig/ltmain.sh 2006-06-20 02:36:49.000000000 +0800
-+++ gdesklets-0.36/ltmain.sh 2008-02-02 21:28:24.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/ltmain.sh gdesklets-0.35.4/ltmain.sh
+--- gdesklets-0.35.4.orig/ltmain.sh 2006-06-20 02:36:49.000000000 +0800
++++ gdesklets-0.35.4/ltmain.sh 2008-02-02 21:28:24.000000000 +0800
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -20170,9 +17908,9 @@
All other options (arguments beginning with \`-') are ignored.
-diff -urN gdesklets-0.36.orig/main/Makefile.in gdesklets-0.36/main/Makefile.in
---- gdesklets-0.36.orig/main/Makefile.in 2008-02-17 01:45:57.000000000 +0800
-+++ gdesklets-0.36/main/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/main/Makefile.in gdesklets-0.35.4/main/Makefile.in
+--- gdesklets-0.35.4.orig/main/Makefile.in 2006-10-05 20:04:37.000000000 +0800
++++ gdesklets-0.35.4/main/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20249,7 +17987,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -20259,13 +17997,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -20273,7 +18011,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -20291,7 +18029,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -20299,7 +18037,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -20311,7 +18049,7 @@
installdir = ${coredir}/main
install_DATA = \
__init__.py \
-@@ -293,13 +292,9 @@
+@@ -296,13 +296,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -20326,7 +18064,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -327,7 +322,7 @@
+@@ -330,7 +326,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -20335,7 +18073,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -350,22 +345,21 @@
+@@ -353,22 +349,21 @@
distdir: $(DISTFILES)
@@ -20371,7 +18109,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -381,7 +375,7 @@
+@@ -384,7 +379,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -20380,7 +18118,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -414,7 +408,7 @@
+@@ -417,7 +412,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -20389,7 +18127,7 @@
dvi: dvi-am
-@@ -428,12 +422,20 @@
+@@ -431,12 +426,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -20410,7 +18148,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -452,20 +454,22 @@
+@@ -455,20 +458,22 @@
ps-am:
@@ -20439,9 +18177,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/Makefile.in gdesklets-0.36/Makefile.in
---- gdesklets-0.36.orig/Makefile.in 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/Makefile.in 2008-03-01 01:27:36.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Makefile.in gdesklets-0.35.4/Makefile.in
+--- gdesklets-0.35.4.orig/Makefile.in 2006-10-05 20:04:42.000000000 +0800
++++ gdesklets-0.35.4/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20557,7 +18295,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -156,12 +152,13 @@
+@@ -156,11 +152,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -20567,13 +18305,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -183,6 +180,7 @@
+@@ -182,6 +180,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -20581,7 +18319,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -201,13 +199,13 @@
+@@ -204,13 +203,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -20599,7 +18337,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -219,6 +217,7 @@
+@@ -222,6 +221,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -20607,7 +18345,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -252,8 +251,11 @@
+@@ -255,8 +255,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -20616,10 +18354,10 @@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+ # dist-bzip2 support has landed in automake 1.6
AUTOMAKE_OPTIONS = 1.7 dist-bzip2
- SUBDIRS = \
- Additions \
-@@ -341,7 +343,7 @@
+@@ -344,7 +347,7 @@
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
@@ -20628,7 +18366,7 @@
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -356,7 +358,7 @@
+@@ -359,7 +362,7 @@
-rm -f config.h stamp-h1
install-installSCRIPTS: $(install_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -20637,7 +18375,7 @@
@list='$(install_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -382,7 +384,6 @@
+@@ -385,7 +388,6 @@
distclean-libtool:
-rm -f libtool
@@ -20645,7 +18383,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -415,8 +416,7 @@
+@@ -418,8 +420,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -20655,7 +18393,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -460,8 +460,8 @@
+@@ -463,8 +464,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20666,7 +18404,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -486,8 +486,8 @@
+@@ -489,8 +490,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20677,7 +18415,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -497,13 +497,12 @@
+@@ -500,13 +501,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -20693,7 +18431,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -518,24 +517,22 @@
+@@ -521,24 +521,22 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -20732,7 +18470,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -549,7 +546,7 @@
+@@ -552,7 +550,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -20741,7 +18479,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -557,6 +554,8 @@
+@@ -560,6 +558,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -20750,7 +18488,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -564,7 +563,7 @@
+@@ -567,7 +567,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 \
@@ -20759,7 +18497,7 @@
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -573,6 +572,10 @@
+@@ -576,6 +576,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -20770,7 +18508,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -600,6 +603,8 @@
+@@ -603,6 +607,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -20779,7 +18517,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -639,7 +644,7 @@
+@@ -642,7 +648,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
@@ -20788,7 +18526,7 @@
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -664,7 +669,7 @@
+@@ -667,7 +673,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(installdir)"; do \
@@ -20797,7 +18535,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -715,12 +720,20 @@
+@@ -718,12 +724,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -20818,7 +18556,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -741,26 +754,27 @@
+@@ -744,26 +758,27 @@
ps-am:
@@ -20864,216 +18602,9 @@
install-data-hook:
-diff -urN gdesklets-0.36.orig/missing gdesklets-0.36/missing
---- gdesklets-0.36.orig/missing 2008-02-17 01:45:38.000000000 +0800
-+++ gdesklets-0.36/missing 2008-03-01 01:27:29.000000000 +0800
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
-
--scriptversion=2005-06-08.21
-+scriptversion=2006-05-10.23
-
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-
-@@ -33,6 +33,8 @@
- fi
-
- run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
- # In the cases where this matters, `missing' is being run in the
- # srcdir already.
-@@ -44,7 +46,7 @@
-
- msg="missing on your system"
-
--case "$1" in
-+case $1 in
- --run)
- # Try to run requested program, and just exit if it succeeds.
- run=
-@@ -77,6 +79,7 @@
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
-+ autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
-@@ -106,7 +109,7 @@
- # Now exit if we have it, but it failed. Also exit now if we
- # don't have it and --version was passed (most likely to detect
- # the program).
--case "$1" in
-+case $1 in
- lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
-@@ -135,7 +138,7 @@
-
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
--case "$1" in
-+case $1 in
- aclocal*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
-@@ -164,7 +167,7 @@
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
-- case "$f" in
-+ case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
-@@ -192,8 +195,8 @@
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
-- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
-@@ -214,25 +217,25 @@
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
-- if [ $# -ne 1 ]; then
-+ if test $# -ne 1; then
- eval LASTARG="\${$#}"
-- case "$LASTARG" in
-+ case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
-- if [ ! -f y.tab.h ]; then
-+ if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
-- if [ ! -f y.tab.c ]; then
-+ if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-@@ -244,18 +247,18 @@
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
-- if [ $# -ne 1 ]; then
-+ if test $# -ne 1; then
- eval LASTARG="\${$#}"
-- case "$LASTARG" in
-+ case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-- if [ -f "$SRCFILE" ]; then
-+ if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
-- if [ ! -f lex.yy.c ]; then
-+ if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-@@ -267,11 +270,9 @@
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-- if test -z "$file"; then
-- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-- fi
-- if [ -f "$file" ]; then
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+ if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
-@@ -289,11 +290,17 @@
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
-- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+ file=`sed -n '
-+ /^@setfilename/{
-+ s/.* \([^ ]*\) *$/\1/
-+ p
-+ q
-+ }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
-@@ -317,13 +324,13 @@
- fi
- firstarg="$1"
- if shift; then
-- case "$firstarg" in
-+ case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
-- case "$firstarg" in
-+ case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
-diff -urN gdesklets-0.36.orig/mkinstalldirs gdesklets-0.36/mkinstalldirs
---- gdesklets-0.36.orig/mkinstalldirs 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/mkinstalldirs 2008-03-01 01:27:35.000000000 +0800
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
-
--scriptversion=2005-06-29.22
-+scriptversion=2006-05-11.19
-
- # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
- # Created: 1993-05-16
-@@ -11,6 +11,9 @@
- # bugs to <bug-automake at gnu.org> or send patches to
- # <automake-patches at gnu.org>.
-
-+nl='
-+'
-+IFS=" "" $nl"
- errstatus=0
- dirmode=
-
-diff -urN gdesklets-0.36.orig/plugin/Makefile.in gdesklets-0.36/plugin/Makefile.in
---- gdesklets-0.36.orig/plugin/Makefile.in 2008-02-17 01:45:58.000000000 +0800
-+++ gdesklets-0.36/plugin/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/plugin/Makefile.in gdesklets-0.35.4/plugin/Makefile.in
+--- gdesklets-0.35.4.orig/plugin/Makefile.in 2006-10-05 20:04:38.000000000 +0800
++++ gdesklets-0.35.4/plugin/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21150,7 +18681,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -21160,13 +18691,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -21174,7 +18705,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -21192,7 +18723,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -21200,7 +18731,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -21212,7 +18743,7 @@
installdir = ${coredir}/plugin
install_DATA = \
__init__.py \
-@@ -287,13 +286,9 @@
+@@ -290,13 +290,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -21227,7 +18758,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -321,7 +316,7 @@
+@@ -324,7 +320,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -21236,7 +18767,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -344,22 +339,21 @@
+@@ -347,22 +343,21 @@
distdir: $(DISTFILES)
@@ -21272,7 +18803,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -375,7 +369,7 @@
+@@ -378,7 +373,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -21281,7 +18812,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -408,7 +402,7 @@
+@@ -411,7 +406,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -21290,7 +18821,7 @@
dvi: dvi-am
-@@ -422,12 +416,20 @@
+@@ -425,12 +420,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -21311,7 +18842,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -446,20 +448,22 @@
+@@ -449,20 +452,22 @@
ps-am:
@@ -21340,33 +18871,55 @@
# 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.
-diff -urN gdesklets-0.36.orig/po/Makefile.in.in gdesklets-0.36/po/Makefile.in.in
---- gdesklets-0.36.orig/po/Makefile.in.in 2008-02-17 01:45:23.000000000 +0800
-+++ gdesklets-0.36/po/Makefile.in.in 2008-02-25 13:45:01.000000000 +0800
-@@ -1,10 +1,10 @@
- # Makefile for program source directory in GNU NLS utilities package.
- # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
- #
--# This file file be copied and used freely without restrictions. It can
--# be used in projects which are not available under the GNU Public License
-+# This file may be copied and used freely without restrictions. It may
-+# be used in projects which are not available under a GNU Public License,
- # but which still want to provide support for the GNU gettext functionality.
--# Please note that the actual code is *not* freely available.
- #
- # - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
- # instead of PACKAGE and to look for po2tbl in ./ not in intl/
-@@ -12,7 +12,7 @@
- # - Modified by jacob berkman <jacob at ximian.com> to install
- # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
- #
--# - Modified by Rodney Dawes <dobey at novell.com> for use with intltool
-+# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
- #
- # We have the following line for use by intltoolize:
- # INTLTOOL_MAKEFILE
-@@ -133,7 +133,7 @@
+diff -urN gdesklets-0.35.4.orig/po/Makefile.in.in gdesklets-0.35.4/po/Makefile.in.in
+--- gdesklets-0.35.4.orig/po/Makefile.in.in 2006-10-05 20:04:21.000000000 +0800
++++ gdesklets-0.35.4/po/Makefile.in.in 2008-02-15 01:20:20.000000000 +0800
+@@ -25,7 +25,7 @@
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+-top_builddir = ..
++top_builddir = @top_builddir@
+ VPATH = @srcdir@
+
+ prefix = @prefix@
+@@ -56,15 +56,19 @@
+
+ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+
+-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
++
++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
++
++POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
+ EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+
+ POTFILES = \
+-#This Gets Replace for some reason
++# This comment gets stripped out
+
+-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
++CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+ .SUFFIXES:
+ .SUFFIXES: .po .pox .gmo .mo .msg .cat
+@@ -98,11 +102,7 @@
+ install-data-no: all
+ install-data-yes: all
+ $(mkdir_p) $(DESTDIR)$(itlocaledir)
+- if test -n "$(PO_LINGUAS)"; then \
+- linguas="$(PO_LINGUAS)"; \
+- else \
+- linguas="$(ALL_LINGUAS)"; \
+- fi; \
++ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $$dir; \
+@@ -133,20 +133,21 @@
dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
@@ -21374,10 +18927,53 @@
+install-exec installcheck:
uninstall:
- linguas="$(USE_LINGUAS)"; \
-diff -urN gdesklets-0.36.orig/scripting/Makefile.in gdesklets-0.36/scripting/Makefile.in
---- gdesklets-0.36.orig/scripting/Makefile.in 2008-02-17 01:45:58.000000000 +0800
-+++ gdesklets-0.36/scripting/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+- if test -n "$(PO_LINGUAS)"; then \
+- linguas="$(PO_LINGUAS)"; \
+- else \
+- linguas="$(ALL_LINGUAS)"; \
+- fi; \
++ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ done
+
+ check: all $(GETTEXT_PACKAGE).pot
++ rm -f missing notexist
++ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
++ if [ -r missing -o -r notexist ]; then \
++ exit 1; \
++ fi
+
+ mostlyclean:
+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+@@ -179,11 +180,7 @@
+ update-po: Makefile
+ $(MAKE) $(GETTEXT_PACKAGE).pot
+ tmpdir=`pwd`; \
+- if test -n "$(PO_LINGUAS)"; then \
+- linguas="$(PO_LINGUAS)"; \
+- else \
+- linguas="$(ALL_LINGUAS)"; \
+- fi; \
++ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ echo "$$lang:"; \
+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+@@ -211,8 +208,8 @@
+ $(MAKE) stamp-it; \
+ fi
+
+-stamp-it: Makefile.in.in ../config.status POTFILES.in
+- cd .. \
++stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
++ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+ $(SHELL) ./config.status
+
+diff -urN gdesklets-0.35.4.orig/scripting/Makefile.in gdesklets-0.35.4/scripting/Makefile.in
+--- gdesklets-0.35.4.orig/scripting/Makefile.in 2006-10-05 20:04:38.000000000 +0800
++++ gdesklets-0.35.4/scripting/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21454,7 +19050,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -21464,13 +19060,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -21478,7 +19074,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -21496,7 +19092,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -21504,7 +19100,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -21516,7 +19112,7 @@
installdir = ${coredir}/scripting
install_DATA = \
__init__.py \
-@@ -288,13 +287,9 @@
+@@ -291,13 +291,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -21531,7 +19127,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -322,7 +317,7 @@
+@@ -325,7 +321,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -21540,7 +19136,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -345,22 +340,21 @@
+@@ -348,22 +344,21 @@
distdir: $(DISTFILES)
@@ -21576,7 +19172,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -376,7 +370,7 @@
+@@ -379,7 +374,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -21585,7 +19181,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -409,7 +403,7 @@
+@@ -412,7 +407,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -21594,7 +19190,7 @@
dvi: dvi-am
-@@ -423,12 +417,20 @@
+@@ -426,12 +421,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -21615,7 +19211,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -447,20 +449,22 @@
+@@ -450,20 +453,22 @@
ps-am:
@@ -21644,9 +19240,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/sensor/Makefile.in gdesklets-0.36/sensor/Makefile.in
---- gdesklets-0.36.orig/sensor/Makefile.in 2008-02-17 01:45:58.000000000 +0800
-+++ gdesklets-0.36/sensor/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/sensor/Makefile.in gdesklets-0.35.4/sensor/Makefile.in
+--- gdesklets-0.35.4.orig/sensor/Makefile.in 2006-10-05 20:04:38.000000000 +0800
++++ gdesklets-0.35.4/sensor/Makefile.in 2008-02-18 20:50:57.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21723,7 +19319,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -21733,13 +19329,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -21747,7 +19343,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -21765,7 +19361,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -21773,7 +19369,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -21785,7 +19381,7 @@
installdir = ${coredir}/sensor
install_DATA = \
__init__.py \
-@@ -286,13 +285,9 @@
+@@ -289,13 +289,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -21800,7 +19396,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -320,7 +315,7 @@
+@@ -323,7 +319,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -21809,7 +19405,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -343,22 +338,21 @@
+@@ -346,22 +342,21 @@
distdir: $(DISTFILES)
@@ -21845,7 +19441,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +368,7 @@
+@@ -377,7 +372,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -21854,7 +19450,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +401,7 @@
+@@ -410,7 +405,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -21863,7 +19459,7 @@
dvi: dvi-am
-@@ -421,12 +415,20 @@
+@@ -424,12 +419,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -21884,7 +19480,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +447,22 @@
+@@ -448,20 +451,22 @@
ps-am:
@@ -21913,9 +19509,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/Sensors/External/Makefile.in gdesklets-0.36/Sensors/External/Makefile.in
---- gdesklets-0.36.orig/Sensors/External/Makefile.in 2008-02-17 01:45:48.000000000 +0800
-+++ gdesklets-0.36/Sensors/External/Makefile.in 2008-03-01 01:27:31.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Sensors/External/Makefile.in gdesklets-0.35.4/Sensors/External/Makefile.in
+--- gdesklets-0.35.4.orig/Sensors/External/Makefile.in 2006-10-05 20:04:34.000000000 +0800
++++ gdesklets-0.35.4/Sensors/External/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21992,7 +19588,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -22002,13 +19598,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -22016,7 +19612,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -22034,7 +19630,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -22042,7 +19638,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -22054,7 +19650,7 @@
installdir = ${coredir}/Sensors/External
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -22069,7 +19665,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -22078,7 +19674,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -22114,7 +19710,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -22123,7 +19719,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -22132,7 +19728,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -22153,7 +19749,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -22182,9 +19778,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/Sensors/FontSelector/Makefile.in gdesklets-0.36/Sensors/FontSelector/Makefile.in
---- gdesklets-0.36.orig/Sensors/FontSelector/Makefile.in 2008-02-17 01:45:49.000000000 +0800
-+++ gdesklets-0.36/Sensors/FontSelector/Makefile.in 2008-03-01 01:27:32.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Sensors/FontSelector/Makefile.in gdesklets-0.35.4/Sensors/FontSelector/Makefile.in
+--- gdesklets-0.35.4.orig/Sensors/FontSelector/Makefile.in 2006-10-05 20:04:34.000000000 +0800
++++ gdesklets-0.35.4/Sensors/FontSelector/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22261,7 +19857,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -22271,13 +19867,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -22285,7 +19881,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -22303,7 +19899,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -22311,7 +19907,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -22323,7 +19919,7 @@
installdir = ${coredir}/Sensors/FontSelector
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -22338,7 +19934,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -22347,7 +19943,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -22383,7 +19979,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -22392,7 +19988,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -22401,7 +19997,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -22422,7 +20018,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -22451,9 +20047,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/Sensors/Makefile.in gdesklets-0.36/Sensors/Makefile.in
---- gdesklets-0.36.orig/Sensors/Makefile.in 2008-02-17 01:45:49.000000000 +0800
-+++ gdesklets-0.36/Sensors/Makefile.in 2008-03-01 01:27:32.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/Sensors/Makefile.in gdesklets-0.35.4/Sensors/Makefile.in
+--- gdesklets-0.35.4.orig/Sensors/Makefile.in 2006-10-05 20:04:34.000000000 +0800
++++ gdesklets-0.35.4/Sensors/Makefile.in 2008-02-18 20:50:56.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22547,7 +20143,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -136,12 +132,13 @@
+@@ -136,11 +132,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -22557,13 +20153,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -163,6 +160,7 @@
+@@ -162,6 +160,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -22571,7 +20167,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -181,13 +179,13 @@
+@@ -184,13 +183,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -22589,7 +20185,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -199,6 +197,7 @@
+@@ -202,6 +201,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -22597,7 +20193,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -232,8 +231,11 @@
+@@ -235,8 +235,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -22609,7 +20205,7 @@
SUBDIRS = External FontSelector
all: all-recursive
-@@ -274,10 +276,6 @@
+@@ -277,10 +280,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -22620,7 +20216,7 @@
# 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,
-@@ -309,8 +307,7 @@
+@@ -312,8 +311,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -22630,7 +20226,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -354,8 +351,8 @@
+@@ -357,8 +355,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -22641,7 +20237,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -380,8 +377,8 @@
+@@ -383,8 +381,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -22652,7 +20248,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -391,13 +388,12 @@
+@@ -394,13 +392,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -22668,7 +20264,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -411,22 +407,21 @@
+@@ -414,22 +411,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -22704,7 +20300,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -440,7 +435,7 @@
+@@ -443,7 +439,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -22713,7 +20309,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -448,6 +443,8 @@
+@@ -451,6 +447,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -22722,7 +20318,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -487,8 +484,7 @@
+@@ -490,8 +488,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -22732,7 +20328,7 @@
dvi: dvi-recursive
-@@ -502,12 +498,20 @@
+@@ -505,12 +502,20 @@
install-data-am:
@@ -22753,7 +20349,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -526,22 +530,24 @@
+@@ -529,22 +534,24 @@
ps-am:
@@ -22790,9 +20386,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/Makefile.in gdesklets-0.36/shell/Makefile.in
---- gdesklets-0.36.orig/shell/Makefile.in 2008-02-17 01:45:59.000000000 +0800
-+++ gdesklets-0.36/shell/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/Makefile.in gdesklets-0.35.4/shell/Makefile.in
+--- gdesklets-0.35.4.orig/shell/Makefile.in 2006-10-05 20:04:38.000000000 +0800
++++ gdesklets-0.35.4/shell/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22893,7 +20489,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,12 +145,13 @@
+@@ -149,11 +145,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -22903,13 +20499,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -176,6 +173,7 @@
+@@ -175,6 +173,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -22917,7 +20513,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -194,13 +192,13 @@
+@@ -197,13 +196,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -22935,7 +20531,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -212,6 +210,7 @@
+@@ -215,6 +214,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -22943,7 +20539,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -245,8 +244,11 @@
+@@ -248,8 +248,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -22955,7 +20551,7 @@
installdir = ${coredir}/shell
install_DATA = \
__init__.py \
-@@ -301,13 +303,9 @@
+@@ -304,13 +307,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -22970,7 +20566,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -335,7 +333,7 @@
+@@ -338,7 +337,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -22979,7 +20575,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -382,8 +380,7 @@
+@@ -385,8 +384,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -22989,7 +20585,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -427,8 +424,8 @@
+@@ -430,8 +428,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -23000,7 +20596,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -453,8 +450,8 @@
+@@ -456,8 +454,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -23011,7 +20607,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -464,13 +461,12 @@
+@@ -467,13 +465,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -23027,7 +20623,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -484,22 +480,21 @@
+@@ -487,22 +484,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -23063,7 +20659,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -513,7 +508,7 @@
+@@ -516,7 +512,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -23072,7 +20668,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -521,6 +516,8 @@
+@@ -524,6 +520,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -23081,7 +20677,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -531,7 +528,7 @@
+@@ -534,7 +532,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -23090,7 +20686,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -564,8 +561,7 @@
+@@ -567,8 +565,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -23100,7 +20696,7 @@
dvi: dvi-recursive
-@@ -579,12 +575,20 @@
+@@ -582,12 +579,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -23121,7 +20717,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -603,24 +607,25 @@
+@@ -606,24 +611,25 @@
ps-am:
@@ -23160,9 +20756,9 @@
uninstall-installPYTHON
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-diff -urN gdesklets-0.36.orig/shell/plugins/ControlBrowser/Makefile.in gdesklets-0.36/shell/plugins/ControlBrowser/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/ControlBrowser/Makefile.in 2008-02-17 01:45:59.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/ControlBrowser/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/ControlBrowser/Makefile.in gdesklets-0.35.4/shell/plugins/ControlBrowser/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/ControlBrowser/Makefile.in 2006-10-05 20:04:39.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/ControlBrowser/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -23239,7 +20835,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -23249,13 +20845,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -23263,7 +20859,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -23281,7 +20877,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -23289,7 +20885,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -23301,7 +20897,7 @@
installdir = ${coredir}/shell/plugins/ControlBrowser
install_DATA = \
__init__.py \
-@@ -288,13 +287,9 @@
+@@ -291,13 +291,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -23316,7 +20912,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -322,7 +317,7 @@
+@@ -325,7 +321,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -23325,7 +20921,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -345,22 +340,21 @@
+@@ -348,22 +344,21 @@
distdir: $(DISTFILES)
@@ -23361,7 +20957,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -376,7 +370,7 @@
+@@ -379,7 +374,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -23370,7 +20966,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -409,7 +403,7 @@
+@@ -412,7 +407,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -23379,7 +20975,7 @@
dvi: dvi-am
-@@ -423,12 +417,20 @@
+@@ -426,12 +421,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -23400,7 +20996,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -447,20 +449,22 @@
+@@ -450,20 +453,22 @@
ps-am:
@@ -23429,9 +21025,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/ControlCollection/Makefile.in gdesklets-0.36/shell/plugins/ControlCollection/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/ControlCollection/Makefile.in 2008-02-17 01:46:00.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/ControlCollection/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/ControlCollection/Makefile.in gdesklets-0.35.4/shell/plugins/ControlCollection/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/ControlCollection/Makefile.in 2006-10-05 20:04:39.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/ControlCollection/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -23508,7 +21104,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -23518,13 +21114,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -23532,7 +21128,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -23550,7 +21146,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -23558,7 +21154,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -23570,7 +21166,7 @@
installdir = ${coredir}/shell/plugins/ControlCollection
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -23585,7 +21181,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -23594,7 +21190,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -23630,7 +21226,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -23639,7 +21235,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -23648,7 +21244,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -23669,7 +21265,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -23698,9 +21294,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/ControlsView/Makefile.in gdesklets-0.36/shell/plugins/ControlsView/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/ControlsView/Makefile.in 2008-02-17 01:46:00.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/ControlsView/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/ControlsView/Makefile.in gdesklets-0.35.4/shell/plugins/ControlsView/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/ControlsView/Makefile.in 2006-10-05 20:04:39.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/ControlsView/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -23777,7 +21373,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -23787,13 +21383,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -23801,7 +21397,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -23819,7 +21415,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -23827,7 +21423,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -23839,7 +21435,7 @@
installdir = ${coredir}/shell/plugins/ControlsView
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -23854,7 +21450,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -23863,7 +21459,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -23899,7 +21495,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -23908,7 +21504,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -23917,7 +21513,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -23938,7 +21534,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -23967,9 +21563,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/DisplayBrowser/Makefile.in gdesklets-0.36/shell/plugins/DisplayBrowser/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/DisplayBrowser/Makefile.in 2008-02-17 01:46:01.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/DisplayBrowser/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/DisplayBrowser/Makefile.in gdesklets-0.35.4/shell/plugins/DisplayBrowser/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/DisplayBrowser/Makefile.in 2006-10-05 20:04:39.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/DisplayBrowser/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -24046,7 +21642,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -24056,13 +21652,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -24070,7 +21666,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -24088,7 +21684,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -24096,7 +21692,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -24108,7 +21704,7 @@
installdir = ${coredir}/shell/plugins/DisplayBrowser
install_DATA = \
__init__.py \
-@@ -285,13 +284,9 @@
+@@ -288,13 +288,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -24123,7 +21719,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -319,7 +314,7 @@
+@@ -322,7 +318,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -24132,7 +21728,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -342,22 +337,21 @@
+@@ -345,22 +341,21 @@
distdir: $(DISTFILES)
@@ -24168,7 +21764,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -373,7 +367,7 @@
+@@ -376,7 +371,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -24177,7 +21773,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -406,7 +400,7 @@
+@@ -409,7 +404,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -24186,7 +21782,7 @@
dvi: dvi-am
-@@ -420,12 +414,20 @@
+@@ -423,12 +418,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -24207,7 +21803,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -444,20 +446,22 @@
+@@ -447,20 +450,22 @@
ps-am:
@@ -24236,9 +21832,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/DisplayCollection/Makefile.in gdesklets-0.36/shell/plugins/DisplayCollection/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/DisplayCollection/Makefile.in 2008-02-17 01:46:01.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/DisplayCollection/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/DisplayCollection/Makefile.in gdesklets-0.35.4/shell/plugins/DisplayCollection/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/DisplayCollection/Makefile.in 2006-10-05 20:04:39.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/DisplayCollection/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -24315,7 +21911,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -24325,13 +21921,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -24339,7 +21935,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -24357,7 +21953,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -24365,7 +21961,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -24377,7 +21973,7 @@
installdir = ${coredir}/shell/plugins/DisplayCollection
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -24392,7 +21988,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -24401,7 +21997,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -24437,7 +22033,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -24446,7 +22042,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -24455,7 +22051,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -24476,7 +22072,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -24505,9 +22101,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/DisplayView/Makefile.in gdesklets-0.36/shell/plugins/DisplayView/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/DisplayView/Makefile.in 2008-02-17 01:46:02.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/DisplayView/Makefile.in 2008-03-01 01:27:34.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/DisplayView/Makefile.in gdesklets-0.35.4/shell/plugins/DisplayView/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/DisplayView/Makefile.in 2006-10-05 20:04:40.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/DisplayView/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -24584,7 +22180,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -24594,13 +22190,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -24608,7 +22204,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -24626,7 +22222,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -24634,7 +22230,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -24646,7 +22242,7 @@
installdir = ${coredir}/shell/plugins/DisplayView
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -24661,7 +22257,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -24670,7 +22266,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -24706,7 +22302,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -24715,7 +22311,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -24724,7 +22320,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -24745,7 +22341,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -24774,9 +22370,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/gDeskletsClient/Makefile.in gdesklets-0.36/shell/plugins/gDeskletsClient/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/gDeskletsClient/Makefile.in 2008-02-17 01:46:06.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/gDeskletsClient/Makefile.in 2008-03-01 01:27:35.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/gDeskletsClient/Makefile.in gdesklets-0.35.4/shell/plugins/gDeskletsClient/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/gDeskletsClient/Makefile.in 2006-10-05 20:04:42.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/gDeskletsClient/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -24853,7 +22449,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -24863,13 +22459,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -24877,7 +22473,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -24895,7 +22491,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -24903,7 +22499,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -24915,7 +22511,7 @@
installdir = ${coredir}/shell/plugins/gDeskletsClient
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -24930,7 +22526,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -24939,7 +22535,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -24975,7 +22571,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -24984,7 +22580,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -24993,7 +22589,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -25014,7 +22610,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -25043,9 +22639,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/Help/Makefile.in gdesklets-0.36/shell/plugins/Help/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/Help/Makefile.in 2008-02-17 01:46:02.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/Help/Makefile.in 2008-03-01 01:27:35.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/Help/Makefile.in gdesklets-0.35.4/shell/plugins/Help/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/Help/Makefile.in 2006-10-05 20:04:40.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/Help/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -25122,7 +22718,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -25132,13 +22728,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -25146,7 +22742,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -25164,7 +22760,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -25172,7 +22768,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -25184,7 +22780,7 @@
installdir = ${coredir}/shell/plugins/Help
install_DATA = \
__init__.py \
-@@ -285,13 +284,9 @@
+@@ -288,13 +288,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -25199,7 +22795,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -319,7 +314,7 @@
+@@ -322,7 +318,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -25208,7 +22804,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -342,22 +337,21 @@
+@@ -345,22 +341,21 @@
distdir: $(DISTFILES)
@@ -25244,7 +22840,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -373,7 +367,7 @@
+@@ -376,7 +371,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -25253,7 +22849,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -406,7 +400,7 @@
+@@ -409,7 +404,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -25262,7 +22858,7 @@
dvi: dvi-am
-@@ -420,12 +414,20 @@
+@@ -423,12 +418,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -25283,7 +22879,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -444,20 +446,22 @@
+@@ -447,20 +450,22 @@
ps-am:
@@ -25312,9 +22908,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/Makefile.in gdesklets-0.36/shell/plugins/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/Makefile.in 2008-02-17 01:46:03.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/Makefile.in 2008-03-01 01:27:35.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/Makefile.in gdesklets-0.35.4/shell/plugins/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/Makefile.in 2006-10-05 20:04:40.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -25408,7 +23004,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -136,12 +132,13 @@
+@@ -136,11 +132,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -25418,13 +23014,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -163,6 +160,7 @@
+@@ -162,6 +160,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -25432,7 +23028,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -181,13 +179,13 @@
+@@ -184,13 +183,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -25450,7 +23046,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -199,6 +197,7 @@
+@@ -202,6 +201,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -25458,7 +23054,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -232,8 +231,11 @@
+@@ -235,8 +235,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -25470,7 +23066,7 @@
installdir = ${coredir}/shell/plugins
SUBDIRS = \
ControlBrowser \
-@@ -291,10 +293,6 @@
+@@ -294,10 +297,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -25481,7 +23077,7 @@
# 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,
-@@ -326,8 +324,7 @@
+@@ -329,8 +328,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -25491,7 +23087,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -371,8 +368,8 @@
+@@ -374,8 +372,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -25502,7 +23098,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -397,8 +394,8 @@
+@@ -400,8 +398,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -25513,7 +23109,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -408,13 +405,12 @@
+@@ -411,13 +409,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -25529,7 +23125,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -428,22 +424,21 @@
+@@ -431,22 +428,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -25565,7 +23161,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -457,7 +452,7 @@
+@@ -460,7 +456,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -25574,7 +23170,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -465,6 +460,8 @@
+@@ -468,6 +464,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -25583,7 +23179,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -505,8 +502,7 @@
+@@ -508,8 +506,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -25593,7 +23189,7 @@
dvi: dvi-recursive
-@@ -520,12 +516,20 @@
+@@ -523,12 +520,20 @@
install-data-am:
@@ -25614,7 +23210,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -544,22 +548,24 @@
+@@ -547,22 +552,24 @@
ps-am:
@@ -25651,9 +23247,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/Menu/Makefile.in gdesklets-0.36/shell/plugins/Menu/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/Menu/Makefile.in 2008-02-17 01:46:03.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/Menu/Makefile.in 2008-03-01 01:27:35.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/Menu/Makefile.in gdesklets-0.35.4/shell/plugins/Menu/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/Menu/Makefile.in 2006-10-05 20:04:40.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/Menu/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -25730,7 +23326,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -25740,13 +23336,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -25754,7 +23350,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -25772,7 +23368,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -25780,7 +23376,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -25792,7 +23388,7 @@
installdir = ${coredir}/shell/plugins/Menu
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -25807,7 +23403,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -25816,7 +23412,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -25852,7 +23448,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -25861,7 +23457,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -25870,7 +23466,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -25891,7 +23487,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -25920,9 +23516,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/PackageInstaller/Makefile.in gdesklets-0.36/shell/plugins/PackageInstaller/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/PackageInstaller/Makefile.in 2008-02-17 01:46:04.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/PackageInstaller/Makefile.in 2008-03-01 01:27:35.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/PackageInstaller/Makefile.in gdesklets-0.35.4/shell/plugins/PackageInstaller/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/PackageInstaller/Makefile.in 2006-10-05 20:04:40.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/PackageInstaller/Makefile.in 2008-02-18 20:50:58.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -25999,7 +23595,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -26009,13 +23605,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -26023,7 +23619,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -26041,7 +23637,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -26049,7 +23645,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -26061,7 +23657,7 @@
installdir = ${coredir}/shell/plugins/PackageInstaller
install_DATA = \
__init__.py \
-@@ -286,13 +285,9 @@
+@@ -289,13 +289,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -26076,7 +23672,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -320,7 +315,7 @@
+@@ -323,7 +319,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -26085,7 +23681,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -343,22 +338,21 @@
+@@ -346,22 +342,21 @@
distdir: $(DISTFILES)
@@ -26121,7 +23717,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +368,7 @@
+@@ -377,7 +372,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -26130,7 +23726,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +401,7 @@
+@@ -410,7 +405,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -26139,7 +23735,7 @@
dvi: dvi-am
-@@ -421,12 +415,20 @@
+@@ -424,12 +419,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -26160,7 +23756,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +447,22 @@
+@@ -448,20 +451,22 @@
ps-am:
@@ -26189,9 +23785,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/Profiles/Makefile.in gdesklets-0.36/shell/plugins/Profiles/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/Profiles/Makefile.in 2008-02-17 01:46:04.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/Profiles/Makefile.in 2008-03-01 01:27:35.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/Profiles/Makefile.in gdesklets-0.35.4/shell/plugins/Profiles/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/Profiles/Makefile.in 2006-10-05 20:04:41.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/Profiles/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26268,7 +23864,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -26278,13 +23874,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -26292,7 +23888,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -26310,7 +23906,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -26318,7 +23914,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -26330,7 +23926,7 @@
installdir = ${coredir}/shell/plugins/Profiles
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -26345,7 +23941,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -26354,7 +23950,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -26390,7 +23986,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -26399,7 +23995,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -26408,7 +24004,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -26429,7 +24025,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -26458,9 +24054,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/Shell/Makefile.in gdesklets-0.36/shell/plugins/Shell/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/Shell/Makefile.in 2008-02-17 01:46:04.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/Shell/Makefile.in 2008-03-01 01:27:35.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/Shell/Makefile.in gdesklets-0.35.4/shell/plugins/Shell/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/Shell/Makefile.in 2006-10-05 20:04:41.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/Shell/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26537,7 +24133,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -26547,13 +24143,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -26561,7 +24157,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -26579,7 +24175,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -26587,7 +24183,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -26599,7 +24195,7 @@
installdir = ${coredir}/shell/plugins/Shell
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -26614,7 +24210,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -26623,7 +24219,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -26659,7 +24255,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -26668,7 +24264,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -26677,7 +24273,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -26698,7 +24294,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -26727,9 +24323,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/StatusBar/Makefile.in gdesklets-0.36/shell/plugins/StatusBar/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/StatusBar/Makefile.in 2008-02-17 01:46:05.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/StatusBar/Makefile.in 2008-03-01 01:27:35.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/StatusBar/Makefile.in gdesklets-0.35.4/shell/plugins/StatusBar/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/StatusBar/Makefile.in 2006-10-05 20:04:41.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/StatusBar/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26806,7 +24402,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -26816,13 +24412,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -26830,7 +24426,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -26848,7 +24444,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -26856,7 +24452,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -26868,7 +24464,7 @@
installdir = ${coredir}/shell/plugins/StatusBar
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -26883,7 +24479,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -26892,7 +24488,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -26928,7 +24524,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -26937,7 +24533,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -26946,7 +24542,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -26967,7 +24563,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -26996,9 +24592,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/shell/plugins/ViewSwitch/Makefile.in gdesklets-0.36/shell/plugins/ViewSwitch/Makefile.in
---- gdesklets-0.36.orig/shell/plugins/ViewSwitch/Makefile.in 2008-02-17 01:46:05.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/ViewSwitch/Makefile.in 2008-03-01 01:27:35.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/shell/plugins/ViewSwitch/Makefile.in gdesklets-0.35.4/shell/plugins/ViewSwitch/Makefile.in
+--- gdesklets-0.35.4.orig/shell/plugins/ViewSwitch/Makefile.in 2006-10-05 20:04:41.000000000 +0800
++++ gdesklets-0.35.4/shell/plugins/ViewSwitch/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27075,7 +24671,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,12 +133,13 @@
+@@ -140,11 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -27085,13 +24681,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -167,6 +161,7 @@
+@@ -166,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -27099,7 +24695,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -185,13 +180,13 @@
+@@ -188,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -27117,7 +24713,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -203,6 +198,7 @@
+@@ -206,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -27125,7 +24721,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -236,8 +232,11 @@
+@@ -239,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -27137,7 +24733,7 @@
installdir = ${coredir}/shell/plugins/ViewSwitch
install_DATA = \
__init__.py
-@@ -283,13 +282,9 @@
+@@ -286,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -27152,7 +24748,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -317,7 +312,7 @@
+@@ -320,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -27161,7 +24757,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -340,22 +335,21 @@
+@@ -343,22 +339,21 @@
distdir: $(DISTFILES)
@@ -27197,7 +24793,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -371,7 +365,7 @@
+@@ -374,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -27206,7 +24802,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -404,7 +398,7 @@
+@@ -407,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -27215,7 +24811,7 @@
dvi: dvi-am
-@@ -418,12 +412,20 @@
+@@ -421,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -27236,7 +24832,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -442,20 +444,22 @@
+@@ -445,20 +448,22 @@
ps-am:
@@ -27265,9 +24861,9 @@
# 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.
-diff -urN gdesklets-0.36.orig/utils/Makefile.in gdesklets-0.36/utils/Makefile.in
---- gdesklets-0.36.orig/utils/Makefile.in 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/utils/Makefile.in 2008-03-01 01:27:35.000000000 +0800
+diff -urN gdesklets-0.35.4.orig/utils/Makefile.in gdesklets-0.35.4/utils/Makefile.in
+--- gdesklets-0.35.4.orig/utils/Makefile.in 2006-10-05 20:04:42.000000000 +0800
++++ gdesklets-0.35.4/utils/Makefile.in 2008-02-18 20:50:59.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27295,15 +24891,21 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -61,23 +57,33 @@
+@@ -61,26 +57,39 @@
svg_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_svg_la_OBJECTS = svg.lo utils.lo
svg_la_OBJECTS = $(am_svg_la_OBJECTS)
+svg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(svg_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
+ systray_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_systray_la_OBJECTS = systray.lo eggtrayicon.lo utils.lo
+ systray_la_OBJECTS = $(am_systray_la_OBJECTS)
++systray_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(systray_la_LDFLAGS) $(LDFLAGS) -o $@
tiling_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am_tiling_la_OBJECTS = tiling.lo render.lo utils.lo
+ am_tiling_la_OBJECTS = tiling.lo filter.lo render.lo utils.lo
tiling_la_OBJECTS = $(am_tiling_la_OBJECTS)
+tiling_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -27332,10 +24934,10 @@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
- SOURCES = $(svg_la_SOURCES) $(tiling_la_SOURCES) $(x11_la_SOURCES)
- DIST_SOURCES = $(svg_la_SOURCES) $(tiling_la_SOURCES) \
+ SOURCES = $(svg_la_SOURCES) $(systray_la_SOURCES) $(tiling_la_SOURCES) \
$(x11_la_SOURCES)
-@@ -90,8 +96,6 @@
+ DIST_SOURCES = $(svg_la_SOURCES) $(systray_la_SOURCES) \
+@@ -94,8 +103,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -27344,7 +24946,7 @@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
-@@ -113,6 +117,7 @@
+@@ -117,6 +124,7 @@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -27352,7 +24954,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -129,6 +134,7 @@
+@@ -133,6 +141,7 @@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -27360,7 +24962,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -139,14 +145,12 @@
+@@ -143,14 +152,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -27376,7 +24978,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -158,7 +162,6 @@
+@@ -162,7 +169,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -27384,7 +24986,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -168,12 +171,13 @@
+@@ -172,11 +178,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -27394,13 +24996,13 @@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -195,6 +199,7 @@
+@@ -198,6 +206,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -27408,7 +25010,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -213,13 +218,13 @@
+@@ -220,13 +229,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -27426,7 +25028,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -231,6 +236,7 @@
+@@ -238,6 +247,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -27434,7 +25036,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -264,8 +270,11 @@
+@@ -271,8 +281,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -27446,7 +25048,7 @@
INCLUDES = \
$(PYTHON_CFLAGS) \
$(X11_CFLAGS) \
-@@ -351,21 +360,21 @@
+@@ -362,21 +375,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-installLTLIBRARIES: $(install_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -27474,12 +25076,15 @@
done
clean-installLTLIBRARIES:
-@@ -377,11 +386,11 @@
+@@ -388,13 +401,13 @@
rm -f "$${dir}/so_locations"; \
done
svg.la: $(svg_la_OBJECTS) $(svg_la_DEPENDENCIES)
- $(LINK) -rpath $(installdir) $(svg_la_LDFLAGS) $(svg_la_OBJECTS) $(svg_la_LIBADD) $(LIBS)
+ $(svg_la_LINK) -rpath $(installdir) $(svg_la_OBJECTS) $(svg_la_LIBADD) $(LIBS)
+ systray.la: $(systray_la_OBJECTS) $(systray_la_DEPENDENCIES)
+- $(LINK) -rpath $(installdir) $(systray_la_LDFLAGS) $(systray_la_OBJECTS) $(systray_la_LIBADD) $(LIBS)
++ $(systray_la_LINK) -rpath $(installdir) $(systray_la_OBJECTS) $(systray_la_LIBADD) $(LIBS)
tiling.la: $(tiling_la_OBJECTS) $(tiling_la_DEPENDENCIES)
- $(LINK) -rpath $(installdir) $(tiling_la_LDFLAGS) $(tiling_la_OBJECTS) $(tiling_la_LIBADD) $(LIBS)
+ $(tiling_la_LINK) -rpath $(installdir) $(tiling_la_OBJECTS) $(tiling_la_LIBADD) $(LIBS)
@@ -27489,7 +25094,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -396,22 +405,22 @@
+@@ -412,22 +425,22 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x11.Plo at am__quote@
.c.o:
@@ -27518,7 +25123,7 @@
@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 $@ $<
-@@ -421,13 +430,9 @@
+@@ -437,13 +450,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -27533,7 +25138,7 @@
@list='$(install_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
-@@ -455,7 +460,7 @@
+@@ -471,7 +480,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -27542,7 +25147,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -476,8 +481,8 @@
+@@ -492,8 +501,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27553,7 +25158,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -489,8 +494,8 @@
+@@ -505,8 +514,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27564,7 +25169,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -500,13 +505,12 @@
+@@ -516,13 +525,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -27580,7 +25185,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -520,22 +524,21 @@
+@@ -536,22 +544,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -27616,7 +25221,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -551,7 +554,7 @@
+@@ -567,7 +574,7 @@
all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -27625,7 +25230,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -587,7 +590,7 @@
+@@ -603,7 +610,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -27634,7 +25239,7 @@
dvi: dvi-am
-@@ -602,12 +605,20 @@
+@@ -618,12 +625,20 @@
install-data-am: install-installDATA install-installLTLIBRARIES \
install-installPYTHON
@@ -27655,7 +25260,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -628,23 +639,26 @@
+@@ -644,23 +659,26 @@
ps-am:
Modified: packages/unstable/gdesklets/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/watch?rev=14831&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/watch (original)
+++ packages/unstable/gdesklets/debian/watch Fri Feb 29 19:02:39 2008
@@ -1,4 +1,4 @@
version=2
http://www.gdesklets.de/ \
- files/gdesklets-([\d\.]+).tar.bz2 \
+ files/gDesklets-([\d\.]+).tar.bz2 \
debian uupdate
More information about the pkg-gnome-commits
mailing list