r14846 - in /packages/unstable/gdesklets/debian: changelog control.in copyright patches/70_relibtoolize.diff rules watch
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Mon Mar 3 12:20:52 UTC 2008
Author: manphiz-guest
Date: Mon Mar 3 12:20:52 2008
New Revision: 14846
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14846
Log:
Revert again to 0.36(-r14830), as it now works without a clue...
Fix GNOME_DOWNLOAD_URL in debian/rules.
Modified:
packages/unstable/gdesklets/debian/changelog
packages/unstable/gdesklets/debian/control.in
packages/unstable/gdesklets/debian/copyright
packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff
packages/unstable/gdesklets/debian/rules
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=14846&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/changelog (original)
+++ packages/unstable/gdesklets/debian/changelog Mon Mar 3 12:20:52 2008
@@ -1,20 +1,25 @@
-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.
- * Drop config.guess and config.sub from 70_relibtoolize.diff:
- * 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.
+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, and fix GNOME_DOWNLOAD_URL in
+ debian/rules as well.
+ + Regenerate 70_relibtoolize.diff for new version. Also 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.
(Closes: #466243)
* Fix RC bug, bump urgency.
- * Drop python-xml from depends, and update python version to 2.4.
- (Closes: #468591)
- * Adjust (build-)depends as per configure.in.
- * Refine copyright file by adding copyright holder and proper indent.
-
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Sat, 01 Mar 2008 03:10:29 +0800
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Mon, 03 Mar 2008 20:10:11 +0800
gdesklets (0.35.4-1) unstable; urgency=high
Modified: packages/unstable/gdesklets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control.in?rev=14846&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control.in (original)
+++ packages/unstable/gdesklets/debian/control.in Mon Mar 3 12:20:52 2008
@@ -6,34 +6,34 @@
Build-Depends: cdbs (>= 0.4.49),
debhelper (>= 6),
python-dev,
- python-gnome2-dev (>= 2.6.0),
- python-gtk2-dev (>= 2.4.0),
- python-pyorbit-dev,
+ python-gnome2-dev (>= 2.12.0),
+ python-gtk2-dev (>= 2.10.0),
+ python-pyorbit-dev (>= 2.0.1),
libglib2.0-dev (>= 2.4.1-2),
pkg-config,
swig,
- libgtk2.0-dev (>= 2.4.1-3),
- libgnomevfs2-dev (>= 2.8.4),
- libgtop2-dev (>= 2.8.2),
+ libglib2.0-dev (>= 2.10.0)
+ libgtk2.0-dev (>= 2.10.0),
+ libgtop2-dev (>= 2.6.0-4),
gnome-pkg-tools,
- libgnomeui-dev (>= 2.6.1.1-2),
libxml-parser-perl,
librsvg2-dev (>= 2.8.0),
autotools-dev,
- python-support
+ python-support (>= 0.3)
Standards-Version: 3.7.3
-XS-Python-Version: >= 2.4
+XS-Python-Version: >= 2.3
Package: gdesklets
Architecture: any
-XB-Python-Version: ${python:Versions}
+XB-Python-Version: ${python:Version}
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends},
- python-gnome2 (>= 2.6.0),
- python-gtk2 (>= 2.4.0),
+ python-gnome2 (>= 2.10.0),
+ python-gtk2 (>= 2.10.0),
python-numeric (>= 23.0-7),
- python (>= 2.4),
+ python,
+ python-xml,
python-pyorbit (>= 2.0.1)
Recommends: gdesklets-data
Replaces: gdesklets-data (<< 0.21)
Modified: packages/unstable/gdesklets/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/copyright?rev=14846&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/copyright (original)
+++ packages/unstable/gdesklets/debian/copyright Mon Mar 3 12:20:52 2008
@@ -9,7 +9,7 @@
Copyright:
- Copyright (C) 2003-2008 The gDesklets Team.
+ Copyright (C) 2003-2008 The gDesklet Team
You are free to redistribute this software under the terms of the GNU
General Public License.
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=14846&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff (original)
+++ packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff Mon Mar 3 12:20:52 2008
@@ -1,6 +1,6 @@
-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
+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
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -26,67 +26,27 @@
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
#
-@@ -218,6 +226,20 @@
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
+@@ -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 @@
AC_CHECK_FUNCS(dcgettext)
-+ MSGFMT_OPTS=
-+ AC_MSG_CHECKING([if msgfmt accepts -c])
+ MSGFMT_OPTS=
+ AC_MSG_CHECKING([if msgfmt accepts -c])
+- GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Project-Id-Version: test 1.0\n"
-+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-+"Last-Translator: test <foo at bar.xx>\n"
-+"Language-Team: C <LL at li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
-+ AC_SUBST(MSGFMT_OPTS)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-@@ -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])
-+
-+
+ msgid ""
+ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -447,7 +454,7 @@
+
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 35 IT_PROG_INTLTOOL
@@ -94,7 +54,7 @@
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
-@@ -425,7 +467,7 @@
+@@ -460,7 +467,7 @@
esac
if test -n "$1"; then
@@ -103,7 +63,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`
-@@ -454,6 +496,7 @@
+@@ -489,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 $< [$]@'
@@ -111,7 +71,7 @@
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -473,6 +516,21 @@
+@@ -508,6 +516,21 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
@@ -133,7 +93,7 @@
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-@@ -495,14 +553,34 @@
+@@ -530,19 +553,16 @@
fi
fi
@@ -144,37 +104,20 @@
-
# 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
+
+ # 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],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]],
+ [[extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr]])],
-+ [DATADIRNAME=share],
-+ [case $host in
-+ *-*-solaris*)
-+ dnl On Solaris, if bind_textdomain_codeset is in libc,
-+ dnl GNU format message catalog is always supported,
-+ dnl since both are added to the libc all together.
-+ dnl Hence, we'd like to go with DATADIRNAME=share
-+ dnl in this case.
-+ AC_CHECK_FUNC(bind_textdomain_codeset,
-+ [DATADIRNAME=share], [DATADIRNAME=lib])
-+ ;;
-+ *)
-+ [DATADIRNAME=lib]
-+ ;;
-+ esac])
-+fi
-+AC_SUBST(DATADIRNAME)
-+
- IT_PO_SUBDIR([po])
-
- dnl The following is very similar to
-@@ -525,10 +603,6 @@
+ [DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+@@ -583,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" \
@@ -185,7 +128,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
-@@ -543,9 +617,7 @@
+@@ -601,9 +617,7 @@
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -196,7 +139,7 @@
])
-@@ -594,7 +666,7 @@
+@@ -652,7 +666,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -205,7 +148,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -682,7 +754,6 @@
+@@ -740,7 +754,6 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
@@ -213,7 +156,7 @@
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
-@@ -757,7 +828,7 @@
+@@ -815,7 +828,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -222,7 +165,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -784,6 +855,8 @@
+@@ -842,6 +855,8 @@
;;
esac
@@ -231,7 +174,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)
-@@ -844,8 +917,9 @@
+@@ -902,8 +917,9 @@
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
@@ -243,7 +186,7 @@
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -857,13 +931,85 @@
+@@ -915,13 +931,85 @@
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
@@ -332,7 +275,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
-@@ -874,12 +1020,20 @@
+@@ -932,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],
@@ -358,7 +301,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -1110,13 +1264,17 @@
+@@ -1168,13 +1264,17 @@
rm -rf conftest*
;;
@@ -377,7 +320,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -1133,6 +1291,9 @@
+@@ -1191,6 +1291,9 @@
;;
*64-bit*)
case $host in
@@ -387,7 +330,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -1173,7 +1334,11 @@
+@@ -1231,7 +1334,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -400,7 +343,7 @@
esac
;;
esac
-@@ -1204,7 +1369,7 @@
+@@ -1262,7 +1369,7 @@
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -409,7 +352,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.
-@@ -1245,11 +1410,12 @@
+@@ -1303,11 +1410,12 @@
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -424,7 +367,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
-@@ -1265,7 +1431,7 @@
+@@ -1323,7 +1431,7 @@
$2=yes
fi
fi
@@ -433,7 +376,7 @@
LDFLAGS="$save_LDFLAGS"
])
-@@ -1363,24 +1529,27 @@
+@@ -1421,24 +1529,27 @@
fi
;;
*)
@@ -478,7 +421,7 @@
;;
esac
])
-@@ -1533,7 +1702,7 @@
+@@ -1591,7 +1702,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
@@ -487,7 +430,7 @@
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
-@@ -1541,7 +1710,7 @@
+@@ -1599,7 +1710,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
@@ -496,7 +439,7 @@
])
])
])
-@@ -1607,7 +1776,8 @@
+@@ -1665,7 +1776,8 @@
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -506,7 +449,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
-@@ -1615,7 +1785,7 @@
+@@ -1673,7 +1785,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -515,7 +458,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -1755,6 +1925,7 @@
+@@ -1813,6 +1925,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -523,7 +466,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1772,7 +1943,8 @@
+@@ -1830,7 +1943,8 @@
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -533,7 +476,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -1786,20 +1958,58 @@
+@@ -1844,20 +1958,58 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -597,7 +540,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1817,7 +2027,7 @@
+@@ -1875,7 +2027,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -606,7 +549,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -1956,12 +2166,8 @@
+@@ -2014,12 +2166,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -621,7 +564,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -2015,7 +2221,7 @@
+@@ -2073,7 +2221,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -630,7 +573,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -2078,7 +2284,7 @@
+@@ -2136,7 +2284,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -639,7 +582,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2149,7 +2355,7 @@
+@@ -2207,7 +2355,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -648,7 +591,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -2255,6 +2461,10 @@
+@@ -2313,6 +2461,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -659,7 +602,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -2350,6 +2560,13 @@
+@@ -2408,6 +2560,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -673,7 +616,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"
-@@ -2360,7 +2577,8 @@
+@@ -2418,7 +2577,8 @@
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -683,7 +626,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -2621,7 +2839,7 @@
+@@ -2679,7 +2839,7 @@
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -692,7 +635,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -2684,7 +2902,7 @@
+@@ -2742,7 +2902,7 @@
# AC_PATH_MAGIC
# -------------
@@ -701,7 +644,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
-@@ -2831,7 +3049,7 @@
+@@ -2889,7 +3049,7 @@
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -710,7 +653,7 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2848,7 +3066,7 @@
+@@ -2906,7 +3066,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -719,7 +662,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2870,9 +3088,15 @@
+@@ -2928,9 +3088,15 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -738,7 +681,7 @@
;;
darwin* | rhapsody*)
-@@ -2917,7 +3141,7 @@
+@@ -2975,7 +3141,7 @@
esac
;;
@@ -747,7 +690,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)$'
;;
-@@ -2967,6 +3191,10 @@
+@@ -3025,6 +3191,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -758,7 +701,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3019,7 +3247,7 @@
+@@ -3077,7 +3247,7 @@
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
@@ -767,7 +710,7 @@
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
-@@ -3235,10 +3463,10 @@
+@@ -3293,10 +3463,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -780,7 +723,7 @@
_LT_AC_SYS_COMPILER
-@@ -3274,7 +3502,7 @@
+@@ -3332,7 +3502,7 @@
fi
;;
@@ -789,7 +732,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -3331,6 +3559,7 @@
+@@ -3389,6 +3559,7 @@
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
@@ -797,7 +740,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -3340,10 +3569,10 @@
+@@ -3398,10 +3569,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -810,7 +753,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -3440,7 +3669,7 @@
+@@ -3498,7 +3669,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -819,7 +762,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.
-@@ -3453,7 +3682,7 @@
+@@ -3511,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.
@@ -828,7 +771,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -3489,7 +3718,7 @@
+@@ -3547,7 +3718,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -837,7 +780,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -3599,59 +3828,31 @@
+@@ -3657,59 +3828,31 @@
fi
;;
darwin* | rhapsody*)
@@ -908,7 +851,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}'
;;
*)
-@@ -3734,9 +3935,7 @@
+@@ -3792,9 +3935,7 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -919,7 +862,7 @@
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
-@@ -3804,7 +4003,7 @@
+@@ -3862,7 +4003,7 @@
;;
esac
;;
@@ -928,7 +871,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'
-@@ -3896,7 +4095,7 @@
+@@ -3954,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'
;;
@@ -937,7 +880,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'
-@@ -3924,6 +4123,29 @@
+@@ -3982,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'
;;
@@ -967,7 +910,7 @@
esac
;;
lynxos*)
-@@ -3962,16 +4184,20 @@
+@@ -4020,16 +4184,20 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
@@ -997,7 +940,7 @@
;;
osf3*)
case $cc_basename in
-@@ -4133,15 +4359,10 @@
+@@ -4191,15 +4359,10 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -1016,7 +959,7 @@
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -4188,6 +4409,12 @@
+@@ -4246,6 +4409,12 @@
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -1029,7 +972,7 @@
fi
;;
esac
-@@ -4303,7 +4530,8 @@
+@@ -4361,7 +4530,8 @@
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -1039,7 +982,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
-@@ -4428,10 +4656,15 @@
+@@ -4486,10 +4656,15 @@
$rm -f confest.$objext
@@ -1056,7 +999,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)=
-@@ -4439,19 +4672,51 @@
+@@ -4497,19 +4672,51 @@
_LT_AC_TAGVAR(postdeps,$1)=
;;
@@ -1110,7 +1053,7 @@
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -4494,10 +4759,17 @@
+@@ -4552,10 +4759,17 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1130,7 +1073,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4529,7 +4801,7 @@
+@@ -4587,7 +4801,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1139,7 +1082,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -4576,10 +4848,10 @@
+@@ -4634,10 +4848,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1152,7 +1095,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4632,7 +4904,7 @@
+@@ -4690,7 +4904,7 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1161,7 +1104,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -4706,6 +4978,7 @@
+@@ -4764,6 +4978,7 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
@@ -1169,7 +1112,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -4721,6 +4994,7 @@
+@@ -4779,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) \
@@ -1177,7 +1120,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -4767,7 +5041,7 @@
+@@ -4825,7 +5041,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -1186,7 +1129,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -5004,6 +5278,10 @@
+@@ -5062,6 +5278,10 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
@@ -1197,7 +1140,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)
-@@ -5092,7 +5370,7 @@
+@@ -5150,7 +5370,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -1206,7 +1149,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -5175,6 +5453,7 @@
+@@ -5233,6 +5453,7 @@
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -1214,7 +1157,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.
-@@ -5352,7 +5631,7 @@
+@@ -5410,7 +5631,7 @@
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
@@ -1223,7 +1166,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -5401,13 +5680,16 @@
+@@ -5459,13 +5680,16 @@
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -1243,7 +1186,7 @@
;;
darwin* | rhapsody*)
# PIC is the default on this platform
-@@ -5418,7 +5700,7 @@
+@@ -5476,7 +5700,7 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -1252,7 +1195,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5444,7 +5726,7 @@
+@@ -5502,7 +5726,7 @@
esac
else
case $host_os in
@@ -1261,7 +1204,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -5540,7 +5822,7 @@
+@@ -5598,7 +5822,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
@@ -1270,7 +1213,7 @@
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -5554,6 +5836,14 @@
+@@ -5612,6 +5836,14 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -1285,7 +1228,7 @@
;;
esac
;;
-@@ -5674,14 +5964,17 @@
+@@ -5732,14 +5964,17 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -1306,7 +1249,7 @@
;;
darwin* | rhapsody*)
-@@ -5690,7 +5983,7 @@
+@@ -5748,7 +5983,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -1315,7 +1258,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5748,10 +6041,11 @@
+@@ -5806,10 +6041,11 @@
esac
;;
@@ -1329,7 +1272,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -5800,6 +6094,22 @@
+@@ -5858,6 +6094,22 @@
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1352,7 +1295,7 @@
esac
;;
-@@ -5809,6 +6119,10 @@
+@@ -5867,6 +6119,10 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1363,7 +1306,7 @@
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -5868,7 +6182,7 @@
+@@ -5926,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],
@@ -1372,7 +1315,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
"" | " "*) ;;
-@@ -5892,7 +6206,7 @@
+@@ -5950,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],
@@ -1381,7 +1324,7 @@
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -5903,11 +6217,12 @@
+@@ -5961,11 +6217,12 @@
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -1396,7 +1339,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
-@@ -5920,7 +6235,7 @@
+@@ -5978,7 +6235,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -1405,7 +1348,7 @@
;;
linux* | k*bsd*-gnu)
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -5929,6 +6244,7 @@
+@@ -5987,6 +6244,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
@@ -1413,7 +1356,7 @@
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -5959,12 +6275,14 @@
+@@ -6017,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'.
@@ -1429,7 +1372,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
-@@ -6014,7 +6332,7 @@
+@@ -6072,7 +6332,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -1438,7 +1381,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -6062,7 +6380,7 @@
+@@ -6120,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
@@ -1447,7 +1390,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'
-@@ -6080,7 +6398,7 @@
+@@ -6138,7 +6398,7 @@
fi
;;
@@ -1456,7 +1399,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'
-@@ -6095,7 +6413,7 @@
+@@ -6153,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'
;;
@@ -1465,7 +1408,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -6113,13 +6431,22 @@
+@@ -6171,13 +6431,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -1490,7 +1433,7 @@
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
-@@ -6160,7 +6487,7 @@
+@@ -6218,7 +6487,7 @@
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
@@ -1499,7 +1442,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-@@ -6225,7 +6552,7 @@
+@@ -6283,7 +6552,7 @@
fi
;;
@@ -1508,7 +1451,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.
-@@ -6245,7 +6572,7 @@
+@@ -6303,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.
@@ -1517,7 +1460,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -6279,7 +6606,7 @@
+@@ -6337,7 +6606,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1526,7 +1469,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -6372,7 +6699,7 @@
+@@ -6430,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.
@@ -1535,7 +1478,7 @@
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
-@@ -6405,19 +6732,18 @@
+@@ -6463,19 +6732,18 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -1561,7 +1504,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}'
;;
*)
-@@ -6579,24 +6905,28 @@
+@@ -6637,24 +6905,28 @@
;;
openbsd*)
@@ -1607,7 +1550,7 @@
fi
;;
-@@ -6655,17 +6985,16 @@
+@@ -6713,17 +6985,16 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -1634,7 +1577,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -6722,7 +7051,7 @@
+@@ -6780,7 +7051,7 @@
fi
;;
@@ -1643,7 +1586,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
-@@ -6797,7 +7126,7 @@
+@@ -6855,7 +7126,7 @@
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -1652,7 +1595,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
-@@ -6900,6 +7229,30 @@
+@@ -6958,6 +7229,30 @@
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -1683,7 +1626,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 #
-@@ -6920,12 +7273,13 @@
+@@ -6978,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
@@ -1698,7 +1641,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6958,6 +7312,7 @@
+@@ -7016,6 +7312,7 @@
done
])
SED=$lt_cv_path_SED
@@ -1706,17 +1649,7 @@
AC_MSG_RESULT([$SED])
])
-@@ -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 @@
+@@ -7167,7 +7464,7 @@
_PKG_TEXT
@@ -1725,7 +1658,7 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -7118,7 +7474,7 @@
+@@ -7177,7 +7474,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
@@ -1734,7 +1667,7 @@
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -7128,14 +7484,31 @@
+@@ -7187,14 +7484,31 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
@@ -1769,7 +1702,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-@@ -7192,14 +7565,14 @@
+@@ -7251,14 +7565,14 @@
# AM_CONDITIONAL -*- Autoconf -*-
@@ -1786,7 +1719,7 @@
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
-@@ -7208,8 +7581,10 @@
+@@ -7267,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
@@ -1799,7 +1732,7 @@
if $2; then
$1_TRUE=
$1_FALSE='#'
-@@ -7223,15 +7598,14 @@
+@@ -7282,15 +7598,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
@@ -1817,7 +1750,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,
-@@ -7259,6 +7633,7 @@
+@@ -7318,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'],
@@ -1825,7 +1758,7 @@
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
-@@ -7324,6 +7699,7 @@
+@@ -7383,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 &&
@@ -1833,7 +1766,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
-@@ -7376,7 +7752,8 @@
+@@ -7435,7 +7752,8 @@
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
@@ -1843,7 +1776,7 @@
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
-@@ -7401,8 +7778,9 @@
+@@ -7460,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.
@@ -1855,7 +1788,7 @@
dirpart=`AS_DIRNAME("$mf")`
else
continue
-@@ -7461,14 +7839,14 @@
+@@ -7520,14 +7839,14 @@
# Do all the work for Automake. -*- Autoconf -*-
@@ -1873,7 +1806,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.
-@@ -7485,16 +7863,20 @@
+@@ -7544,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],
@@ -1899,7 +1832,7 @@
fi
# test whether we have cygpath
-@@ -7514,6 +7896,9 @@
+@@ -7573,6 +7896,9 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
@@ -1909,7 +1842,7 @@
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-@@ -7549,6 +7934,10 @@
+@@ -7608,6 +7934,10 @@
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
@@ -1920,7 +1853,7 @@
])
])
-@@ -7562,16 +7951,17 @@
+@@ -7621,16 +7951,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
@@ -1940,7 +1873,7 @@
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
-@@ -7584,7 +7974,7 @@
+@@ -7643,7 +7974,7 @@
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -1949,7 +1882,7 @@
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-@@ -7691,14 +8081,14 @@
+@@ -7750,14 +8081,14 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
@@ -1966,7 +1899,7 @@
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
-@@ -7714,6 +8104,7 @@
+@@ -7773,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
@@ -1974,7 +1907,7 @@
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
-@@ -7724,7 +8115,7 @@
+@@ -7783,7 +8115,7 @@
fi
])
@@ -1983,7 +1916,7 @@
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -7732,60 +8123,23 @@
+@@ -7791,60 +8123,23 @@
# AM_PROG_MKDIR_P
# ---------------
@@ -2060,7 +1993,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-@@ -8078,9 +8432,21 @@
+@@ -8137,9 +8432,21 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
@@ -2083,9 +2016,604 @@
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-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
+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
@@ -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.
@@ -2162,7 +2690,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -2172,13 +2700,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -2186,7 +2714,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -2204,7 +2732,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -2212,7 +2740,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -2224,7 +2752,7 @@
installdir = ${coredir}/config
install_DATA = \
__init__.py \
-@@ -308,13 +308,9 @@
+@@ -309,13 +308,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -2239,7 +2767,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 +338,7 @@
+@@ -343,7 +338,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -2248,7 +2776,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 +361,21 @@
+@@ -366,22 +361,21 @@
distdir: $(DISTFILES)
@@ -2284,7 +2812,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -396,7 +391,7 @@
+@@ -397,7 +391,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -2293,7 +2821,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -429,7 +424,7 @@
+@@ -430,7 +424,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -2302,7 +2830,7 @@
dvi: dvi-am
-@@ -443,12 +438,20 @@
+@@ -444,12 +438,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -2323,7 +2851,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -467,20 +470,22 @@
+@@ -468,20 +470,22 @@
ps-am:
@@ -2352,189 +2880,327 @@
# 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/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 @@
+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 @@
#! /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 @@
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-# Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# Free Software Foundation, Inc.
+
+-timestamp='2006-07-02'
++timestamp='2008-01-23'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -56,8 +56,8 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -161,6 +161,7 @@
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
++ sh5el) machine=sh5le-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+@@ -329,7 +330,7 @@
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+- i86pc:SunOS:5.*:*)
++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+@@ -531,7 +532,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[45])
++ *:AIX:*:[456])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -780,7 +781,7 @@
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
+- i*:MINGW*:*)
++ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+ i*:windows32*:*)
+@@ -790,12 +791,18 @@
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- x86:Interix*:[3456]*)
+- echo i586-pc-interix${UNAME_RELEASE}
+- exit ;;
+- EM64T:Interix*:[3456]*)
+- echo x86_64-unknown-interix${UNAME_RELEASE}
+- exit ;;
++ *:Interix*:[3456]*)
++ case ${UNAME_MACHINE} in
++ x86)
++ echo i586-pc-interix${UNAME_RELEASE}
++ exit ;;
++ EM64T | authenticamd)
++ echo x86_64-unknown-interix${UNAME_RELEASE}
++ exit ;;
++ IA64)
++ echo ia64-unknown-interix${UNAME_RELEASE}
++ exit ;;
++ esac ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
+@@ -829,7 +836,14 @@
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+ arm*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ eval $set_cc_for_build
++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_EABI__
++ then
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ else
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ fi
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -950,6 +964,9 @@
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+ exit ;;
++ xtensa*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+@@ -1208,6 +1225,15 @@
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit ;;
++ SX-7:SUPER-UX:*:*)
++ echo sx7-nec-superux${UNAME_RELEASE}
++ exit ;;
++ SX-8:SUPER-UX:*:*)
++ echo sx8-nec-superux${UNAME_RELEASE}
++ exit ;;
++ SX-8R:SUPER-UX:*:*)
++ echo sx8r-nec-superux${UNAME_RELEASE}
++ exit ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit ;;
+@@ -1458,9 +1484,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+
+- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+diff -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 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-# Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# Free Software Foundation, Inc.
+
+-timestamp='2006-09-20'
++timestamp='2008-01-16'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -72,8 +72,8 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -245,12 +245,12 @@
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+- | fr30 | frv \
++ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+- | maxq | mb | microblaze | mcore \
++ | maxq | mb | microblaze | mcore | mep \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+@@ -324,7 +324,7 @@
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+@@ -369,10 +369,14 @@
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+- | xstormy16-* | xtensa-* \
++ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
++ # Recognize the basic CPU types without company name, with glob match.
++ xtensa*)
++ basic_machine=$basic_machine-unknown
++ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+@@ -443,6 +447,14 @@
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
++ blackfin)
++ basic_machine=bfin-unknown
++ os=-linux
++ ;;
++ blackfin-*)
++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+@@ -475,8 +487,8 @@
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+- cr16c)
+- basic_machine=cr16c-unknown
++ cr16)
++ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+ crds | unos)
+@@ -668,6 +680,14 @@
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
++ m68knommu)
++ basic_machine=m68k-unknown
++ os=-linux
++ ;;
++ m68knommu-*)
++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+@@ -683,6 +703,10 @@
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
++ mingw32ce)
++ basic_machine=arm-unknown
++ os=-mingw32ce
++ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+@@ -809,6 +833,14 @@
+ basic_machine=i860-intel
+ os=-osf
+ ;;
++ parisc)
++ basic_machine=hppa-unknown
++ os=-linux
++ ;;
++ parisc-*)
++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++ os=-linux
++ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+@@ -925,6 +957,9 @@
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
++ sh5el)
++ basic_machine=sh5le-unknown
++ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+@@ -1014,6 +1049,10 @@
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ tile*)
++ basic_machine=tile-unknown
++ os=-linux-gnu
++ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+ ;;
+@@ -1219,7 +1258,7 @@
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1414,6 +1453,9 @@
+ m68*-cisco)
+ os=-aout
+ ;;
++ mep-*)
++ os=-elf
++ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
+diff -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 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
@@ -2542,7 +3208,7 @@
CYGPATH_W
PACKAGE
VERSION
-@@ -856,15 +872,16 @@
+@@ -865,14 +866,14 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
@@ -2559,11 +3225,9 @@
-INTLTOOL_MSGMERGE
-INTLTOOL_XGETTEXT
ALL_LINGUAS
-+DATADIRNAME
+ DATADIRNAME
build
- build_cpu
- build_vendor
-@@ -873,10 +890,13 @@
+@@ -883,10 +884,13 @@
host_cpu
host_vendor
host_os
@@ -2574,108 +3238,21 @@
RANLIB
+DSYMUTIL
+NMEDIT
- CXXCPP
- F77
- FFLAGS
-@@ -915,12 +935,10 @@
+ CXX
+ CXXFLAGS
+ ac_ct_CXX
+@@ -927,10 +931,8 @@
UPDATE_DESKTOP_DATABASE
GETTEXT_PACKAGE
USE_NLS
-MSGFMT
-+MSGFMT_OPTS
+ MSGFMT_OPTS
GMSGFMT
-XGETTEXT
CATALOGS
CATOBJEXT
--DATADIRNAME
GMOFILES
- 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 @@
+@@ -2034,7 +2036,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -2685,16 +3262,7 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
-@@ -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 @@
+@@ -2217,38 +2220,53 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -2777,16 +3345,7 @@
for ac_prog in gawk mawk nawk awk
do
-@@ -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 @@
+@@ -2331,12 +2349,16 @@
fi
rmdir .tst 2>/dev/null
@@ -2807,7 +3366,7 @@
fi
# test whether we have cygpath
-@@ -2368,7 +2408,7 @@
+@@ -2370,7 +2392,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
@@ -2816,25 +3375,7 @@
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
-@@ -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 @@
+@@ -2474,7 +2496,7 @@
fi
fi
@@ -2843,7 +3384,7 @@
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-@@ -2499,9 +2539,7 @@
+@@ -2501,9 +2523,7 @@
{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
@@ -2854,252 +3395,7 @@
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
-@@ -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 @@
+@@ -3486,9 +3506,7 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
@@ -3110,7 +3406,7 @@
AMDEP_TRUE=
AMDEP_FALSE='#'
else
-@@ -3577,7 +3532,6 @@
+@@ -3498,7 +3516,6 @@
@@ -3118,7 +3414,7 @@
depcc="$CC" am_compiler_list=
{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-@@ -3645,6 +3599,7 @@
+@@ -3566,6 +3583,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 &&
@@ -3126,7 +3422,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
-@@ -3674,9 +3629,7 @@
+@@ -3595,9 +3613,7 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -3137,310 +3433,7 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
-@@ -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 @@
+@@ -4246,6 +4262,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 $< $@'
@@ -3448,7 +3441,7 @@
-@@ -4931,24 +4771,18 @@
+@@ -4266,24 +4283,18 @@
@@ -3479,18 +3472,16 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4957,8 +4791,8 @@
- IFS=$as_save_IFS
+@@ -4293,7 +4304,7 @@
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_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
-@@ -4969,49 +4803,26 @@
+@@ -4304,49 +4315,26 @@
;;
esac
fi
@@ -3549,18 +3540,16 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5020,8 +4831,8 @@
- IFS=$as_save_IFS
+@@ -4356,7 +4344,7 @@
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_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
-@@ -5029,14 +4840,13 @@
+@@ -4364,14 +4352,13 @@
done
IFS=$as_save_IFS
@@ -3579,7 +3568,7 @@
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-@@ -5047,12 +4857,12 @@
+@@ -4382,12 +4369,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; }
@@ -3595,18 +3584,16 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5061,8 +4871,8 @@
- IFS=$as_save_IFS
+@@ -4397,7 +4384,7 @@
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_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
-@@ -5070,30 +4880,51 @@
+@@ -4405,71 +4392,51 @@
done
IFS=$as_save_IFS
@@ -3630,11 +3617,46 @@
-# 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
+ 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; }
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
@@ -3642,11 +3664,13 @@
+ { { 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'
@@ -3656,41 +3680,39 @@
+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_MSGMERGE+set}" = set; then
+-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- case $INTLTOOL_MSGMERGE in
+- case $INTLTOOL_XGETTEXT in
+ case $INTLTOOL_PERL in
[\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
+- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # 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
-@@ -5102,8 +4933,8 @@
- IFS=$as_save_IFS
+@@ -4479,7 +4446,7 @@
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_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
+ 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"
+ 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
-@@ -5111,63 +4942,186 @@
+@@ -4487,20 +4454,41 @@
done
IFS=$as_save_IFS
-- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
+- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
;;
esac
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; }
+-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_PERL=$ac_cv_path_INTLTOOL_PERL
+if test -n "$INTLTOOL_PERL"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
@@ -3701,11 +3723,6 @@
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;}
@@ -3728,193 +3745,19 @@
+ { (exit 1); exit 1; }; }
+ fi
+fi
-+
-+# 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;
+
+ # 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
+ return _nl_msg_cat_cntr
-+ ;
-+ 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 @@
+ ;
+ return 0;
+ }
+@@ -4880,12 +4868,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3929,7 +3772,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -5442,6 +5397,7 @@
+@@ -4920,6 +4909,7 @@
fi
SED=$lt_cv_path_SED
@@ -3937,7 +3780,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -5641,8 +5597,8 @@
+@@ -5119,8 +5109,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -3948,7 +3791,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5661,7 +5617,7 @@
+@@ -5139,7 +5129,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -3957,7 +3800,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5683,9 +5639,15 @@
+@@ -5161,9 +5151,15 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -3976,7 +3819,7 @@
;;
darwin* | rhapsody*)
-@@ -5730,7 +5692,7 @@
+@@ -5208,7 +5204,7 @@
esac
;;
@@ -3985,7 +3828,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)$'
;;
-@@ -5780,6 +5742,10 @@
+@@ -5258,6 +5254,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3996,16 +3839,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -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 @@
+@@ -5379,7 +5379,8 @@
rm -rf conftest*
;;
@@ -4015,7 +3849,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -5912,6 +5879,9 @@
+@@ -5390,6 +5391,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -4025,7 +3859,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -5928,6 +5898,9 @@
+@@ -5406,6 +5410,9 @@
;;
*64-bit*)
case $host in
@@ -4035,49 +3869,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -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 @@
+@@ -5509,7 +5516,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -4090,313 +3882,26 @@
esac
;;
esac
-@@ -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 @@
+@@ -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 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -4404,7 +3909,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; }
-@@ -6957,24 +6814,27 @@
+@@ -6789,24 +6798,27 @@
fi
;;
*)
@@ -4449,7 +3954,7 @@
;;
esac
-@@ -6991,6 +6851,7 @@
+@@ -6823,6 +6835,7 @@
@@ -4457,7 +3962,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; }
-@@ -7181,7 +7042,7 @@
+@@ -7013,7 +7026,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -4466,61 +3971,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -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 @@
+@@ -7411,7 +7424,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -4529,114 +3980,10 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -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
-+
+@@ -7573,6 +7586,318 @@
+ ;;
+ esac
+
+
+ case $host_os in
+ rhapsody* | darwin*)
@@ -4762,27 +4109,17 @@
+done
+IFS=$as_save_IFS
+
- 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
+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
-
--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
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
@@ -4792,40 +4129,8 @@
+{ 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
-- 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
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
@@ -4843,38 +4148,21 @@
+done
+done
+IFS=$as_save_IFS
-
--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
+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
-- MAGIC_CMD=:
++ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
@@ -4886,13 +4174,11 @@
+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; }
@@ -4946,7 +4232,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=$?
@@ -5009,10 +4295,11 @@
+ ;;
+ esac
+
-
++
enable_dlopen=no
enable_win32_dll=no
-@@ -7779,10 +7952,10 @@
+
+@@ -7611,10 +7936,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -5025,7 +4312,7 @@
# If no C compiler was specified, use CC.
-@@ -7797,16 +7970,16 @@
+@@ -7629,16 +7954,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -5045,7 +4332,7 @@
-@@ -7823,7 +7996,7 @@
+@@ -7655,7 +7980,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -5054,21 +4341,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.
-@@ -7834,11 +8007,11 @@
+@@ -7666,11 +7991,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:7837: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8010: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7669: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7994: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7841: \$? = $ac_status" >&5
-+ echo "$as_me:8014: \$? = $ac_status" >&5
+- echo "$as_me:7673: \$? = $ac_status" >&5
++ echo "$as_me:7998: \$? = $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.
-@@ -7889,13 +8062,15 @@
+@@ -7721,13 +8046,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -5086,7 +4373,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -7905,7 +8080,7 @@
+@@ -7737,7 +8064,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -5095,7 +4382,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -7963,7 +8138,7 @@
+@@ -7795,7 +8122,7 @@
esac
;;
@@ -5104,7 +4391,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'
-@@ -8015,6 +8190,22 @@
+@@ -7847,6 +8174,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -5127,7 +4414,7 @@
esac
;;
-@@ -8024,6 +8215,10 @@
+@@ -7856,6 +8199,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -5138,7 +4425,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -8086,12 +8281,12 @@
+@@ -7918,12 +8265,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; }
@@ -5154,17 +4441,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.
-@@ -8102,27 +8297,27 @@
+@@ -7934,27 +8281,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:8105: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8300: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7937: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8284: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8109: \$? = $ac_status" >&5
-+ echo "$as_me:8304: \$? = $ac_status" >&5
+- echo "$as_me:7941: \$? = $ac_status" >&5
++ echo "$as_me:8288: \$? = $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.
@@ -5188,7 +4475,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -8149,13 +8344,13 @@
+@@ -7981,13 +8328,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; }
@@ -5205,7 +4492,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
-@@ -8165,20 +8360,20 @@
+@@ -7997,20 +8344,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
@@ -5232,7 +4519,7 @@
:
else
lt_prog_compiler_static=
-@@ -8195,7 +8390,7 @@
+@@ -8027,7 +8374,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -5241,21 +4528,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -8206,11 +8401,11 @@
+@@ -8038,11 +8385,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:8209: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8404: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8041: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8213: \$? = $ac_status" >&5
-+ echo "$as_me:8408: \$? = $ac_status" >&5
+- echo "$as_me:8045: \$? = $ac_status" >&5
++ echo "$as_me:8392: \$? = $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
-@@ -8290,12 +8485,13 @@
+@@ -8122,12 +8469,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'.
@@ -5270,7 +4557,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -8354,7 +8550,7 @@
+@@ -8186,7 +8534,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -5279,7 +4566,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -8402,7 +8598,7 @@
+@@ -8234,7 +8582,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -5288,7 +4575,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'
-@@ -8420,7 +8616,7 @@
+@@ -8252,7 +8600,7 @@
fi
;;
@@ -5297,7 +4584,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -8435,7 +8631,7 @@
+@@ -8267,7 +8615,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'
;;
@@ -5306,7 +4593,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8453,13 +8649,22 @@
+@@ -8285,13 +8633,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -5331,7 +4618,7 @@
fi
link_all_deplibs=no
else
-@@ -8565,7 +8770,7 @@
+@@ -8397,7 +8754,7 @@
fi
;;
@@ -5340,7 +4627,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.
-@@ -8585,7 +8790,7 @@
+@@ -8417,7 +8774,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.
@@ -5349,7 +4636,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -8619,7 +8824,7 @@
+@@ -8451,7 +8808,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -5358,40 +4645,12 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -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
--
+@@ -8525,11 +8882,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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/ {
@@ -5409,49 +4668,12 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -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
--
+@@ -8584,11 +8948,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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/ {
@@ -5469,16 +4691,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -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 @@
+@@ -8642,7 +9013,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.
@@ -5487,7 +4700,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -8875,19 +9062,18 @@
+@@ -8675,19 +9046,18 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -5513,7 +4726,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}'
;;
*)
-@@ -9049,24 +9235,28 @@
+@@ -8849,24 +9219,28 @@
;;
openbsd*)
@@ -5559,7 +4772,7 @@
fi
;;
-@@ -9125,17 +9315,16 @@
+@@ -8925,17 +9299,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -5586,7 +4799,7 @@
esac
link_all_deplibs=yes
;;
-@@ -9192,7 +9381,7 @@
+@@ -8992,7 +9365,7 @@
fi
;;
@@ -5595,7 +4808,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -9269,7 +9458,7 @@
+@@ -9069,7 +9442,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*
@@ -5604,7 +4817,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -9327,17 +9516,55 @@
+@@ -9127,17 +9500,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5664,7 +4877,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -9358,7 +9585,7 @@
+@@ -9158,7 +9569,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -5673,7 +4886,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9497,12 +9724,8 @@
+@@ -9297,12 +9708,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -5688,7 +4901,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -9556,7 +9779,7 @@
+@@ -9356,7 +9763,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -5697,7 +4910,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -9619,7 +9842,7 @@
+@@ -9419,7 +9826,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -5706,7 +4919,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9690,7 +9913,7 @@
+@@ -9490,7 +9897,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -5715,7 +4928,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -9796,6 +10019,10 @@
+@@ -9596,6 +10003,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -5726,7 +4939,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -9892,6 +10119,21 @@
+@@ -9692,6 +10103,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -5748,7 +4961,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"
-@@ -9949,6 +10191,7 @@
+@@ -9749,6 +10175,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -5756,132 +4969,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -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
+@@ -10010,7 +10437,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
@@ -5890,174 +4978,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -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
+@@ -10286,7 +10713,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
@@ -6066,25 +4987,25 @@
fi
-@@ -10647,7 +10778,7 @@
+@@ -10335,7 +10762,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10650 "configure"
-+#line 10781 "configure"
+-#line 10338 "configure"
++#line 10765 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10747,7 +10878,7 @@
+@@ -10435,7 +10862,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10750 "configure"
-+#line 10881 "configure"
+-#line 10438 "configure"
++#line 10865 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10874,7 +11005,7 @@
+@@ -10562,7 +10989,7 @@
fi
;;
@@ -6093,7 +5014,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -10930,6 +11061,7 @@
+@@ -10618,6 +11045,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -6101,7 +5022,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -10945,6 +11077,7 @@
+@@ -10633,6 +11061,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -6109,7 +5030,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -10989,7 +11122,7 @@
+@@ -10677,7 +11106,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -6118,7 +5039,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -11225,6 +11358,10 @@
+@@ -10913,6 +11342,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -6129,7 +5050,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -11313,7 +11450,7 @@
+@@ -11001,7 +11434,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -6138,7 +5059,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -11473,6 +11610,7 @@
+@@ -11161,6 +11594,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -6146,7 +5067,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -11482,10 +11620,10 @@
+@@ -11170,10 +11604,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -6159,7 +5080,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -11501,16 +11639,16 @@
+@@ -11189,16 +11623,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -6179,7 +5100,7 @@
# Allow CC to be a program name with arguments.
-@@ -11717,7 +11855,7 @@
+@@ -11405,7 +11839,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -6188,7 +5109,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.
-@@ -11730,7 +11868,7 @@
+@@ -11418,7 +11852,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.
@@ -6197,7 +5118,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -11766,7 +11904,7 @@
+@@ -11454,7 +11888,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -6206,40 +5127,12 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -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
--
+@@ -11528,11 +11962,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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/ {
@@ -6257,49 +5150,12 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -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
--
+@@ -11588,11 +12029,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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/ {
@@ -6317,16 +5173,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -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 @@
+@@ -11662,59 +12110,31 @@
fi
;;
darwin* | rhapsody*)
@@ -6397,7 +5244,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}'
;;
*)
-@@ -12141,9 +12233,7 @@
+@@ -11797,9 +12217,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -6408,7 +5255,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -12211,7 +12301,7 @@
+@@ -11867,7 +12285,7 @@
;;
esac
;;
@@ -6417,7 +5264,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -12303,7 +12393,7 @@
+@@ -11959,7 +12377,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -6426,7 +5273,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'
-@@ -12331,6 +12421,29 @@
+@@ -11987,6 +12405,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'
;;
@@ -6456,7 +5303,7 @@
esac
;;
lynxos*)
-@@ -12369,16 +12482,20 @@
+@@ -12025,16 +12466,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -6486,7 +5333,7 @@
;;
osf3*)
case $cc_basename in
-@@ -12540,15 +12657,10 @@
+@@ -12196,15 +12641,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -6505,7 +5352,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -12595,6 +12707,12 @@
+@@ -12251,6 +12691,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -6518,7 +5365,7 @@
fi
;;
esac
-@@ -12682,7 +12800,6 @@
+@@ -12338,7 +12784,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -6526,7 +5373,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -12784,9 +12901,14 @@
+@@ -12440,9 +12885,14 @@
$rm -f confest.$objext
@@ -6542,7 +5389,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=
-@@ -12794,19 +12916,51 @@
+@@ -12450,19 +12900,51 @@
postdeps_CXX=
;;
@@ -6596,7 +5443,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -12837,12 +12991,14 @@
+@@ -12493,12 +12975,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -6613,7 +5460,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -12854,7 +13010,7 @@
+@@ -12510,7 +12994,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -6622,7 +5469,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -12880,7 +13036,7 @@
+@@ -12536,7 +13020,7 @@
esac
else
case $host_os in
@@ -6631,7 +5478,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -12976,7 +13132,7 @@
+@@ -12632,7 +13116,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -6640,7 +5487,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -12990,6 +13146,14 @@
+@@ -12646,6 +13130,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -6655,7 +5502,7 @@
;;
esac
;;
-@@ -13099,12 +13263,12 @@
+@@ -12755,12 +13247,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; }
@@ -6671,17 +5518,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.
-@@ -13115,27 +13279,27 @@
+@@ -12771,27 +13263,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:13118: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13282: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12774: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13266: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13122: \$? = $ac_status" >&5
-+ echo "$as_me:13286: \$? = $ac_status" >&5
+- echo "$as_me:12778: \$? = $ac_status" >&5
++ echo "$as_me:13270: \$? = $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.
@@ -6705,7 +5552,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -13162,13 +13326,13 @@
+@@ -12818,13 +13310,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; }
@@ -6722,7 +5569,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
-@@ -13178,20 +13342,20 @@
+@@ -12834,20 +13326,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
@@ -6749,7 +5596,7 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -13208,7 +13372,7 @@
+@@ -12864,7 +13356,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -6758,21 +5605,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -13219,11 +13383,11 @@
+@@ -12875,11 +13367,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:13222: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13386: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12878: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13370: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13226: \$? = $ac_status" >&5
-+ echo "$as_me:13390: \$? = $ac_status" >&5
+- echo "$as_me:12882: \$? = $ac_status" >&5
++ echo "$as_me:13374: \$? = $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
-@@ -13276,7 +13440,7 @@
+@@ -12932,7 +13424,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -6781,7 +5628,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
-@@ -13289,7 +13453,7 @@
+@@ -12945,7 +13437,7 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -6790,7 +5637,7 @@
;;
linux* | k*bsd*-gnu)
link_all_deplibs_CXX=no
-@@ -13298,6 +13462,7 @@
+@@ -12954,6 +13446,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
@@ -6798,7 +5645,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -13323,7 +13488,7 @@
+@@ -12979,7 +13472,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*
@@ -6807,7 +5654,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -13381,20 +13546,7 @@
+@@ -13037,20 +13530,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6829,7 +5676,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13412,7 +13564,7 @@
+@@ -13068,7 +13548,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -6838,7 +5685,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13551,12 +13703,7 @@
+@@ -13207,12 +13687,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -6852,7 +5699,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -13610,7 +13757,7 @@
+@@ -13266,7 +13741,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -6861,7 +5708,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -13673,7 +13820,7 @@
+@@ -13329,7 +13804,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -6870,7 +5717,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13744,7 +13891,7 @@
+@@ -13400,7 +13875,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -6879,7 +5726,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -13850,6 +13997,10 @@
+@@ -13506,6 +13981,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -6890,7 +5737,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -13946,6 +14097,21 @@
+@@ -13602,6 +14081,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -6912,7 +5759,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"
-@@ -14029,6 +14195,7 @@
+@@ -13685,6 +14179,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -6920,7 +5767,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -14044,6 +14211,7 @@
+@@ -13700,6 +14195,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -6928,7 +5775,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -14276,6 +14444,10 @@
+@@ -13932,6 +14428,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -6939,7 +5786,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
-@@ -14364,7 +14536,7 @@
+@@ -14020,7 +14520,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -6948,7 +5795,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -14455,10 +14627,17 @@
+@@ -14111,10 +14611,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -6968,7 +5815,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -14474,16 +14653,16 @@
+@@ -14130,16 +14637,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -6988,7 +5835,7 @@
# Allow CC to be a program name with arguments.
-@@ -14521,7 +14700,7 @@
+@@ -14177,7 +14684,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -6997,7 +5844,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -14567,13 +14746,15 @@
+@@ -14223,13 +14730,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -7015,7 +5862,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -14583,7 +14764,7 @@
+@@ -14239,7 +14748,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -7024,7 +5871,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -14641,7 +14822,7 @@
+@@ -14297,7 +14806,7 @@
esac
;;
@@ -7033,7 +5880,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'
-@@ -14693,6 +14874,22 @@
+@@ -14349,6 +14858,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -7056,7 +5903,7 @@
esac
;;
-@@ -14702,6 +14899,10 @@
+@@ -14358,6 +14883,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -7067,7 +5914,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -14764,12 +14965,12 @@
+@@ -14420,12 +14949,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; }
@@ -7083,17 +5930,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.
-@@ -14780,27 +14981,27 @@
+@@ -14436,27 +14965,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:14783: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14984: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14439: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14968: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14787: \$? = $ac_status" >&5
-+ echo "$as_me:14988: \$? = $ac_status" >&5
+- echo "$as_me:14443: \$? = $ac_status" >&5
++ echo "$as_me:14972: \$? = $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.
@@ -7117,7 +5964,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -14827,13 +15028,13 @@
+@@ -14483,13 +15012,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; }
@@ -7134,7 +5981,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
-@@ -14843,20 +15044,20 @@
+@@ -14499,20 +15028,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
@@ -7161,7 +6008,7 @@
:
else
lt_prog_compiler_static_F77=
-@@ -14873,7 +15074,7 @@
+@@ -14529,7 +15058,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -7170,21 +6017,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14884,11 +15085,11 @@
+@@ -14540,11 +15069,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:14887: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15088: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14543: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15072: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14891: \$? = $ac_status" >&5
-+ echo "$as_me:15092: \$? = $ac_status" >&5
+- echo "$as_me:14547: \$? = $ac_status" >&5
++ echo "$as_me:15076: \$? = $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
-@@ -14968,12 +15169,13 @@
+@@ -14624,12 +15153,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'.
@@ -7199,7 +6046,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -15032,7 +15234,7 @@
+@@ -14688,7 +15218,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -7208,7 +6055,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -15080,7 +15282,7 @@
+@@ -14736,7 +15266,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -7217,7 +6064,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'
-@@ -15098,7 +15300,7 @@
+@@ -14754,7 +15284,7 @@
fi
;;
@@ -7226,7 +6073,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -15113,7 +15315,7 @@
+@@ -14769,7 +15299,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'
;;
@@ -7235,7 +6082,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -15131,13 +15333,22 @@
+@@ -14787,13 +15317,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -7260,7 +6107,7 @@
fi
link_all_deplibs_F77=no
else
-@@ -15243,7 +15454,7 @@
+@@ -14899,7 +15438,7 @@
fi
;;
@@ -7269,7 +6116,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.
-@@ -15263,7 +15474,7 @@
+@@ -14919,7 +15458,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.
@@ -7278,7 +6125,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -15297,7 +15508,7 @@
+@@ -14953,7 +15492,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -7287,40 +6134,12 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -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
--
+@@ -15017,11 +15556,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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/ {
@@ -7338,49 +6157,12 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -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
--
+@@ -15066,11 +15612,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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/ {
@@ -7398,16 +6180,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -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 @@
+@@ -15124,7 +15677,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.
@@ -7416,7 +6189,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -15533,19 +15726,18 @@
+@@ -15157,19 +15710,18 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -7442,7 +6215,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}'
;;
*)
-@@ -15707,24 +15899,28 @@
+@@ -15331,24 +15883,28 @@
;;
openbsd*)
@@ -7488,7 +6261,7 @@
fi
;;
-@@ -15783,17 +15979,16 @@
+@@ -15407,17 +15963,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -7515,7 +6288,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -15850,7 +16045,7 @@
+@@ -15474,7 +16029,7 @@
fi
;;
@@ -7524,7 +6297,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -15927,7 +16122,7 @@
+@@ -15551,7 +16106,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*
@@ -7533,7 +6306,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -15985,20 +16180,7 @@
+@@ -15609,20 +16164,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7555,7 +6328,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -16016,7 +16198,7 @@
+@@ -15640,7 +16182,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -7564,7 +6337,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16155,12 +16337,7 @@
+@@ -15779,12 +16321,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -7578,7 +6351,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -16214,7 +16391,7 @@
+@@ -15838,7 +16375,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -7587,7 +6360,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -16277,7 +16454,7 @@
+@@ -15901,7 +16438,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -7596,7 +6369,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16348,7 +16525,7 @@
+@@ -15972,7 +16509,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -7605,7 +6378,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -16454,6 +16631,10 @@
+@@ -16078,6 +16615,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -7616,7 +6389,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -16550,6 +16731,21 @@
+@@ -16174,6 +16715,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -7638,7 +6411,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"
-@@ -16633,6 +16829,7 @@
+@@ -16257,6 +16813,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -7646,7 +6419,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -16648,6 +16845,7 @@
+@@ -16272,6 +16829,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -7654,7 +6427,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -16880,6 +17078,10 @@
+@@ -16504,6 +17062,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -7665,7 +6438,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
-@@ -16968,7 +17170,7 @@
+@@ -16592,7 +17154,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -7674,7 +6447,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -17026,10 +17228,10 @@
+@@ -16650,10 +17212,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -7687,7 +6460,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -17045,16 +17247,16 @@
+@@ -16669,16 +17231,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -7707,7 +6480,7 @@
# Allow CC to be a program name with arguments.
-@@ -17092,7 +17294,7 @@
+@@ -16716,7 +17278,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -7716,21 +6489,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.
-@@ -17103,11 +17305,11 @@
+@@ -16727,11 +17289,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:17106: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17308: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16730: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17292: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17110: \$? = $ac_status" >&5
-+ echo "$as_me:17312: \$? = $ac_status" >&5
+- echo "$as_me:16734: \$? = $ac_status" >&5
++ echo "$as_me:17296: \$? = $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.
-@@ -17158,14 +17360,16 @@
+@@ -16782,14 +17344,16 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -7750,7 +6523,7 @@
;;
darwin* | rhapsody*)
-@@ -17174,7 +17378,7 @@
+@@ -16798,7 +17362,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -7759,7 +6532,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -17232,10 +17436,10 @@
+@@ -16856,10 +17420,10 @@
esac
;;
@@ -7772,7 +6545,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -17284,6 +17488,22 @@
+@@ -16908,6 +17472,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -7795,7 +6568,7 @@
esac
;;
-@@ -17293,6 +17513,10 @@
+@@ -16917,6 +17497,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -7806,7 +6579,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -17355,12 +17579,12 @@
+@@ -16979,12 +17563,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; }
@@ -7822,17 +6595,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.
-@@ -17371,27 +17595,27 @@
+@@ -16995,27 +17579,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:17374: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17598: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16998: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17582: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17378: \$? = $ac_status" >&5
-+ echo "$as_me:17602: \$? = $ac_status" >&5
+- echo "$as_me:17002: \$? = $ac_status" >&5
++ echo "$as_me:17586: \$? = $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.
@@ -7856,7 +6629,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -17418,13 +17642,13 @@
+@@ -17042,13 +17626,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; }
@@ -7873,7 +6646,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
-@@ -17434,20 +17658,20 @@
+@@ -17058,20 +17642,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
@@ -7900,7 +6673,7 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -17464,7 +17688,7 @@
+@@ -17088,7 +17672,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -7909,21 +6682,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -17475,11 +17699,11 @@
+@@ -17099,11 +17683,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:17478: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17702: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17102: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17686: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17482: \$? = $ac_status" >&5
-+ echo "$as_me:17706: \$? = $ac_status" >&5
+- echo "$as_me:17106: \$? = $ac_status" >&5
++ echo "$as_me:17690: \$? = $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
-@@ -17559,12 +17783,13 @@
+@@ -17183,12 +17767,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'.
@@ -7938,7 +6711,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -17623,7 +17848,7 @@
+@@ -17247,7 +17832,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -7947,7 +6720,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -17671,7 +17896,7 @@
+@@ -17295,7 +17880,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -7956,7 +6729,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'
-@@ -17689,7 +17914,7 @@
+@@ -17313,7 +17898,7 @@
fi
;;
@@ -7965,7 +6738,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -17704,7 +17929,7 @@
+@@ -17328,7 +17913,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'
;;
@@ -7974,7 +6747,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -17722,13 +17947,22 @@
+@@ -17346,13 +17931,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -7999,7 +6772,7 @@
fi
link_all_deplibs_GCJ=no
else
-@@ -17834,7 +18068,7 @@
+@@ -17458,7 +18052,7 @@
fi
;;
@@ -8008,7 +6781,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.
-@@ -17854,7 +18088,7 @@
+@@ -17478,7 +18072,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.
@@ -8017,7 +6790,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -17888,7 +18122,7 @@
+@@ -17512,7 +18106,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -8026,40 +6799,12 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -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
--
+@@ -17586,11 +18180,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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/ {
@@ -8077,49 +6822,12 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -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
--
+@@ -17645,11 +18246,18 @@
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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/ {
@@ -8137,16 +6845,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -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 @@
+@@ -17703,7 +18311,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.
@@ -8155,7 +6854,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -18144,19 +18360,18 @@
+@@ -17736,19 +18344,18 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -8181,7 +6880,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}'
;;
*)
-@@ -18318,24 +18533,28 @@
+@@ -17910,24 +18517,28 @@
;;
openbsd*)
@@ -8227,7 +6926,7 @@
fi
;;
-@@ -18394,17 +18613,16 @@
+@@ -17986,17 +18597,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -8254,7 +6953,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -18461,7 +18679,7 @@
+@@ -18053,7 +18663,7 @@
fi
;;
@@ -8263,7 +6962,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -18538,7 +18756,7 @@
+@@ -18130,7 +18740,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*
@@ -8272,7 +6971,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -18596,20 +18814,7 @@
+@@ -18188,20 +18798,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8294,7 +6993,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -18627,7 +18832,7 @@
+@@ -18219,7 +18816,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -8303,7 +7002,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18766,12 +18971,7 @@
+@@ -18358,12 +18955,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -8317,7 +7016,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -18825,7 +19025,7 @@
+@@ -18417,7 +19009,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -8326,7 +7025,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -18888,7 +19088,7 @@
+@@ -18480,7 +19072,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -8335,7 +7034,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18959,7 +19159,7 @@
+@@ -18551,7 +19143,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -8344,7 +7043,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -19065,6 +19265,10 @@
+@@ -18657,6 +19249,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -8355,7 +7054,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -19161,6 +19365,21 @@
+@@ -18753,6 +19349,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -8377,7 +7076,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"
-@@ -19244,6 +19463,7 @@
+@@ -18836,6 +19447,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -8385,7 +7084,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -19259,6 +19479,7 @@
+@@ -18851,6 +19463,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -8393,7 +7092,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -19491,6 +19712,10 @@
+@@ -19083,6 +19696,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -8404,7 +7103,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
-@@ -19579,7 +19804,7 @@
+@@ -19171,7 +19788,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -8413,7 +7112,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -19636,7 +19861,7 @@
+@@ -19228,7 +19845,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -8422,7 +7121,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -19655,16 +19880,16 @@
+@@ -19247,16 +19864,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -8442,7 +7141,7 @@
# Allow CC to be a program name with arguments.
-@@ -19724,6 +19949,7 @@
+@@ -19316,6 +19933,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -8450,7 +7149,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -19739,6 +19965,7 @@
+@@ -19331,6 +19949,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -8458,7 +7157,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -19971,6 +20198,10 @@
+@@ -19563,6 +20182,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -8469,7 +7168,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
-@@ -20059,7 +20290,7 @@
+@@ -19651,7 +20274,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -8478,88 +7177,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -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 @@
+@@ -20373,7 +20996,7 @@
and GDESKLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -8568,7 +7186,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
-@@ -20815,7 +21022,7 @@
+@@ -20383,7 +21006,7 @@
and GDESKLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -8577,7 +7195,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20929,7 +21136,7 @@
+@@ -20497,7 +21120,7 @@
and UTILS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -8586,7 +7204,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
-@@ -20939,7 +21146,7 @@
+@@ -20507,7 +21130,7 @@
and UTILS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -8595,7 +7213,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21043,7 +21250,7 @@
+@@ -20611,7 +21234,7 @@
and GLIBTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -8604,7 +7222,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
-@@ -21053,7 +21260,7 @@
+@@ -20621,7 +21244,7 @@
and GLIBTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -8613,7 +7231,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21157,7 +21364,7 @@
+@@ -20725,7 +21348,7 @@
and SVG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -8622,7 +7240,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
-@@ -21167,7 +21374,7 @@
+@@ -20735,7 +21358,7 @@
and SVG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -8631,8 +7249,8 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21271,7 +21478,7 @@
- and SYSTRAY_LIBS to avoid the need to call pkg-config.
+@@ -20839,7 +21462,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>.
@@ -8640,8 +7258,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
-@@ -21281,7 +21488,7 @@
- and SYSTRAY_LIBS to avoid the need to call pkg-config.
+@@ -20849,7 +21472,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>.
@@ -8649,8 +7267,8 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21385,7 +21592,7 @@
- and TILING_LIBS to avoid the need to call pkg-config.
+@@ -20953,7 +21576,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>.
@@ -8658,8 +7276,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
-@@ -21395,7 +21602,7 @@
- and TILING_LIBS to avoid the need to call pkg-config.
+@@ -20963,7 +21586,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>.
@@ -8667,8 +7285,8 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21499,7 +21706,7 @@
- and TILINGIMAGE_LIBS to avoid the need to call pkg-config.
+@@ -21067,7 +21690,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>.
@@ -8676,8 +7294,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
-@@ -21509,7 +21716,7 @@
- and TILINGIMAGE_LIBS to avoid the need to call pkg-config.
+@@ -21077,7 +21700,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>.
@@ -8685,859 +7303,27 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -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
+@@ -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
+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
-+ 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
+ ac_status=$?
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
- 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 @@
+ (exit $ac_status); }; then
+@@ -23200,6 +23823,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
@@ -9545,7 +7331,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -24169,9 +24163,7 @@
+@@ -23295,9 +23919,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"
@@ -9556,7 +7342,7 @@
_ACEOF
-@@ -24338,6 +24330,7 @@
+@@ -23480,6 +24102,7 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -9564,25 +7350,19 @@
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$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
+@@ -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
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -24436,6 +24428,7 @@
+@@ -23578,15 +24200,16 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+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_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
@@ -9597,11 +7377,9 @@
-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
- build_cpu!$build_cpu$ac_delim
- build_vendor!$build_vendor$ac_delim
-@@ -24460,10 +24454,13 @@
+@@ -23597,10 +24220,13 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -9612,33 +7390,30 @@
RANLIB!$RANLIB$ac_delim
+DSYMUTIL!$DSYMUTIL$ac_delim
+NMEDIT!$NMEDIT$ac_delim
- CXXCPP!$CXXCPP$ac_delim
- F77!$F77$ac_delim
- FFLAGS!$FFLAGS$ac_delim
-@@ -24502,12 +24499,10 @@
+ CXX!$CXX$ac_delim
+ CXXFLAGS!$CXXFLAGS$ac_delim
+ ac_ct_CXX!$ac_ct_CXX$ac_delim
+@@ -23641,10 +24267,8 @@
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
- INSTOBJEXT!$INSTOBJEXT$ac_delim
- INTLLIBS!$INTLLIBS$ac_delim
-@@ -24523,7 +24518,7 @@
+@@ -23662,7 +24286,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- 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
+- 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
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -24750,6 +24745,11 @@
+@@ -23889,6 +24513,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
@@ -9650,7 +7425,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -24803,6 +24803,7 @@
+@@ -23942,6 +24571,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
@@ -9658,7 +7433,7 @@
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-@@ -24918,21 +24919,22 @@
+@@ -24057,21 +24687,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -9688,7 +7463,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -24967,8 +24969,9 @@
+@@ -24106,8 +24737,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.
@@ -9700,7 +7475,7 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -25087,10 +25090,6 @@
+@@ -24226,10 +24858,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" \
@@ -9711,265 +7486,9 @@
-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.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
+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
@@ -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.
@@ -10046,7 +7565,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -10056,13 +7575,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -10070,7 +7589,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -10088,7 +7607,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -10096,7 +7615,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -10105,10 +7624,10 @@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Controls/Calendar
+ installdir = ${coredir}/Controls/ArrayBuffer
install_DATA = \
__init__.py \
-@@ -287,13 +287,9 @@
+@@ -284,13 +283,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -10123,7 +7642,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 +317,7 @@
+@@ -318,7 +313,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -10132,7 +7651,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 +340,21 @@
+@@ -341,22 +336,21 @@
distdir: $(DISTFILES)
@@ -10168,7 +7687,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -375,7 +370,7 @@
+@@ -372,7 +366,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -10177,7 +7696,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -408,7 +403,7 @@
+@@ -405,7 +399,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -10186,7 +7705,7 @@
dvi: dvi-am
-@@ -422,12 +417,20 @@
+@@ -419,12 +413,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -10207,7 +7726,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -446,20 +449,22 @@
+@@ -443,20 +445,22 @@
ps-am:
@@ -10236,265 +7755,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.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
+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
@@ -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.
@@ -10571,7 +7834,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -10581,13 +7844,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -10595,7 +7858,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -10613,7 +7876,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -10621,7 +7884,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -10630,10 +7893,10 @@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
- installdir = ${coredir}/Controls/HDDTemp
+ installdir = ${coredir}/Controls/Calendar
install_DATA = \
- __init__.py \
-@@ -288,13 +288,9 @@
+ __init__.py \
+@@ -284,13 +283,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -10648,7 +7911,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 +318,7 @@
+@@ -318,7 +313,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -10657,7 +7920,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 +341,21 @@
+@@ -341,22 +336,21 @@
distdir: $(DISTFILES)
@@ -10693,7 +7956,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -376,7 +371,7 @@
+@@ -372,7 +366,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -10702,7 +7965,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -409,7 +404,7 @@
+@@ -405,7 +399,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -10711,7 +7974,7 @@
dvi: dvi-am
-@@ -423,12 +418,20 @@
+@@ -419,12 +413,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -10732,7 +7995,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -447,20 +450,22 @@
+@@ -443,20 +445,22 @@
ps-am:
@@ -10761,9 +8024,547 @@
# 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/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
+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
@@ -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.
@@ -10864,7 +8665,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,11 +145,13 @@
+@@ -149,12 +145,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -10874,13 +8675,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@
-@@ -175,6 +173,7 @@
+@@ -176,6 +173,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -10888,7 +8689,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -197,13 +196,13 @@
+@@ -194,13 +192,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -10906,7 +8707,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -215,6 +214,7 @@
+@@ -212,6 +210,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -10914,7 +8715,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -248,8 +248,11 @@
+@@ -245,8 +244,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -10926,7 +8727,7 @@
SUBDIRS = ArrayBuffer \
EventPipe \
Sensor \
-@@ -304,13 +307,9 @@
+@@ -301,13 +303,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -10941,7 +8742,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 \
-@@ -338,7 +337,7 @@
+@@ -335,7 +333,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -10950,7 +8751,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -385,8 +384,7 @@
+@@ -382,8 +380,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -10960,7 +8761,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -430,8 +428,8 @@
+@@ -427,8 +424,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -10971,7 +8772,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -456,8 +454,8 @@
+@@ -453,8 +450,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -10982,7 +8783,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -467,13 +465,12 @@
+@@ -464,13 +461,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -10998,7 +8799,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -487,22 +484,21 @@
+@@ -484,22 +480,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -11034,7 +8835,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -516,7 +512,7 @@
+@@ -513,7 +508,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -11043,7 +8844,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -524,6 +520,8 @@
+@@ -521,6 +516,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -11052,7 +8853,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -534,7 +532,7 @@
+@@ -531,7 +528,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -11061,7 +8862,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -567,8 +565,7 @@
+@@ -564,8 +561,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -11071,7 +8872,7 @@
dvi: dvi-recursive
-@@ -582,12 +579,20 @@
+@@ -579,12 +575,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -11092,7 +8893,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -606,24 +611,25 @@
+@@ -603,24 +607,25 @@
ps-am:
@@ -11131,9 +8932,9 @@
uninstall-installPYTHON
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-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
+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
@@ -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.
@@ -11210,7 +9011,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -11220,13 +9021,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -11234,7 +9035,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -11252,7 +9053,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -11260,7 +9061,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -11272,7 +9073,7 @@
installdir = ${coredir}/Controls/Sensors
install_DATA = \
__init__.py \
-@@ -287,13 +287,9 @@
+@@ -284,13 +283,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -11287,7 +9088,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 +317,7 @@
+@@ -318,7 +313,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -11296,7 +9097,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 +340,21 @@
+@@ -341,22 +336,21 @@
distdir: $(DISTFILES)
@@ -11332,7 +9133,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -375,7 +370,7 @@
+@@ -372,7 +366,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -11341,7 +9142,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -408,7 +403,7 @@
+@@ -405,7 +399,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -11350,7 +9151,7 @@
dvi: dvi-am
-@@ -422,12 +417,20 @@
+@@ -419,12 +413,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -11371,7 +9172,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -446,20 +449,22 @@
+@@ -443,20 +445,22 @@
ps-am:
@@ -11400,9 +9201,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.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
+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
@@ -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.
@@ -11479,7 +9280,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -11489,13 +9290,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -11503,7 +9304,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -11521,7 +9322,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -11529,7 +9330,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -11541,7 +9342,7 @@
installdir = ${coredir}/Controls/System
install_DATA = \
__init__.py \
-@@ -287,13 +287,9 @@
+@@ -284,13 +283,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -11556,7 +9357,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 +317,7 @@
+@@ -318,7 +313,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -11565,7 +9366,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 +340,21 @@
+@@ -341,22 +336,21 @@
distdir: $(DISTFILES)
@@ -11601,7 +9402,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -375,7 +370,7 @@
+@@ -372,7 +366,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -11610,7 +9411,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -408,7 +403,7 @@
+@@ -405,7 +399,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -11619,7 +9420,7 @@
dvi: dvi-am
-@@ -422,12 +417,20 @@
+@@ -419,12 +413,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -11640,7 +9441,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -446,20 +449,22 @@
+@@ -443,20 +445,22 @@
ps-am:
@@ -11669,9 +9470,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.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
+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
@@ -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.
@@ -11748,7 +9549,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -11758,13 +9559,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -11772,7 +9573,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -11790,7 +9591,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -11798,7 +9599,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -11810,7 +9611,7 @@
installdir = ${coredir}/Controls/Time
install_DATA = \
__init__.py \
-@@ -287,13 +287,9 @@
+@@ -284,13 +283,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -11825,7 +9626,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 +317,7 @@
+@@ -318,7 +313,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -11834,7 +9635,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 +340,21 @@
+@@ -341,22 +336,21 @@
distdir: $(DISTFILES)
@@ -11870,7 +9671,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -375,7 +370,7 @@
+@@ -372,7 +366,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -11879,7 +9680,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -408,7 +403,7 @@
+@@ -405,7 +399,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -11888,7 +9689,7 @@
dvi: dvi-am
-@@ -422,12 +417,20 @@
+@@ -419,12 +413,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -11909,7 +9710,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -446,20 +449,22 @@
+@@ -443,20 +445,22 @@
ps-am:
@@ -11938,9 +9739,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.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
+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
@@ -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.
@@ -12017,7 +9818,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -12027,13 +9828,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -12041,7 +9842,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -12059,7 +9860,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -12067,7 +9868,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -12079,7 +9880,7 @@
installdir = ${coredir}/Controls/URI
install_DATA = \
__init__.py \
-@@ -287,13 +287,9 @@
+@@ -284,13 +283,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -12094,7 +9895,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 +317,7 @@
+@@ -318,7 +313,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -12103,7 +9904,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 +340,21 @@
+@@ -341,22 +336,21 @@
distdir: $(DISTFILES)
@@ -12139,7 +9940,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -375,7 +370,7 @@
+@@ -372,7 +366,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -12148,7 +9949,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -408,7 +403,7 @@
+@@ -405,7 +399,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -12157,7 +9958,7 @@
dvi: dvi-am
-@@ -422,12 +417,20 @@
+@@ -419,12 +413,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -12178,7 +9979,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -446,20 +449,22 @@
+@@ -443,20 +445,22 @@
ps-am:
@@ -12207,9 +10008,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.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
+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
@@ -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.
@@ -12286,7 +10087,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -144,11 +137,13 @@
+@@ -144,12 +137,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -12296,13 +10097,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@
-@@ -170,6 +165,7 @@
+@@ -171,6 +165,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -12310,7 +10111,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -192,13 +188,13 @@
+@@ -189,13 +184,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -12328,7 +10129,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -210,6 +206,7 @@
+@@ -207,6 +202,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -12336,7 +10137,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -243,8 +240,11 @@
+@@ -240,8 +236,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -12348,7 +10149,7 @@
desktopdir = $(datadir)/applications
desktop_in_files = gdesklets.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@@ -313,13 +313,9 @@
+@@ -312,13 +311,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -12363,7 +10164,7 @@
@list='$(desktop_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -336,7 +332,7 @@
+@@ -335,7 +330,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -12372,7 +10173,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -353,7 +349,7 @@
+@@ -352,7 +347,7 @@
done
install-mimeiconDATA: $(mimeicon_DATA)
@$(NORMAL_INSTALL)
@@ -12381,7 +10182,7 @@
@list='$(mimeicon_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -370,7 +366,7 @@
+@@ -369,7 +364,7 @@
done
install-pixmapDATA: $(pixmap_DATA)
@$(NORMAL_INSTALL)
@@ -12390,7 +10191,7 @@
@list='$(pixmap_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -387,7 +383,7 @@
+@@ -386,7 +381,7 @@
done
install-sharedmimepackageDATA: $(sharedmimepackage_DATA)
@$(NORMAL_INSTALL)
@@ -12399,7 +10200,7 @@
@list='$(sharedmimepackage_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -410,22 +406,21 @@
+@@ -409,22 +404,21 @@
distdir: $(DISTFILES)
@@ -12435,7 +10236,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -441,7 +436,7 @@
+@@ -440,7 +434,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(mimeicondir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(sharedmimepackagedir)"; do \
@@ -12444,7 +10245,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -474,7 +469,7 @@
+@@ -473,7 +467,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -12453,7 +10254,7 @@
dvi: dvi-am
-@@ -492,12 +487,20 @@
+@@ -491,12 +485,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -12474,7 +10275,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -516,23 +519,27 @@
+@@ -515,23 +517,27 @@
ps-am:
@@ -12509,9 +10310,162 @@
uninstall-sharedmimepackageDATA
@INTLTOOL_DESKTOP_RULE@
-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
+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
@@ -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.
@@ -12588,7 +10542,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -12598,13 +10552,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -12612,7 +10566,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -12630,7 +10584,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -12638,7 +10592,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -12650,7 +10604,7 @@
installdir = ${coredir}/display
install_DATA = \
__init__.py \
-@@ -311,13 +311,9 @@
+@@ -308,13 +307,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -12665,7 +10619,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 \
-@@ -345,7 +341,7 @@
+@@ -342,7 +337,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -12674,7 +10628,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -368,22 +364,21 @@
+@@ -365,22 +360,21 @@
distdir: $(DISTFILES)
@@ -12710,7 +10664,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -399,7 +394,7 @@
+@@ -396,7 +390,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -12719,7 +10673,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -432,7 +427,7 @@
+@@ -429,7 +423,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -12728,7 +10682,7 @@
dvi: dvi-am
-@@ -446,12 +441,20 @@
+@@ -443,12 +437,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -12749,7 +10703,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -470,20 +473,22 @@
+@@ -467,20 +469,22 @@
ps-am:
@@ -12778,9 +10732,2878 @@
# 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/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
+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
@@ -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.
@@ -12874,7 +13697,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -136,11 +132,13 @@
+@@ -136,12 +132,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -12884,13 +13707,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@
-@@ -162,6 +160,7 @@
+@@ -163,6 +160,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -12898,7 +13721,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -184,13 +183,13 @@
+@@ -181,13 +179,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -12916,7 +13739,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -202,6 +201,7 @@
+@@ -199,6 +197,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -12924,7 +13747,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -235,8 +235,11 @@
+@@ -232,8 +231,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -12933,10 +13756,10 @@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
- SUBDIRS = man
- SYNOPSIS = python2.2 /usr/bin/synopsis
- SYN_FLAGS = -Wc,parser=Python,formatter=HTML,linker=Linker
-@@ -281,10 +284,6 @@
+ SUBDIRS = \
+ 15pieces \
+ Calendar \
+@@ -280,10 +282,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -12947,7 +13770,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,
-@@ -316,8 +315,7 @@
+@@ -315,8 +313,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -12957,7 +13780,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -361,8 +359,8 @@
+@@ -360,8 +357,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -12968,7 +13791,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -387,8 +385,8 @@
+@@ -386,8 +383,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -12979,7 +13802,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -398,13 +396,12 @@
+@@ -397,13 +394,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -12995,7 +13818,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -418,22 +415,21 @@
+@@ -417,22 +413,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -13031,7 +13854,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -447,7 +443,7 @@
+@@ -446,7 +441,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -13040,7 +13863,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -455,6 +451,8 @@
+@@ -454,6 +449,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -13049,7 +13872,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -494,8 +492,7 @@
+@@ -493,8 +490,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -13059,7 +13882,7 @@
dvi: dvi-recursive
-@@ -509,12 +506,20 @@
+@@ -508,12 +504,20 @@
install-data-am:
@@ -13080,7 +13903,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -533,22 +538,24 @@
+@@ -532,22 +536,24 @@
ps-am:
@@ -13115,11 +13938,1221 @@
+ 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.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
+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
@@ -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.
@@ -13196,7 +15229,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -131,11 +124,13 @@
+@@ -131,12 +124,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -13206,13 +15239,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@
-@@ -157,6 +152,7 @@
+@@ -158,6 +152,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -13220,7 +15253,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -179,13 +175,13 @@
+@@ -176,13 +171,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -13238,7 +15271,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -197,6 +193,7 @@
+@@ -194,6 +189,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -13246,7 +15279,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -230,8 +227,11 @@
+@@ -227,8 +223,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -13258,7 +15291,7 @@
man_MANS = gdesklets.1
EXTRA_DIST = $(man_MANS)
all: all-am
-@@ -272,13 +272,9 @@
+@@ -269,13 +268,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -13273,7 +15306,7 @@
@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
for i in $$l2; do \
-@@ -329,22 +325,21 @@
+@@ -326,22 +321,21 @@
distdir: $(DISTFILES)
@@ -13309,7 +15342,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -360,7 +355,7 @@
+@@ -357,7 +351,7 @@
all-am: Makefile $(MANS)
installdirs:
for dir in "$(DESTDIR)$(man1dir)"; do \
@@ -13318,7 +15351,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -392,7 +387,7 @@
+@@ -389,7 +383,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -13327,7 +15360,7 @@
dvi: dvi-am
-@@ -406,12 +401,20 @@
+@@ -403,12 +397,20 @@
install-data-am: install-man
@@ -13348,7 +15381,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -430,20 +433,23 @@
+@@ -427,20 +429,23 @@
ps-am:
@@ -13376,9 +15409,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.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
+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
@@ -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.
@@ -13455,7 +15488,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -13465,13 +15498,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -13479,7 +15512,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -13497,7 +15530,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -13505,7 +15538,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -13517,7 +15550,7 @@
installdir = ${coredir}/factory
install_DATA = \
__init__.py \
-@@ -289,13 +289,9 @@
+@@ -286,13 +285,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -13532,7 +15565,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 \
-@@ -323,7 +319,7 @@
+@@ -320,7 +315,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -13541,7 +15574,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -346,22 +342,21 @@
+@@ -343,22 +338,21 @@
distdir: $(DISTFILES)
@@ -13577,7 +15610,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -377,7 +372,7 @@
+@@ -374,7 +368,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -13586,7 +15619,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -410,7 +405,7 @@
+@@ -407,7 +401,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -13595,7 +15628,7 @@
dvi: dvi-am
-@@ -424,12 +419,20 @@
+@@ -421,12 +415,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -13616,7 +15649,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -448,20 +451,22 @@
+@@ -445,20 +447,22 @@
ps-am:
@@ -13645,50 +15678,809 @@
# 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/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
+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
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
--my $VERSION = "0.35.0";
-+my $VERSION = "0.37.0";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.37.1";
## Loaded modules
use strict;
-@@ -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 @@
+@@ -161,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/scheme", "gettext/xml", "gettext/quoted"
+ "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
-@@ -212,6 +218,8 @@
- &type_scheme if $gettext_type eq "scheme";
+@@ -218,6 +219,7 @@
&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
-@@ -231,9 +239,9 @@
+@@ -237,9 +239,9 @@
s/'/'/g; # '
s/"/"/g; # "
@@ -13699,44 +16491,10 @@
return $_;
}
-@@ -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} = [];
+@@ -731,6 +733,18 @@
}
}
-@@ -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;
@@ -13752,37 +16510,35 @@
sub type_glade {
### For translatable Glade XML files ###
-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
+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
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
--my $VERSION = "0.35.0";
-+my $VERSION = "0.37.0";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.37.1";
## Loaded modules
use strict;
-@@ -60,6 +60,8 @@
- my $DESKTOP_STYLE_ARG = 0;
+@@ -61,6 +61,7 @@
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;
-@@ -79,6 +81,8 @@
- "desktop-style|d" => \$DESKTOP_STYLE_ARG,
+@@ -81,6 +82,7 @@
"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,
-@@ -91,9 +95,24 @@
+@@ -93,9 +95,24 @@
my %po_files_by_lang = ();
my %translations = ();
@@ -13808,7 +16564,7 @@
# Use this instead of \w for XML files to handle more possible characters.
my $w = "[-A-Za-z0-9._:]";
-@@ -131,7 +150,7 @@
+@@ -133,7 +150,7 @@
&utf8_sanity_check;
&preparation;
&print_message;
@@ -13817,31 +16573,30 @@
&finalize;
}
elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
-@@ -157,6 +176,14 @@
+@@ -159,12 +176,12 @@
&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;
+ {
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+- "ed_merge_translations;
+ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
-+ &finalize;
-+}
+ &finalize;
+ }
else
- {
- &print_help;
-@@ -193,6 +220,8 @@
- -k, --keys-style includes translations in the keys style
+@@ -204,6 +221,7 @@
-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:
-@@ -249,8 +278,41 @@
+@@ -260,8 +278,41 @@
sub gather_po_files
{
@@ -13885,33 +16640,7 @@
}
}
-@@ -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 @@
+@@ -494,16 +545,15 @@
return $string;
}
@@ -13930,7 +16659,7 @@
return $_;
}
-@@ -517,6 +578,7 @@
+@@ -528,6 +578,7 @@
return "&" if $_ == 38;
return "'" if $_ == 39;
return "<" if $_ == 60;
@@ -13938,18 +16667,7 @@
return chr $_;
}
-@@ -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 @@
+@@ -1028,43 +1079,74 @@
close OUTPUT;
print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
}
@@ -14046,7 +16764,7 @@
{
print OUTPUT;
}
-@@ -1061,6 +1154,24 @@
+@@ -1072,6 +1154,24 @@
close OUTPUT;
close INPUT;
@@ -14071,58 +16789,49 @@
}
sub desktop_merge_translations
-@@ -1354,3 +1465,42 @@
- return @list;
+@@ -1367,19 +1467,22 @@
+
+ sub quoted_translation
+ {
+- my ($lang, $string) = @_;
++ my ($xml_mode, $lang, $string) = @_;
+
++ $string = entity_decode($string) if $xml_mode;
+ $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_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;
-+ $translation = entity_encode($translation) if $xml_mode;
-+ $translation =~ s/\"/\\\"/g;
-+ return $translation
-+}
-+
-+sub quoted_merge_translations
-+{
+ sub quoted_merge_translations
+ {
+ my ($xml_mode) = @_;
+
-+ 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>)
-+ {
+ 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;
+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
-+ 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
+ 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
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
--my $VERSION = "0.35.0";
-+my $VERSION = "0.37.0";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.37.1";
my $PACKAGE = "intltool";
## Loaded modules
@@ -14136,41 +16845,7 @@
my $ini_support =
"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
-@@ -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 @@
+@@ -328,7 +329,12 @@
push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
}, "..";
@@ -14184,69 +16859,34 @@
open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
@buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-@@ -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 @@
+@@ -428,8 +434,8 @@
last;
}
-- if (/_\(QUOTEDTEXT/)
+- ## N_ Q_ and _ are the three macros defined in gi8n.h
+- if (/[NQ]?_ *\(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
-@@ -486,6 +495,15 @@
+@@ -489,11 +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;
}
-@@ -493,9 +511,16 @@
+@@ -501,9 +511,16 @@
foreach (@buf_allfiles_sorted)
{
@@ -14265,40 +16905,20 @@
}
}
-@@ -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 @@
+@@ -563,11 +580,23 @@
exit 1;
}
--sub GenerateHeaders
+-sub isIntltoolExtractInPath
+sub isProgramInPath
{
-- my $EXTRACT = "@INTLTOOL_EXTRACT@";
-- chomp $EXTRACT;
-+ my ($file) = @_;
-+ # If either a file exists, or when run it returns 0 exit status
+ 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));
+ 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) = @_;
@@ -14308,21 +16928,19 @@
+ my $version = `$file --version`;
+ return 1 if ($version =~ m/.*\(GNU .*\).*/);
+ }
-+ return 0;
-+}
-+
-+sub GenerateHeaders
-+{
-+ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
+ return 0;
+ }
+
+@@ -577,7 +606,7 @@
## Generate the .h header files, so we can allow glade and
## xml translation support
-- if (! -x "$EXTRACT")
+- if (! isIntltoolExtractInPath("$EXTRACT"))
+ if (! isProgramInPath ("$EXTRACT"))
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
-@@ -611,13 +653,13 @@
+@@ -624,13 +653,13 @@
#
sub GeneratePOTemplate
{
@@ -14339,22 +16957,7 @@
" *** Without it, intltool-update can not extract strings.\n";
exit;
}
-@@ -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 @@
+@@ -726,13 +755,29 @@
unlink "$MODULE.pot";
my @xgettext_argument=("$XGETTEXT",
"--add-comments",
@@ -14386,7 +16989,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;
-@@ -784,9 +838,16 @@
+@@ -793,9 +838,16 @@
{
-f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
@@ -14404,7 +17007,7 @@
print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
my $infile = "$SRCDIR/$lang.po";
-@@ -827,7 +888,14 @@
+@@ -836,7 +888,14 @@
sub Console_Write_TranslationStatus
{
my ($lang, $output_file) = @_;
@@ -14420,7 +17023,7 @@
$output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
-@@ -836,21 +904,28 @@
+@@ -845,21 +904,28 @@
sub Console_Write_CoverageReport
{
@@ -14453,7 +17056,7 @@
system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
}
}
-@@ -924,13 +999,13 @@
+@@ -933,13 +999,13 @@
$conf_in || die "Cannot find top_builddir in Makevars.";
}
@@ -14471,7 +17074,7 @@
}
else
{
-@@ -1043,6 +1118,8 @@
+@@ -1052,6 +1118,8 @@
close IN;
}
@@ -14480,9 +17083,9 @@
$keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
return $keywords;
-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
+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
@@ -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.
@@ -14559,7 +17162,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -14569,13 +17172,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -14583,7 +17186,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -14601,7 +17204,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -14609,7 +17212,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -14621,7 +17224,7 @@
installdir = ${coredir}/layout
install_DATA = \
__init__.py \
-@@ -289,13 +289,9 @@
+@@ -286,13 +285,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -14636,7 +17239,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 \
-@@ -323,7 +319,7 @@
+@@ -320,7 +315,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -14645,7 +17248,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -346,22 +342,21 @@
+@@ -343,22 +338,21 @@
distdir: $(DISTFILES)
@@ -14681,7 +17284,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -377,7 +372,7 @@
+@@ -374,7 +368,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -14690,7 +17293,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -410,7 +405,7 @@
+@@ -407,7 +401,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -14699,7 +17302,7 @@
dvi: dvi-am
-@@ -424,12 +419,20 @@
+@@ -421,12 +415,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -14720,7 +17323,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -448,20 +451,22 @@
+@@ -445,20 +447,22 @@
ps-am:
@@ -14749,9 +17352,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.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
+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
@@ -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.
@@ -14828,7 +17431,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -14838,13 +17441,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -14852,7 +17455,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -14870,7 +17473,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -14878,7 +17481,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -14890,7 +17493,7 @@
installdir = ${coredir}/libdesklets/controls
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -14905,7 +17508,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -14914,7 +17517,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -14950,7 +17553,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -14959,7 +17562,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -14968,7 +17571,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -14989,7 +17592,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -15018,9 +17621,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.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
+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
@@ -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.
@@ -15121,7 +17724,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,11 +145,13 @@
+@@ -149,12 +145,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -15131,13 +17734,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@
-@@ -175,6 +173,7 @@
+@@ -176,6 +173,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -15145,7 +17748,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -197,13 +196,13 @@
+@@ -194,13 +192,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -15163,7 +17766,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -215,6 +214,7 @@
+@@ -212,6 +210,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -15171,7 +17774,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -248,8 +248,11 @@
+@@ -245,8 +244,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -15183,7 +17786,7 @@
installdir = ${coredir}/libdesklets
install_DATA = \
__init__.py \
-@@ -301,13 +304,9 @@
+@@ -298,13 +300,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -15198,7 +17801,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 +334,7 @@
+@@ -332,7 +330,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -15207,7 +17810,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 +381,7 @@
+@@ -379,8 +377,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -15217,7 +17820,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -427,8 +425,8 @@
+@@ -424,8 +421,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -15228,7 +17831,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -453,8 +451,8 @@
+@@ -450,8 +447,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -15239,7 +17842,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -464,13 +462,12 @@
+@@ -461,13 +458,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -15255,7 +17858,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -484,22 +481,21 @@
+@@ -481,22 +477,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -15291,7 +17894,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -513,7 +509,7 @@
+@@ -510,7 +505,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -15300,7 +17903,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -521,6 +517,8 @@
+@@ -518,6 +513,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -15309,7 +17912,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -531,7 +529,7 @@
+@@ -528,7 +525,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -15318,7 +17921,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -564,8 +562,7 @@
+@@ -561,8 +558,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -15328,7 +17931,7 @@
dvi: dvi-recursive
-@@ -579,12 +576,20 @@
+@@ -576,12 +572,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -15349,7 +17952,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -603,24 +608,25 @@
+@@ -600,24 +604,25 @@
ps-am:
@@ -15388,9 +17991,9 @@
uninstall-installPYTHON
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-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
+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
@@ -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.
@@ -15467,7 +18070,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -15477,13 +18080,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -15491,7 +18094,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -15509,7 +18112,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -15517,7 +18120,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -15529,7 +18132,7 @@
installdir = ${coredir}/libdesklets/system/FreeBSD
install_DATA = \
__init__.py \
-@@ -287,13 +287,9 @@
+@@ -284,13 +283,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -15544,7 +18147,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 +317,7 @@
+@@ -318,7 +313,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -15553,7 +18156,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 +340,21 @@
+@@ -341,22 +336,21 @@
distdir: $(DISTFILES)
@@ -15589,7 +18192,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -375,7 +370,7 @@
+@@ -372,7 +366,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -15598,7 +18201,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -408,7 +403,7 @@
+@@ -405,7 +399,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -15607,7 +18210,7 @@
dvi: dvi-am
-@@ -422,12 +417,20 @@
+@@ -419,12 +413,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -15628,7 +18231,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -446,20 +449,22 @@
+@@ -443,20 +445,22 @@
ps-am:
@@ -15657,9 +18260,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.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
+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
@@ -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.
@@ -15736,7 +18339,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -15746,13 +18349,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -15760,7 +18363,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -15778,7 +18381,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -15786,7 +18389,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -15798,7 +18401,7 @@
installdir = ${coredir}/libdesklets/system/Linux
install_DATA = \
__init__.py \
-@@ -290,13 +290,9 @@
+@@ -287,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -15813,7 +18416,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 \
-@@ -324,7 +320,7 @@
+@@ -321,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -15822,7 +18425,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -347,22 +343,21 @@
+@@ -344,22 +339,21 @@
distdir: $(DISTFILES)
@@ -15858,7 +18461,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -378,7 +373,7 @@
+@@ -375,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -15867,7 +18470,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -411,7 +406,7 @@
+@@ -408,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -15876,7 +18479,7 @@
dvi: dvi-am
-@@ -425,12 +420,20 @@
+@@ -422,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -15897,7 +18500,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -449,20 +452,22 @@
+@@ -446,20 +448,22 @@
ps-am:
@@ -15926,9 +18529,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.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
+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
@@ -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.
@@ -16051,7 +18654,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -168,11 +168,13 @@
+@@ -168,12 +168,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -16061,13 +18664,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@
-@@ -194,6 +196,7 @@
+@@ -195,6 +196,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -16075,7 +18678,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -216,13 +219,13 @@
+@@ -213,13 +215,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -16093,7 +18696,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -234,6 +237,7 @@
+@@ -231,6 +233,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -16101,7 +18704,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -267,8 +271,11 @@
+@@ -264,8 +267,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -16113,7 +18716,7 @@
INCLUDES = \
$(GLIBTOP_CFLAGS) \
$(PYTHON_CFLAGS)
-@@ -331,21 +338,21 @@
+@@ -328,21 +334,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-installLTLIBRARIES: $(install_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -16141,7 +18744,7 @@
done
clean-installLTLIBRARIES:
-@@ -357,7 +364,7 @@
+@@ -354,7 +360,7 @@
rm -f "$${dir}/so_locations"; \
done
gtop.la: $(gtop_la_OBJECTS) $(gtop_la_DEPENDENCIES)
@@ -16150,7 +18753,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -368,22 +375,22 @@
+@@ -365,22 +371,22 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtop.Plo at am__quote@
.c.o:
@@ -16179,7 +18782,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 $@ $<
-@@ -393,13 +400,9 @@
+@@ -390,13 +396,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -16194,7 +18797,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 \
-@@ -427,7 +430,7 @@
+@@ -424,7 +426,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -16203,7 +18806,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -474,8 +477,7 @@
+@@ -471,8 +473,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -16213,7 +18816,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -519,8 +521,8 @@
+@@ -516,8 +517,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16224,7 +18827,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -545,8 +547,8 @@
+@@ -542,8 +543,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -16235,7 +18838,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -556,13 +558,12 @@
+@@ -553,13 +554,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -16251,7 +18854,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -576,22 +577,21 @@
+@@ -573,22 +573,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -16287,7 +18890,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -605,7 +605,7 @@
+@@ -602,7 +601,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -16296,7 +18899,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -613,6 +613,8 @@
+@@ -610,6 +609,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -16305,7 +18908,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -623,7 +625,7 @@
+@@ -620,7 +621,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -16314,7 +18917,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -659,7 +661,7 @@
+@@ -656,7 +657,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -16323,7 +18926,7 @@
dvi: dvi-recursive
-@@ -674,12 +676,20 @@
+@@ -671,12 +672,20 @@
install-data-am: install-installDATA install-installLTLIBRARIES \
install-installPYTHON
@@ -16344,7 +18947,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -700,25 +710,27 @@
+@@ -697,25 +706,27 @@
ps-am:
@@ -16386,9 +18989,9 @@
uninstall-installDATA uninstall-installLTLIBRARIES \
uninstall-installPYTHON
-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
+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
@@ -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.
@@ -16465,7 +19068,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -16475,13 +19078,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -16489,7 +19092,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -16507,7 +19110,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -16515,7 +19118,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -16527,7 +19130,7 @@
installdir = ${coredir}/libdesklets/system/NetBSD
install_DATA = \
__init__.py \
-@@ -287,13 +287,9 @@
+@@ -284,13 +283,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -16542,7 +19145,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 +317,7 @@
+@@ -318,7 +313,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -16551,7 +19154,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 +340,21 @@
+@@ -341,22 +336,21 @@
distdir: $(DISTFILES)
@@ -16587,7 +19190,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -375,7 +370,7 @@
+@@ -372,7 +366,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -16596,7 +19199,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -408,7 +403,7 @@
+@@ -405,7 +399,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -16605,7 +19208,7 @@
dvi: dvi-am
-@@ -422,12 +417,20 @@
+@@ -419,12 +413,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -16626,7 +19229,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -446,20 +449,22 @@
+@@ -443,20 +445,22 @@
ps-am:
@@ -16655,9 +19258,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.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
+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
@@ -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.
@@ -16734,7 +19337,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -16744,13 +19347,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -16758,7 +19361,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -16776,7 +19379,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -16784,7 +19387,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -16796,7 +19399,7 @@
installdir = ${coredir}/libdesklets/system/OpenBSD
install_DATA = \
__init__.py \
-@@ -287,13 +287,9 @@
+@@ -284,13 +283,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -16811,7 +19414,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 +317,7 @@
+@@ -318,7 +313,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -16820,7 +19423,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 +340,21 @@
+@@ -341,22 +336,21 @@
distdir: $(DISTFILES)
@@ -16856,7 +19459,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -375,7 +370,7 @@
+@@ -372,7 +366,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -16865,7 +19468,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -408,7 +403,7 @@
+@@ -405,7 +399,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -16874,7 +19477,7 @@
dvi: dvi-am
-@@ -422,12 +417,20 @@
+@@ -419,12 +413,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -16895,7 +19498,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -446,20 +449,22 @@
+@@ -443,20 +445,22 @@
ps-am:
@@ -16924,9 +19527,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.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
+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
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -17567,9 +20170,9 @@
All other options (arguments beginning with \`-') are ignored.
-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
+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
@@ -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.
@@ -17646,7 +20249,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -17656,13 +20259,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -17670,7 +20273,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -17688,7 +20291,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -17696,7 +20299,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -17708,7 +20311,7 @@
installdir = ${coredir}/main
install_DATA = \
__init__.py \
-@@ -296,13 +296,9 @@
+@@ -293,13 +292,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -17723,7 +20326,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 \
-@@ -330,7 +326,7 @@
+@@ -327,7 +322,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -17732,7 +20335,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -353,22 +349,21 @@
+@@ -350,22 +345,21 @@
distdir: $(DISTFILES)
@@ -17768,7 +20371,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -384,7 +379,7 @@
+@@ -381,7 +375,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -17777,7 +20380,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -417,7 +412,7 @@
+@@ -414,7 +408,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -17786,7 +20389,7 @@
dvi: dvi-am
-@@ -431,12 +426,20 @@
+@@ -428,12 +422,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -17807,7 +20410,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -455,20 +458,22 @@
+@@ -452,20 +454,22 @@
ps-am:
@@ -17836,9 +20439,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.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
+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
@@ -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.
@@ -17954,7 +20557,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -156,11 +152,13 @@
+@@ -156,12 +152,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -17964,13 +20567,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@
-@@ -182,6 +180,7 @@
+@@ -183,6 +180,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -17978,7 +20581,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -204,13 +203,13 @@
+@@ -201,13 +199,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -17996,7 +20599,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -222,6 +221,7 @@
+@@ -219,6 +217,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -18004,7 +20607,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -255,8 +255,11 @@
+@@ -252,8 +251,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -18013,10 +20616,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
-@@ -344,7 +347,7 @@
+ SUBDIRS = \
+ Additions \
+@@ -341,7 +343,7 @@
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
@@ -18025,7 +20628,7 @@
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -359,7 +362,7 @@
+@@ -356,7 +358,7 @@
-rm -f config.h stamp-h1
install-installSCRIPTS: $(install_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -18034,7 +20637,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 \
-@@ -385,7 +388,6 @@
+@@ -382,7 +384,6 @@
distclean-libtool:
-rm -f libtool
@@ -18042,7 +20645,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -418,8 +420,7 @@
+@@ -415,8 +416,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -18052,7 +20655,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -463,8 +464,8 @@
+@@ -460,8 +460,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18063,7 +20666,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -489,8 +490,8 @@
+@@ -486,8 +486,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18074,7 +20677,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -500,13 +501,12 @@
+@@ -497,13 +497,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -18090,7 +20693,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -521,24 +521,22 @@
+@@ -518,24 +517,22 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -18129,7 +20732,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -552,7 +550,7 @@
+@@ -549,7 +546,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -18138,7 +20741,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -560,6 +558,8 @@
+@@ -557,6 +554,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -18147,7 +20750,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -567,7 +567,7 @@
+@@ -564,7 +563,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 \
@@ -18156,7 +20759,7 @@
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -576,6 +576,10 @@
+@@ -573,6 +572,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -18167,7 +20770,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -603,6 +607,8 @@
+@@ -600,6 +603,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -18176,7 +20779,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -642,7 +648,7 @@
+@@ -639,7 +644,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
@@ -18185,7 +20788,7 @@
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -667,7 +673,7 @@
+@@ -664,7 +669,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(installdir)"; do \
@@ -18194,7 +20797,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -718,12 +724,20 @@
+@@ -715,12 +720,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -18215,7 +20818,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -744,26 +758,27 @@
+@@ -741,26 +754,27 @@
ps-am:
@@ -18261,9 +20864,216 @@
install-data-hook:
-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
+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
@@ -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.
@@ -18340,7 +21150,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -18350,13 +21160,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -18364,7 +21174,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -18382,7 +21192,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -18390,7 +21200,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -18402,7 +21212,7 @@
installdir = ${coredir}/plugin
install_DATA = \
__init__.py \
-@@ -290,13 +290,9 @@
+@@ -287,13 +286,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -18417,7 +21227,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 \
-@@ -324,7 +320,7 @@
+@@ -321,7 +316,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -18426,7 +21236,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -347,22 +343,21 @@
+@@ -344,22 +339,21 @@
distdir: $(DISTFILES)
@@ -18462,7 +21272,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -378,7 +373,7 @@
+@@ -375,7 +369,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -18471,7 +21281,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -411,7 +406,7 @@
+@@ -408,7 +402,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -18480,7 +21290,7 @@
dvi: dvi-am
-@@ -425,12 +420,20 @@
+@@ -422,12 +416,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -18501,7 +21311,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -449,20 +452,22 @@
+@@ -446,20 +448,22 @@
ps-am:
@@ -18530,55 +21340,33 @@
# 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/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 @@
+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 @@
dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
@@ -18586,53 +21374,10 @@
+install-exec installcheck:
uninstall:
-- 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
+ 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
@@ -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.
@@ -18709,7 +21454,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -18719,13 +21464,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -18733,7 +21478,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -18751,7 +21496,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -18759,7 +21504,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -18771,7 +21516,7 @@
installdir = ${coredir}/scripting
install_DATA = \
__init__.py \
-@@ -291,13 +291,9 @@
+@@ -288,13 +287,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -18786,7 +21531,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 \
-@@ -325,7 +321,7 @@
+@@ -322,7 +317,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -18795,7 +21540,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -348,22 +344,21 @@
+@@ -345,22 +340,21 @@
distdir: $(DISTFILES)
@@ -18831,7 +21576,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -379,7 +374,7 @@
+@@ -376,7 +370,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -18840,7 +21585,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -412,7 +407,7 @@
+@@ -409,7 +403,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -18849,7 +21594,7 @@
dvi: dvi-am
-@@ -426,12 +421,20 @@
+@@ -423,12 +417,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -18870,7 +21615,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -450,20 +453,22 @@
+@@ -447,20 +449,22 @@
ps-am:
@@ -18899,9 +21644,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.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
+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
@@ -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.
@@ -18978,7 +21723,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -18988,13 +21733,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -19002,7 +21747,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -19020,7 +21765,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -19028,7 +21773,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -19040,7 +21785,7 @@
installdir = ${coredir}/sensor
install_DATA = \
__init__.py \
-@@ -289,13 +289,9 @@
+@@ -286,13 +285,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -19055,7 +21800,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 \
-@@ -323,7 +319,7 @@
+@@ -320,7 +315,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -19064,7 +21809,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -346,22 +342,21 @@
+@@ -343,22 +338,21 @@
distdir: $(DISTFILES)
@@ -19100,7 +21845,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -377,7 +372,7 @@
+@@ -374,7 +368,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -19109,7 +21854,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -410,7 +405,7 @@
+@@ -407,7 +401,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -19118,7 +21863,7 @@
dvi: dvi-am
-@@ -424,12 +419,20 @@
+@@ -421,12 +415,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -19139,7 +21884,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -448,20 +451,22 @@
+@@ -445,20 +447,22 @@
ps-am:
@@ -19168,9 +21913,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.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
+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
@@ -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.
@@ -19247,7 +21992,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -19257,13 +22002,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -19271,7 +22016,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -19289,7 +22034,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -19297,7 +22042,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -19309,7 +22054,7 @@
installdir = ${coredir}/Sensors/External
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -19324,7 +22069,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -19333,7 +22078,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -19369,7 +22114,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -19378,7 +22123,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -19387,7 +22132,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -19408,7 +22153,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -19437,9 +22182,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.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
+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
@@ -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.
@@ -19516,7 +22261,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -19526,13 +22271,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -19540,7 +22285,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -19558,7 +22303,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -19566,7 +22311,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -19578,7 +22323,7 @@
installdir = ${coredir}/Sensors/FontSelector
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -19593,7 +22338,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -19602,7 +22347,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -19638,7 +22383,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -19647,7 +22392,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -19656,7 +22401,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -19677,7 +22422,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -19706,9 +22451,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.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
+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
@@ -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.
@@ -19802,7 +22547,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -136,11 +132,13 @@
+@@ -136,12 +132,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -19812,13 +22557,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@
-@@ -162,6 +160,7 @@
+@@ -163,6 +160,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -19826,7 +22571,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -184,13 +183,13 @@
+@@ -181,13 +179,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -19844,7 +22589,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -202,6 +201,7 @@
+@@ -199,6 +197,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -19852,7 +22597,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -235,8 +235,11 @@
+@@ -232,8 +231,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -19864,7 +22609,7 @@
SUBDIRS = External FontSelector
all: all-recursive
-@@ -277,10 +280,6 @@
+@@ -274,10 +276,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -19875,7 +22620,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,
-@@ -312,8 +311,7 @@
+@@ -309,8 +307,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -19885,7 +22630,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -357,8 +355,8 @@
+@@ -354,8 +351,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19896,7 +22641,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -383,8 +381,8 @@
+@@ -380,8 +377,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19907,7 +22652,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -394,13 +392,12 @@
+@@ -391,13 +388,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -19923,7 +22668,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -414,22 +411,21 @@
+@@ -411,22 +407,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -19959,7 +22704,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -443,7 +439,7 @@
+@@ -440,7 +435,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -19968,7 +22713,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -451,6 +447,8 @@
+@@ -448,6 +443,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -19977,7 +22722,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -490,8 +488,7 @@
+@@ -487,8 +484,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -19987,7 +22732,7 @@
dvi: dvi-recursive
-@@ -505,12 +502,20 @@
+@@ -502,12 +498,20 @@
install-data-am:
@@ -20008,7 +22753,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -529,22 +534,24 @@
+@@ -526,22 +530,24 @@
ps-am:
@@ -20045,9 +22790,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.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
+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
@@ -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.
@@ -20148,7 +22893,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -149,11 +145,13 @@
+@@ -149,12 +145,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -20158,13 +22903,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@
-@@ -175,6 +173,7 @@
+@@ -176,6 +173,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -20172,7 +22917,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -197,13 +196,13 @@
+@@ -194,13 +192,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -20190,7 +22935,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -215,6 +214,7 @@
+@@ -212,6 +210,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -20198,7 +22943,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -248,8 +248,11 @@
+@@ -245,8 +244,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -20210,7 +22955,7 @@
installdir = ${coredir}/shell
install_DATA = \
__init__.py \
-@@ -304,13 +307,9 @@
+@@ -301,13 +303,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -20225,7 +22970,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 \
-@@ -338,7 +337,7 @@
+@@ -335,7 +333,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -20234,7 +22979,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -385,8 +384,7 @@
+@@ -382,8 +380,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -20244,7 +22989,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -430,8 +428,8 @@
+@@ -427,8 +424,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20255,7 +23000,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -456,8 +454,8 @@
+@@ -453,8 +450,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20266,7 +23011,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -467,13 +465,12 @@
+@@ -464,13 +461,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -20282,7 +23027,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -487,22 +484,21 @@
+@@ -484,22 +480,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -20318,7 +23063,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -516,7 +512,7 @@
+@@ -513,7 +508,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -20327,7 +23072,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -524,6 +520,8 @@
+@@ -521,6 +516,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -20336,7 +23081,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -534,7 +532,7 @@
+@@ -531,7 +528,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -20345,7 +23090,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -567,8 +565,7 @@
+@@ -564,8 +561,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -20355,7 +23100,7 @@
dvi: dvi-recursive
-@@ -582,12 +579,20 @@
+@@ -579,12 +575,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -20376,7 +23121,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -606,24 +611,25 @@
+@@ -603,24 +607,25 @@
ps-am:
@@ -20415,9 +23160,9 @@
uninstall-installPYTHON
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-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
+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
@@ -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.
@@ -20494,7 +23239,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -20504,13 +23249,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -20518,7 +23263,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -20536,7 +23281,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -20544,7 +23289,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -20556,7 +23301,7 @@
installdir = ${coredir}/shell/plugins/ControlBrowser
install_DATA = \
__init__.py \
-@@ -291,13 +291,9 @@
+@@ -288,13 +287,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -20571,7 +23316,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 \
-@@ -325,7 +321,7 @@
+@@ -322,7 +317,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -20580,7 +23325,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -348,22 +344,21 @@
+@@ -345,22 +340,21 @@
distdir: $(DISTFILES)
@@ -20616,7 +23361,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -379,7 +374,7 @@
+@@ -376,7 +370,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -20625,7 +23370,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -412,7 +407,7 @@
+@@ -409,7 +403,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -20634,7 +23379,7 @@
dvi: dvi-am
-@@ -426,12 +421,20 @@
+@@ -423,12 +417,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -20655,7 +23400,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -450,20 +453,22 @@
+@@ -447,20 +449,22 @@
ps-am:
@@ -20684,9 +23429,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.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
+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
@@ -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.
@@ -20763,7 +23508,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -20773,13 +23518,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -20787,7 +23532,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -20805,7 +23550,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -20813,7 +23558,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -20825,7 +23570,7 @@
installdir = ${coredir}/shell/plugins/ControlCollection
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -20840,7 +23585,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -20849,7 +23594,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -20885,7 +23630,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -20894,7 +23639,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -20903,7 +23648,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -20924,7 +23669,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -20953,9 +23698,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.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
+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
@@ -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.
@@ -21032,7 +23777,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -21042,13 +23787,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -21056,7 +23801,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -21074,7 +23819,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -21082,7 +23827,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -21094,7 +23839,7 @@
installdir = ${coredir}/shell/plugins/ControlsView
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -21109,7 +23854,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -21118,7 +23863,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -21154,7 +23899,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -21163,7 +23908,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -21172,7 +23917,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -21193,7 +23938,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -21222,9 +23967,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.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
+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
@@ -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.
@@ -21301,7 +24046,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -21311,13 +24056,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -21325,7 +24070,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -21343,7 +24088,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -21351,7 +24096,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -21363,7 +24108,7 @@
installdir = ${coredir}/shell/plugins/DisplayBrowser
install_DATA = \
__init__.py \
-@@ -288,13 +288,9 @@
+@@ -285,13 +284,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -21378,7 +24123,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 +318,7 @@
+@@ -319,7 +314,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -21387,7 +24132,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 +341,21 @@
+@@ -342,22 +337,21 @@
distdir: $(DISTFILES)
@@ -21423,7 +24168,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -376,7 +371,7 @@
+@@ -373,7 +367,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -21432,7 +24177,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -409,7 +404,7 @@
+@@ -406,7 +400,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -21441,7 +24186,7 @@
dvi: dvi-am
-@@ -423,12 +418,20 @@
+@@ -420,12 +414,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -21462,7 +24207,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -447,20 +450,22 @@
+@@ -444,20 +446,22 @@
ps-am:
@@ -21491,9 +24236,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.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
+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
@@ -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.
@@ -21570,7 +24315,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -21580,13 +24325,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -21594,7 +24339,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -21612,7 +24357,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -21620,7 +24365,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -21632,7 +24377,7 @@
installdir = ${coredir}/shell/plugins/DisplayCollection
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -21647,7 +24392,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -21656,7 +24401,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -21692,7 +24437,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -21701,7 +24446,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -21710,7 +24455,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -21731,7 +24476,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -21760,9 +24505,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.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
+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
@@ -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.
@@ -21839,7 +24584,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -21849,13 +24594,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -21863,7 +24608,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -21881,7 +24626,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -21889,7 +24634,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -21901,7 +24646,7 @@
installdir = ${coredir}/shell/plugins/DisplayView
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -21916,7 +24661,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -21925,7 +24670,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -21961,7 +24706,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -21970,7 +24715,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -21979,7 +24724,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -22000,7 +24745,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -22029,9 +24774,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.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
+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
@@ -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.
@@ -22108,7 +24853,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -22118,13 +24863,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -22132,7 +24877,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -22150,7 +24895,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -22158,7 +24903,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -22170,7 +24915,7 @@
installdir = ${coredir}/shell/plugins/gDeskletsClient
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -22185,7 +24930,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -22194,7 +24939,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -22230,7 +24975,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -22239,7 +24984,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -22248,7 +24993,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -22269,7 +25014,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -22298,9 +25043,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.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
+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
@@ -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.
@@ -22377,7 +25122,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -22387,13 +25132,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -22401,7 +25146,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -22419,7 +25164,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -22427,7 +25172,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -22439,7 +25184,7 @@
installdir = ${coredir}/shell/plugins/Help
install_DATA = \
__init__.py \
-@@ -288,13 +288,9 @@
+@@ -285,13 +284,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -22454,7 +25199,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 +318,7 @@
+@@ -319,7 +314,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -22463,7 +25208,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 +341,21 @@
+@@ -342,22 +337,21 @@
distdir: $(DISTFILES)
@@ -22499,7 +25244,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -376,7 +371,7 @@
+@@ -373,7 +367,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -22508,7 +25253,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -409,7 +404,7 @@
+@@ -406,7 +400,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -22517,7 +25262,7 @@
dvi: dvi-am
-@@ -423,12 +418,20 @@
+@@ -420,12 +414,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -22538,7 +25283,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -447,20 +450,22 @@
+@@ -444,20 +446,22 @@
ps-am:
@@ -22567,9 +25312,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.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
+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
@@ -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.
@@ -22663,7 +25408,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -136,11 +132,13 @@
+@@ -136,12 +132,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -22673,13 +25418,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@
-@@ -162,6 +160,7 @@
+@@ -163,6 +160,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -22687,7 +25432,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -184,13 +183,13 @@
+@@ -181,13 +179,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -22705,7 +25450,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -202,6 +201,7 @@
+@@ -199,6 +197,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -22713,7 +25458,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -235,8 +235,11 @@
+@@ -232,8 +231,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -22725,7 +25470,7 @@
installdir = ${coredir}/shell/plugins
SUBDIRS = \
ControlBrowser \
-@@ -294,10 +297,6 @@
+@@ -291,10 +293,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -22736,7 +25481,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,
-@@ -329,8 +328,7 @@
+@@ -326,8 +324,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -22746,7 +25491,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -374,8 +372,8 @@
+@@ -371,8 +368,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -22757,7 +25502,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -400,8 +398,8 @@
+@@ -397,8 +394,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -22768,7 +25513,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -411,13 +409,12 @@
+@@ -408,13 +405,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -22784,7 +25529,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -431,22 +428,21 @@
+@@ -428,22 +424,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -22820,7 +25565,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -460,7 +456,7 @@
+@@ -457,7 +452,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -22829,7 +25574,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -468,6 +464,8 @@
+@@ -465,6 +460,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -22838,7 +25583,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -508,8 +506,7 @@
+@@ -505,8 +502,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -22848,7 +25593,7 @@
dvi: dvi-recursive
-@@ -523,12 +520,20 @@
+@@ -520,12 +516,20 @@
install-data-am:
@@ -22869,7 +25614,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -547,22 +552,24 @@
+@@ -544,22 +548,24 @@
ps-am:
@@ -22906,9 +25651,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.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
+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
@@ -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.
@@ -22985,7 +25730,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -22995,13 +25740,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -23009,7 +25754,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -23027,7 +25772,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -23035,7 +25780,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -23047,7 +25792,7 @@
installdir = ${coredir}/shell/plugins/Menu
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -23062,7 +25807,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -23071,7 +25816,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -23107,7 +25852,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -23116,7 +25861,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -23125,7 +25870,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -23146,7 +25891,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -23175,9 +25920,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.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
+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
@@ -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.
@@ -23254,7 +25999,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -23264,13 +26009,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -23278,7 +26023,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -23296,7 +26041,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -23304,7 +26049,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -23316,7 +26061,7 @@
installdir = ${coredir}/shell/plugins/PackageInstaller
install_DATA = \
__init__.py \
-@@ -289,13 +289,9 @@
+@@ -286,13 +285,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -23331,7 +26076,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 \
-@@ -323,7 +319,7 @@
+@@ -320,7 +315,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -23340,7 +26085,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -346,22 +342,21 @@
+@@ -343,22 +338,21 @@
distdir: $(DISTFILES)
@@ -23376,7 +26121,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -377,7 +372,7 @@
+@@ -374,7 +368,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -23385,7 +26130,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -410,7 +405,7 @@
+@@ -407,7 +401,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -23394,7 +26139,7 @@
dvi: dvi-am
-@@ -424,12 +419,20 @@
+@@ -421,12 +415,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -23415,7 +26160,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -448,20 +451,22 @@
+@@ -445,20 +447,22 @@
ps-am:
@@ -23444,9 +26189,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.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
+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
@@ -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.
@@ -23523,7 +26268,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -23533,13 +26278,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -23547,7 +26292,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -23565,7 +26310,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -23573,7 +26318,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -23585,7 +26330,7 @@
installdir = ${coredir}/shell/plugins/Profiles
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -23600,7 +26345,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -23609,7 +26354,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -23645,7 +26390,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -23654,7 +26399,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -23663,7 +26408,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -23684,7 +26429,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -23713,9 +26458,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.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
+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
@@ -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.
@@ -23792,7 +26537,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -23802,13 +26547,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -23816,7 +26561,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -23834,7 +26579,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -23842,7 +26587,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -23854,7 +26599,7 @@
installdir = ${coredir}/shell/plugins/Shell
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -23869,7 +26614,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -23878,7 +26623,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -23914,7 +26659,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -23923,7 +26668,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -23932,7 +26677,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -23953,7 +26698,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -23982,9 +26727,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.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
+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
@@ -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.
@@ -24061,7 +26806,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -24071,13 +26816,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -24085,7 +26830,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -24103,7 +26848,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -24111,7 +26856,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -24123,7 +26868,7 @@
installdir = ${coredir}/shell/plugins/StatusBar
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -24138,7 +26883,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -24147,7 +26892,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -24183,7 +26928,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -24192,7 +26937,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -24201,7 +26946,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -24222,7 +26967,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -24251,9 +26996,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.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
+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
@@ -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.
@@ -24330,7 +27075,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -140,11 +133,13 @@
+@@ -140,12 +133,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -24340,13 +27085,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@
-@@ -166,6 +161,7 @@
+@@ -167,6 +161,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -24354,7 +27099,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -188,13 +184,13 @@
+@@ -185,13 +180,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -24372,7 +27117,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -206,6 +202,7 @@
+@@ -203,6 +198,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -24380,7 +27125,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -239,8 +236,11 @@
+@@ -236,8 +232,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -24392,7 +27137,7 @@
installdir = ${coredir}/shell/plugins/ViewSwitch
install_DATA = \
__init__.py
-@@ -286,13 +286,9 @@
+@@ -283,13 +282,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -24407,7 +27152,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 +316,7 @@
+@@ -317,7 +312,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -24416,7 +27161,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 +339,21 @@
+@@ -340,22 +335,21 @@
distdir: $(DISTFILES)
@@ -24452,7 +27197,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -374,7 +369,7 @@
+@@ -371,7 +365,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -24461,7 +27206,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -407,7 +402,7 @@
+@@ -404,7 +398,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -24470,7 +27215,7 @@
dvi: dvi-am
-@@ -421,12 +416,20 @@
+@@ -418,12 +412,20 @@
install-data-am: install-installDATA install-installPYTHON
@@ -24491,7 +27236,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -445,20 +448,22 @@
+@@ -442,20 +444,22 @@
ps-am:
@@ -24520,9 +27265,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.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
+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
@@ -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.
@@ -24550,21 +27295,15 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -61,26 +57,39 @@
+@@ -61,23 +57,33 @@
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 filter.lo render.lo utils.lo
+ am_tiling_la_OBJECTS = tiling.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) \
@@ -24593,10 +27332,10 @@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
- SOURCES = $(svg_la_SOURCES) $(systray_la_SOURCES) $(tiling_la_SOURCES) \
+ SOURCES = $(svg_la_SOURCES) $(tiling_la_SOURCES) $(x11_la_SOURCES)
+ DIST_SOURCES = $(svg_la_SOURCES) $(tiling_la_SOURCES) \
$(x11_la_SOURCES)
- DIST_SOURCES = $(svg_la_SOURCES) $(systray_la_SOURCES) \
-@@ -94,8 +103,6 @@
+@@ -90,8 +96,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -24605,7 +27344,7 @@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
-@@ -117,6 +124,7 @@
+@@ -113,6 +117,7 @@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -24613,7 +27352,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -133,6 +141,7 @@
+@@ -129,6 +134,7 @@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
@@ -24621,7 +27360,7 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -143,14 +152,12 @@
+@@ -139,14 +145,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -24637,7 +27376,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -162,7 +169,6 @@
+@@ -158,7 +162,6 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -24645,7 +27384,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -172,11 +178,13 @@
+@@ -168,12 +171,13 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -24655,13 +27394,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@
-@@ -198,6 +206,7 @@
+@@ -195,6 +199,7 @@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
@@ -24669,7 +27408,7 @@
SET_MAKE = @SET_MAKE@
SHARED_MIME_INFO_CFLAGS = @SHARED_MIME_INFO_CFLAGS@
SHARED_MIME_INFO_LIBS = @SHARED_MIME_INFO_LIBS@
-@@ -220,13 +229,13 @@
+@@ -213,13 +218,13 @@
X11_CFLAGS = @X11_CFLAGS@
X11_LIBS = @X11_LIBS@
XGETTEXT = @XGETTEXT@
@@ -24687,7 +27426,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -238,6 +247,7 @@
+@@ -231,6 +236,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -24695,7 +27434,7 @@
coredir = @coredir@
datadir = @datadir@
datarootdir = @datarootdir@
-@@ -271,8 +281,11 @@
+@@ -264,8 +270,11 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -24707,7 +27446,7 @@
INCLUDES = \
$(PYTHON_CFLAGS) \
$(X11_CFLAGS) \
-@@ -362,21 +375,21 @@
+@@ -351,21 +360,21 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-installLTLIBRARIES: $(install_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -24735,15 +27474,12 @@
done
clean-installLTLIBRARIES:
-@@ -388,13 +401,13 @@
+@@ -377,11 +386,11 @@
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)
@@ -24753,7 +27489,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -412,22 +425,22 @@
+@@ -396,22 +405,22 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/x11.Plo at am__quote@
.c.o:
@@ -24782,7 +27518,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 $@ $<
-@@ -437,13 +450,9 @@
+@@ -421,13 +430,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -24797,7 +27533,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 \
-@@ -471,7 +480,7 @@
+@@ -455,7 +460,7 @@
done
install-installDATA: $(install_DATA)
@$(NORMAL_INSTALL)
@@ -24806,7 +27542,7 @@
@list='$(install_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -492,8 +501,8 @@
+@@ -476,8 +481,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -24817,7 +27553,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -505,8 +514,8 @@
+@@ -489,8 +494,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -24828,7 +27564,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -516,13 +525,12 @@
+@@ -500,13 +505,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -24844,7 +27580,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -536,22 +544,21 @@
+@@ -520,22 +524,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -24880,7 +27616,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -567,7 +574,7 @@
+@@ -551,7 +554,7 @@
all-am: Makefile $(LTLIBRARIES) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)" "$(DESTDIR)$(installdir)"; do \
@@ -24889,7 +27625,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -603,7 +610,7 @@
+@@ -587,7 +590,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -24898,7 +27634,7 @@
dvi: dvi-am
-@@ -618,12 +625,20 @@
+@@ -602,12 +605,20 @@
install-data-am: install-installDATA install-installLTLIBRARIES \
install-installPYTHON
@@ -24919,7 +27655,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -644,23 +659,26 @@
+@@ -628,23 +639,26 @@
ps-am:
Modified: packages/unstable/gdesklets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/rules?rev=14846&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/rules (original)
+++ packages/unstable/gdesklets/debian/rules Mon Mar 3 12:20:52 2008
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-GNOME_DOWNLOAD_URL = http://www.gdesklets.de/files/gDesklets-$(DEB_UPSTREAM_VERSION).tar.bz2
+GNOME_DOWNLOAD_URL = http://www.gdesklets.de/files/gdesklets-$(DEB_UPSTREAM_VERSION).tar.bz2
TARBALL_EXT := tar.bz2
include /usr/share/cdbs/1/rules/debhelper.mk
Modified: packages/unstable/gdesklets/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/watch?rev=14846&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/watch (original)
+++ packages/unstable/gdesklets/debian/watch Mon Mar 3 12:20:52 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